diff --git a/theme_graphene/__manifest__.py b/theme_graphene/__manifest__.py index 05373af0e..7266e58f9 100644 --- a/theme_graphene/__manifest__.py +++ b/theme_graphene/__manifest__.py @@ -18,12 +18,9 @@ ], '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', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_text_image', 's_numbers', 's_picture', 's_comparisons'], + 'homepage': ['s_cover', 's_text_image', 's_numbers_grid', 's_mockup_image', 's_comparisons', 's_references'], }, 'new_page_templates': { 'about': { diff --git a/theme_graphene/models/theme_graphene.py b/theme_graphene/models/theme_graphene.py index f0daa657d..aed4ca807 100644 --- a/theme_graphene/models/theme_graphene.py +++ b/theme_graphene/models/theme_graphene.py @@ -5,7 +5,7 @@ class ThemeGraphene(models.AbstractModel): _inherit = 'theme.utils' def _theme_graphene_post_copy(self, mod): - self.enable_view('website.template_header_sales_three') + self.enable_view('website.template_header_stretch') self.enable_view('website.template_footer_centered') diff --git a/theme_graphene/static/description/graphene_poster.jpg b/theme_graphene/static/description/graphene_poster.jpg new file mode 100644 index 000000000..94d592b43 Binary files /dev/null and b/theme_graphene/static/description/graphene_poster.jpg differ diff --git a/theme_graphene/static/description/graphene_poster.png b/theme_graphene/static/description/graphene_poster.png deleted file mode 100644 index 546ce5b90..000000000 Binary files a/theme_graphene/static/description/graphene_poster.png and /dev/null differ diff --git a/theme_graphene/static/description/graphene_screenshot.jpg b/theme_graphene/static/description/graphene_screenshot.jpg index 95ba99319..21e1eb003 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/description/theme_graphene.svg b/theme_graphene/static/description/theme_graphene.svg index 0db4f5c32..8f3818750 100644 --- a/theme_graphene/static/description/theme_graphene.svg +++ b/theme_graphene/static/description/theme_graphene.svg @@ -1,236 +1,485 @@ - - theme_graphene + - - + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + - - - - - - Welcome Message - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - Discover - - - - - - - - - Section Title - - - - - - - - - - - Discover - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - - - - - 40 - 23 - 8 - 12 + - - - - - - - - - - Section Title - - - - - - + + + + + + + + + + + + - - - - - - - $35 - - - - - - Discover - - - - - - - - - - - - - - - - - $55 - - - - - Discover - - - - - - - - - - - - - - - - - $85 - - - - - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme_graphene/static/src/img/pictures/s_image_text_device.jpg b/theme_graphene/static/src/img/pictures/s_image_text_device.jpg new file mode 100644 index 000000000..27f261d77 Binary files /dev/null and b/theme_graphene/static/src/img/pictures/s_image_text_device.jpg differ diff --git a/theme_graphene/static/src/img/pictures/s_image_text_device_perspective.jpg b/theme_graphene/static/src/img/pictures/s_image_text_device_perspective.jpg new file mode 100644 index 000000000..d678176bd Binary files /dev/null and b/theme_graphene/static/src/img/pictures/s_image_text_device_perspective.jpg differ diff --git a/theme_graphene/static/src/js/tour.js b/theme_graphene/static/src/js/tour.js index deb59ef20..a97d04e7d 100644 --- a/theme_graphene/static/src/js/tour.js +++ b/theme_graphene/static/src/js/tour.js @@ -14,13 +14,13 @@ const snippets = [ groupName: "Content", }, { - id: 's_numbers', - name: 'Numbers', + id: 's_numbers_grid', + name: 'Numbers Grid', groupName: "Content", }, { - id: 's_picture', - name: 'Title - Image', + id: 's_mockup_image', + name: 'Mockup Image', groupName: "Images", }, { @@ -28,11 +28,16 @@ const snippets = [ name: 'Comparisons', groupName: "Content", }, + { + id: 's_references', + name: 'References', + groupName: "Content", + }, ]; wTourUtils.registerThemeHomepageTour("graphene_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"graphene-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"base-1"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks('left'), diff --git a/theme_graphene/static/src/scss/primary_variables.scss b/theme_graphene/static/src/scss/primary_variables.scss index cc2e10fe4..d9dcd71cb 100644 --- a/theme_graphene/static/src/scss/primary_variables.scss +++ b/theme_graphene/static/src/scss/primary_variables.scss @@ -93,25 +93,24 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'graphene-1', + 'color-palettes-name': 'base-1', 'font': 'Source Sans Pro', 'headings-font': 'Assistant', 'btn-ripple': true, - 'layout': 'boxed', - 'header-template': 'sales_three', + 'header-template': 'stretch', 'footer-template': 'centered', 'btn-font-size-lg': 1rem, 'btn-padding-y-lg': .6rem, 'btn-padding-x-lg': 2.2rem, - 'btn-border-radius-lg': 2px, + 'btn-border-radius': 2px, + 'btn-border-radius-sm': 2px, + 'btn-border-radius-lg': 4px, ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'graphene-1'); - $o-color-palettes-compatibility-indexes: ( 1: 'graphene-1', 2: 'graphene-2', diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml index fb225331c..593420abf 100644 --- a/theme_graphene/views/customizations.xml +++ b/theme_graphene/views/customizations.xml @@ -4,21 +4,24 @@ @@ -45,29 +51,27 @@ + + + + +