diff --git a/theme_graphene/__manifest__.py b/theme_graphene/__manifest__.py index b459e52df..ea4db1037 100644 --- a/theme_graphene/__manifest__.py +++ b/theme_graphene/__manifest__.py @@ -16,6 +16,12 @@ 'static/description/graphene_poster.jpg', 'static/description/graphene_screenshot.jpg', ], + 'images_preview_theme': { + 'website.s_cover_default_image': '/theme_graphene/static/src/img/pictures/bg_image_08.jpg', + 'website.s_text_image_default_image': '/theme_graphene/static/src/img/pictures/content_02.jpg', + 'website.s_parallax_default_image': '/theme_graphene/static/src/img/pictures/content_12.jpg', + 'website.s_picture_default_image': '/theme_graphene/static/src/img/pictures/content_04.jpg', + }, 'depends': ['theme_common'], 'license': 'LGPL-3', 'live_test_url': 'https://theme-graphene.odoo.com', diff --git a/theme_graphene/data/ir_asset.xml b/theme_graphene/data/ir_asset.xml index f300cecbb..1597d9169 100644 --- a/theme_graphene/data/ir_asset.xml +++ b/theme_graphene/data/ir_asset.xml @@ -1,29 +1,35 @@ - - - theme_graphene.s_showcase_slider_000_variables_scss - Showcase slider 000 variables SCSS - web._assets_primary_variables - theme_graphene/static/src/old_snippets/s_showcase_slider/000_variables.scss - - + + theme_graphene.s_showcase_slider_000_variables_scss + Showcase slider 000 variables SCSS + web._assets_primary_variables + theme_graphene/static/src/old_snippets/s_showcase_slider/000_variables.scss + + - - theme_graphene.primary_variables_scss - Primary variables SCSS - web._assets_primary_variables - append - theme_graphene/static/src/scss/primary_variables.scss - + + theme_graphene.primary_variables_scss + Primary variables SCSS + web._assets_primary_variables + append + theme_graphene/static/src/scss/primary_variables.scss + - - theme_graphene.secondary_variables_scss - Secondary variables SCSS - web._assets_secondary_variables - theme_graphene/static/src/scss/secondary_variables.scss - + + theme_graphene.secondary_variables_scss + Secondary variables SCSS + web._assets_secondary_variables + theme_graphene/static/src/scss/secondary_variables.scss + + + + theme_graphene.bootstrap_overridden_scss + Bootstrap overridden SCSS + web._assets_frontend_helpers + prepend + theme_graphene/static/src/scss/bootstrap_overridden.scss + - diff --git a/theme_graphene/models/theme_graphene.py b/theme_graphene/models/theme_graphene.py index 2ff4766ac..b5b7e8fe5 100644 --- a/theme_graphene/models/theme_graphene.py +++ b/theme_graphene/models/theme_graphene.py @@ -9,7 +9,7 @@ class ThemeGraphene(models.AbstractModel): # self.enable_asset('theme_common.compatibility_saas_10_2') self.disable_view('website.template_header_default') - self.enable_view('website.template_header_centered_logo') + self.enable_view('website.template_header_contact') self.enable_header_off_canvas() self.disable_view('website.footer_custom') diff --git a/theme_graphene/static/description/graphene_poster.jpg b/theme_graphene/static/description/graphene_poster.jpg deleted file mode 100644 index c9a3d5df8..000000000 Binary files a/theme_graphene/static/description/graphene_poster.jpg and /dev/null differ diff --git a/theme_graphene/static/description/graphene_poster.png b/theme_graphene/static/description/graphene_poster.png new file mode 100644 index 000000000..546ce5b90 Binary files /dev/null and b/theme_graphene/static/description/graphene_poster.png differ diff --git a/theme_graphene/static/description/graphene_screenshot.jpg b/theme_graphene/static/description/graphene_screenshot.jpg index a57db6d4b..522a58d58 100644 Binary files a/theme_graphene/static/description/graphene_screenshot.jpg and b/theme_graphene/static/description/graphene_screenshot.jpg differ diff --git a/theme_graphene/static/src/img/pictures/content_01.jpg b/theme_graphene/static/src/img/pictures/content_01.jpg index 0e7e54185..c89ee5662 100644 Binary files a/theme_graphene/static/src/img/pictures/content_01.jpg and b/theme_graphene/static/src/img/pictures/content_01.jpg differ diff --git a/theme_graphene/static/src/img/pictures/content_22.jpg b/theme_graphene/static/src/img/pictures/content_22.jpg new file mode 100644 index 000000000..4256f78d9 Binary files /dev/null and b/theme_graphene/static/src/img/pictures/content_22.jpg differ diff --git a/theme_graphene/static/src/img/pictures/content_23.jpg b/theme_graphene/static/src/img/pictures/content_23.jpg new file mode 100644 index 000000000..370ea36f0 Binary files /dev/null and b/theme_graphene/static/src/img/pictures/content_23.jpg differ diff --git a/theme_graphene/static/src/img/pictures/s_numbers.jpg b/theme_graphene/static/src/img/pictures/s_numbers.jpg new file mode 100644 index 000000000..5b33ca6fe Binary files /dev/null and b/theme_graphene/static/src/img/pictures/s_numbers.jpg differ diff --git a/theme_graphene/static/src/js/tour.js b/theme_graphene/static/src/js/tour.js index 96dca016e..89e9869af 100644 --- a/theme_graphene/static/src/js/tour.js +++ b/theme_graphene/static/src/js/tour.js @@ -17,16 +17,16 @@ const snippets = [ name: 'Text - Image', }, { - id: 's_three_columns', - name: 'Columns', + id: 's_numbers', + name: 'Numbers', }, { - id: 's_company_team', - name: 'Team', + id: 's_picture', + name: 'Picture', }, { - id: 's_call_to_action', - name: 'Call to Action', + id: 's_comparisons', + name: 'Comparisons', }, ]; diff --git a/theme_graphene/static/src/scss/bootstrap_overridden.scss b/theme_graphene/static/src/scss/bootstrap_overridden.scss new file mode 100644 index 000000000..5d5c4d511 --- /dev/null +++ b/theme_graphene/static/src/scss/bootstrap_overridden.scss @@ -0,0 +1,3 @@ +// Headings font weight + +$headings-font-weight: 700 !default; diff --git a/theme_graphene/static/src/scss/primary_variables.scss b/theme_graphene/static/src/scss/primary_variables.scss index 503aebe2d..3869594fc 100644 --- a/theme_graphene/static/src/scss/primary_variables.scss +++ b/theme_graphene/static/src/scss/primary_variables.scss @@ -56,17 +56,17 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (48.83 / 16); -$o-theme-h2-font-size-multiplier: (39.06 / 16); -$o-theme-h3-font-size-multiplier: (31.25 / 16); -$o-theme-h4-font-size-multiplier: (25.00 / 16); -$o-theme-h5-font-size-multiplier: (20.00 / 16); -$o-theme-h6-font-size-multiplier: 1.1; +$o-theme-h1-font-size-multiplier: (62 / 16); +$o-theme-h2-font-size-multiplier: (48 / 16); +$o-theme-h3-font-size-multiplier: (36 / 16); +$o-theme-h4-font-size-multiplier: (28 / 16); +$o-theme-h5-font-size-multiplier: (24 / 16); +$o-theme-h6-font-size-multiplier: (20 / 16); $o-theme-font-configs: ( - 'Heebo': ( - 'family': ('Heebo', sans-serif), - 'url': 'Heebo:300,300i,400,400i,700,700i', + 'Assistant': ( + 'family': ('Assistant', sans-serif), + 'url': 'Assistant:300,300i,400,400i,700,700i', ), 'Abel': ( 'family': ('Abel', sans-serif), @@ -96,11 +96,15 @@ $o-website-values-palettes: ( 'color-palettes-name': 'graphene-1', 'font-size-base': 1rem, - 'headings-font': 'Source Sans Pro', + + 'font': 'Source Sans Pro', + 'headings-font': 'Assistant', + 'navbar-font': 'Source Sans Pro', + 'buttons-font': 'Source Sans Pro', + 'btn-ripple': true, - 'layout': 'postcard', - 'hamburger-type': 'off-canvas', - 'header-template': 'centered_logo', + 'layout': 'boxed', + 'header-template': 'contact', 'footer-template': 'centered', 'btn-font-size-lg': 1rem, @@ -142,3 +146,6 @@ $o-color-palettes-compatibility-indexes: ( $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/02_001', (4: 2, 5: rgba(0, 0, 0, 0))); $o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Origins/02_001', 'second', (4: 2, 5: rgba(0, 0, 0, 0))); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/06_001', (3: 2)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Zigs/01_001', (2: 4)); + diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml index 11478094e..722b1bc26 100644 --- a/theme_graphene/views/customizations.xml +++ b/theme_graphene/views/customizations.xml @@ -10,16 +10,14 @@
- -

- Making the difference.
 + Making the difference.

Our mission is to give customers the best experience.
Extensive documentation & guides, an active community,
24/7 support make it a pleasure to work with us. @@ -33,15 +31,16 @@ -