diff --git a/theme_bookstore/__manifest__.py b/theme_bookstore/__manifest__.py index b252d2407..0142f667f 100644 --- a/theme_bookstore/__manifest__.py +++ b/theme_bookstore/__manifest__.py @@ -20,6 +20,7 @@ 'views/snippets/s_call_to_action.xml', 'views/snippets/s_cover.xml', 'views/snippets/s_image_text.xml', + 'views/snippets/s_showcase.xml', 'views/snippets/s_masonry_block.xml', 'views/snippets/s_banner.xml', 'views/snippets/s_numbers.xml', @@ -49,7 +50,7 @@ 'website.s_product_list_default_image_6': '/theme_bookstore/static/src/img/snippets/s_product_6.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_masonry_block', 's_image_text', 's_picture', 's_product_list', 's_call_to_action'], + 'homepage': ['s_banner', 's_masonry_block', 's_process_steps', 's_showcase', 's_title'], }, 'new_page_templates': { 'about': { diff --git a/theme_bookstore/models/theme_bookstore.py b/theme_bookstore/models/theme_bookstore.py index e1e82b93a..25e169ab2 100644 --- a/theme_bookstore/models/theme_bookstore.py +++ b/theme_bookstore/models/theme_bookstore.py @@ -5,5 +5,4 @@ class ThemeBookstore(models.AbstractModel): _inherit = 'theme.utils' def _theme_bookstore_post_copy(self, mod): - self.enable_view('website.template_header_sales_one') - self.enable_view('website.template_footer_links') + self.enable_view('website.template_header_search') diff --git a/theme_bookstore/static/src/img/snippets/library_image_07.jpg b/theme_bookstore/static/src/img/snippets/library_image_07.jpg index cae426b71..ce83fba27 100644 Binary files a/theme_bookstore/static/src/img/snippets/library_image_07.jpg and b/theme_bookstore/static/src/img/snippets/library_image_07.jpg differ diff --git a/theme_bookstore/static/src/img/snippets/library_image_11.jpg b/theme_bookstore/static/src/img/snippets/library_image_11.jpg index 6bf4168d9..1ee5a45c8 100644 Binary files a/theme_bookstore/static/src/img/snippets/library_image_11.jpg and b/theme_bookstore/static/src/img/snippets/library_image_11.jpg differ diff --git a/theme_bookstore/static/src/img/snippets/library_image_13.jpg b/theme_bookstore/static/src/img/snippets/library_image_13.jpg index b05f01265..d9c897532 100644 Binary files a/theme_bookstore/static/src/img/snippets/library_image_13.jpg and b/theme_bookstore/static/src/img/snippets/library_image_13.jpg differ diff --git a/theme_bookstore/static/src/js/tour.js b/theme_bookstore/static/src/js/tour.js index abd4c1a95..a367c2e32 100644 --- a/theme_bookstore/static/src/js/tour.js +++ b/theme_bookstore/static/src/js/tour.js @@ -5,8 +5,8 @@ import { _t } from "@web/core/l10n/translation"; const snippets = [ { - id: 's_cover', - name: 'Cover', + id: 's_banner', + name: 'Banner', groupName: "Intro", }, { @@ -15,29 +15,24 @@ const snippets = [ groupName: "Images", }, { - id: 's_image_text', - name: 'Image - Text', + id: 's_process_steps', + name: 'Steps', groupName: "Content", }, { - id: 's_picture', - name: 'Title - Image', - groupName: "Images", - }, - { - id: 's_product_list', - name: 'Items', + id: 's_showcase', + name: 'Showcase', groupName: "Content", }, { - id: 's_call_to_action', - name: 'Call to Action', - groupName: "Content", + id: 's_title', + name: 'Title', + groupName: "Text", }, ]; wTourUtils.registerThemeHomepageTour("bookstore_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"generic-8"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-26"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1'), wTourUtils.goBackToBlocks(), @@ -48,5 +43,4 @@ wTourUtils.registerThemeHomepageTour("bookstore_tour", () => [ ...wTourUtils.clickOnSnippet(snippets[4]), wTourUtils.changeOption('ContainerWidth', 'we-button-group.o_we_user_value_widget', _t('width')), wTourUtils.goBackToBlocks(), - ...wTourUtils.dragNDrop(snippets[5]), ]); diff --git a/theme_bookstore/static/src/scss/primary_variables.scss b/theme_bookstore/static/src/scss/primary_variables.scss index f6d979492..39ca35be3 100644 --- a/theme_bookstore/static/src/scss/primary_variables.scss +++ b/theme_bookstore/static/src/scss/primary_variables.scss @@ -51,6 +51,10 @@ $o-theme-font-configs: ( 'family': ('DM Serif Display', serif), 'url': 'DM+Serif+Display:400,400i', ), + 'Inter': ( + 'family': ('Inter', sans-serif), + 'url': 'Inter:300,300i,,400,400i,700,700i', + ), ); //------------------------------------------------------------------------------ @@ -59,20 +63,22 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'generic-8', + 'color-palettes-name': 'default-26', 'header-font-size': 1rem, - 'btn-border-radius': 0px, - 'btn-border-radius-sm': 0px, - 'btn-border-radius-lg': 0px, - 'font': 'Source Sans Pro', + 'btn-border-radius': 8px, + 'btn-border-radius-sm': 4px, + 'btn-border-radius-lg': 12px, + 'btn-padding-x': 16px, + 'btn-padding-x-lg': 20px, + 'btn-padding-y-lg': 12px, + 'font': 'Inter', 'headings-font': 'DM Serif Display', - 'header-template': 'sales_one', - 'footer-template': 'links', + 'header-template': 'search', 'link-underline': 'never', ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'generic-8'); +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-26'); $o-color-palettes-compatibility-indexes: ( 1: 'bookstore-1', diff --git a/theme_bookstore/views/snippets/s_banner.xml b/theme_bookstore/views/snippets/s_banner.xml index 2a247324f..0474e2e41 100644 --- a/theme_bookstore/views/snippets/s_banner.xml +++ b/theme_bookstore/views/snippets/s_banner.xml @@ -6,10 +6,6 @@ The best sellers
of the year
- - - Discover it - diff --git a/theme_bookstore/views/snippets/s_call_to_action.xml b/theme_bookstore/views/snippets/s_call_to_action.xml index a118b9182..a1d484ee7 100644 --- a/theme_bookstore/views/snippets/s_call_to_action.xml +++ b/theme_bookstore/views/snippets/s_call_to_action.xml @@ -24,15 +24,4 @@ - - diff --git a/theme_bookstore/views/snippets/s_cover.xml b/theme_bookstore/views/snippets/s_cover.xml index 779fb0521..a3e4d14a3 100644 --- a/theme_bookstore/views/snippets/s_cover.xml +++ b/theme_bookstore/views/snippets/s_cover.xml @@ -4,7 +4,7 @@ diff --git a/theme_bookstore/views/snippets/s_image_text.xml b/theme_bookstore/views/snippets/s_image_text.xml index 4aa7a0ab8..3f07be773 100644 --- a/theme_bookstore/views/snippets/s_image_text.xml +++ b/theme_bookstore/views/snippets/s_image_text.xml @@ -6,11 +6,6 @@ - - - - /web_editor/shape/theme_bookstore/s_image_text.svg?c1=o-color-1 - Once upon a time... @@ -25,15 +20,4 @@ - - diff --git a/theme_bookstore/views/snippets/s_masonry_block.xml b/theme_bookstore/views/snippets/s_masonry_block.xml index e9dd94617..1374d761a 100644 --- a/theme_bookstore/views/snippets/s_masonry_block.xml +++ b/theme_bookstore/views/snippets/s_masonry_block.xml @@ -2,13 +2,15 @@