diff --git a/theme_bistro/__manifest__.py b/theme_bistro/__manifest__.py index 4b4df8034..d3d315e10 100644 --- a/theme_bistro/__manifest__.py +++ b/theme_bistro/__manifest__.py @@ -62,12 +62,16 @@ ], 'images_preview_theme': { 'website.s_cover_default_image': '/theme_bistro/static/src/img/backgrounds/17.jpg', - 'website.s_picture_default_image': '/theme_bistro/static/src/img/content/picture.jpg', - 'website.s_product_catalog_default_image': '/theme_bistro/static/src/img/backgrounds/16.jpg', - 'website.s_quotes_carousel_demo_image_1': '/theme_bistro/static/src/img/backgrounds/19.jpg', + 'website.s_media_list_default_image_1': '/theme_bistro/static/src/img/content/media_list_01.jpg', + 'website.s_image_text_default_image': '/theme_bistro/static/src/img/content/image_text.jpg', + 'website.s_media_list_default_image_2': '/theme_bistro/static/src/img/content/media_list_02.jpg', + 'website.s_text_image_default_image': '/theme_bistro/static/src/img/content/text_image.jpg', + 'website.s_quotes_carousel_demo_image_1': '/theme_bistro/static/src/img/backgrounds/s_quotes_carousel_background.jpg', + 'website.library_image_10': '/theme_bistro/static/src/img/backgrounds/07.jpg', + 'website.library_image_05': '/theme_bistro/static/src/img/backgrounds/11.jpg', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_features', 's_picture', 's_product_catalog', 's_text_block', 's_quotes_carousel'], + 'homepage': ['s_image_title', 's_key_images', 's_pricelist_cafe', 's_quotes_carousel', 's_quadrant'], 'pricing': ["s_text_image", "s_product_catalog"], }, 'license': 'LGPL-3', diff --git a/theme_bistro/models/theme_bistro.py b/theme_bistro/models/theme_bistro.py index 7021d524d..193d789b2 100644 --- a/theme_bistro/models/theme_bistro.py +++ b/theme_bistro/models/theme_bistro.py @@ -8,9 +8,5 @@ class ThemeBistro(models.AbstractModel): self.enable_view('website.template_header_vertical') self.enable_view('website.header_navbar_pills_style') - self.enable_view('website.template_footer_centered') - self.enable_view('website.template_footer_slideout') - self.enable_view('website.option_footer_scrolltop') - self.enable_asset("website.ripple_effect_scss") self.enable_asset("website.ripple_effect_js") diff --git a/theme_bistro/static/description/bistro_screenshot.jpg b/theme_bistro/static/description/bistro_screenshot.jpg index 8ed9c6268..b63007730 100644 Binary files a/theme_bistro/static/description/bistro_screenshot.jpg and b/theme_bistro/static/description/bistro_screenshot.jpg differ diff --git a/theme_bistro/static/description/theme_bistro.svg b/theme_bistro/static/description/theme_bistro.svg index aa6a066bd..bd3a45f41 100644 --- a/theme_bistro/static/description/theme_bistro.svg +++ b/theme_bistro/static/description/theme_bistro.svg @@ -1,170 +1,199 @@ - - + - - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - - - LOGO - - - - - + + + + + + + + + + + + + - - - - - - Welcome Message - - - - - Discover - - + + + + + + + + - - - - - - Feature #01 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - Feature #01 - - + + + + + + + + + + + + + + + + + + + + + + + + - - - Feature #01 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - Section Title - - - - + + + + + + + + + + + + + + + + + + - - - - - - - Entry Title - - - $ - - - $ - - - $ - - - Entry Title - - - $ - - - $ - - - $ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LOGO - - - - - - - - + + + + + diff --git a/theme_bistro/static/src/img/backgrounds/s_image_title.jpg b/theme_bistro/static/src/img/backgrounds/s_image_title.jpg new file mode 100644 index 000000000..756ff0672 Binary files /dev/null and b/theme_bistro/static/src/img/backgrounds/s_image_title.jpg differ diff --git a/theme_bistro/static/src/img/backgrounds/s_quotes_carousel_background.jpg b/theme_bistro/static/src/img/backgrounds/s_quotes_carousel_background.jpg new file mode 100644 index 000000000..03f0640b7 Binary files /dev/null and b/theme_bistro/static/src/img/backgrounds/s_quotes_carousel_background.jpg differ diff --git a/theme_bistro/static/src/img/content/media_list_01.jpg b/theme_bistro/static/src/img/content/media_list_01.jpg index 209df748a..d857519d4 100644 Binary files a/theme_bistro/static/src/img/content/media_list_01.jpg and b/theme_bistro/static/src/img/content/media_list_01.jpg differ diff --git a/theme_bistro/static/src/img/content/media_list_02.jpg b/theme_bistro/static/src/img/content/media_list_02.jpg index cc3aa015d..23595622a 100644 Binary files a/theme_bistro/static/src/img/content/media_list_02.jpg and b/theme_bistro/static/src/img/content/media_list_02.jpg differ diff --git a/theme_bistro/static/src/img/content/media_list_03.jpg b/theme_bistro/static/src/img/content/media_list_03.jpg index 5bd0e308a..036e36a4d 100644 Binary files a/theme_bistro/static/src/img/content/media_list_03.jpg and b/theme_bistro/static/src/img/content/media_list_03.jpg differ diff --git a/theme_bistro/static/src/img/content/s_key_images_02.jpg b/theme_bistro/static/src/img/content/s_key_images_02.jpg new file mode 100644 index 000000000..ac9906d2e Binary files /dev/null and b/theme_bistro/static/src/img/content/s_key_images_02.jpg differ diff --git a/theme_bistro/static/src/img/content/s_key_images_04.jpg b/theme_bistro/static/src/img/content/s_key_images_04.jpg new file mode 100644 index 000000000..bc9c0c02e Binary files /dev/null and b/theme_bistro/static/src/img/content/s_key_images_04.jpg differ diff --git a/theme_bistro/static/src/img/content/s_quadrant_default_image_2.jpg b/theme_bistro/static/src/img/content/s_quadrant_default_image_2.jpg new file mode 100644 index 000000000..8ee6dc2e8 Binary files /dev/null and b/theme_bistro/static/src/img/content/s_quadrant_default_image_2.jpg differ diff --git a/theme_bistro/static/src/img/content/s_quadrant_default_image_4.jpg b/theme_bistro/static/src/img/content/s_quadrant_default_image_4.jpg new file mode 100644 index 000000000..c349069b3 Binary files /dev/null and b/theme_bistro/static/src/img/content/s_quadrant_default_image_4.jpg differ diff --git a/theme_bistro/static/src/js/tour.js b/theme_bistro/static/src/js/tour.js index 6a338a344..2029aa1f0 100644 --- a/theme_bistro/static/src/js/tour.js +++ b/theme_bistro/static/src/js/tour.js @@ -4,39 +4,34 @@ import * as wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_cover', - name: 'Cover', - groupName: "Intro", - }, - { - id: 's_features', - name: 'Features', - groupName: "Content", - }, - { - id: 's_picture', - name: 'Title - Image', + id: 's_image_title', + name: 'Image Title', groupName: "Images", }, { - id: 's_product_catalog', - name: 'Pricelist', - groupName: "Content", + id: 's_key_images', + name: 'Key Images', + groupName: "Columns", }, { - id: 's_text_block', - name: 'Text', - groupName: "Text", + id: 's_pricelist_cafe', + name: 'Pricelist cafe', + groupName: "Content", }, { id: 's_quotes_carousel', name: 'Quotes', groupName: "People", }, + { + id: 's_quadrant', + name: 'Quadrant', + groupName: "Images", + }, ]; wTourUtils.registerThemeHomepageTour("bistro_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"bistro-5"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-22"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), @@ -48,5 +43,4 @@ wTourUtils.registerThemeHomepageTour("bistro_tour", () => [ wTourUtils.goBackToBlocks(), ...wTourUtils.dragNDrop(snippets[3]), ...wTourUtils.dragNDrop(snippets[4]), - ...wTourUtils.dragNDrop(snippets[5]), ]); diff --git a/theme_bistro/static/src/scss/primary_variables.scss b/theme_bistro/static/src/scss/primary_variables.scss index 54fe07a2a..727612fdd 100644 --- a/theme_bistro/static/src/scss/primary_variables.scss +++ b/theme_bistro/static/src/scss/primary_variables.scss @@ -4,7 +4,7 @@ $o-website-values-palettes: ( ( - 'color-palettes-name': 'bistro-5', + 'color-palettes-name': 'default-22', // Header 'header-template': 'vertical', @@ -33,7 +33,7 @@ $o-website-values-palettes: ( 'input-padding-y-lg': .6rem, // Footer - 'footer-template': 'centered', + 'footer-template': 'default', 'footer-effect': 'slideout_slide_hover', 'footer-scrolltop': true, ), @@ -164,8 +164,6 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'bistro-5'); - $o-color-palettes-compatibility-indexes: ( 1: 'bistro-1', 2: 'bistro-2', diff --git a/theme_bistro/views/images_library.xml b/theme_bistro/views/images_library.xml index 9951dea10..b12a7b68e 100644 --- a/theme_bistro/views/images_library.xml +++ b/theme_bistro/views/images_library.xml @@ -237,7 +237,7 @@ website.s_quotes_carousel_demo_image_1 website.s_quotes_carousel_demo_image_1 - /theme_bistro/static/src/img/backgrounds/19.jpg + /theme_bistro/static/src/img/backgrounds/s_quotes_carousel_background.jpg website.s_quotes_carousel_demo_image_3 @@ -401,7 +401,7 @@ website.s_image_title_default_image website.s_image_title_default_image - /theme_bistro/static/src/img/backgrounds/14.jpg + /theme_bistro/static/src/img/backgrounds/s_image_title.jpg @@ -420,7 +420,7 @@ website.s_quadrant_default_image_2 website.s_quadrant_default_image_2 - /theme_bistro/static/src/img/backgrounds/16.jpg + /theme_bistro/static/src/img/content/s_quadrant_default_image_2.jpg website.s_quadrant_default_image_3 @@ -430,7 +430,7 @@ website.s_quadrant_default_image_4 website.s_quadrant_default_image_4 - /theme_bistro/static/src/img/content/picture.jpg + /theme_bistro/static/src/img/content/s_quadrant_default_image_4.jpg @@ -449,7 +449,7 @@ website.s_key_images_default_image_2 website.s_key_images_default_image_2 - /theme_bistro/static/src/img/content/media_list_02.jpg + /theme_bistro/static/src/img/content/s_key_images_02.jpg website.s_key_images_default_image_3 @@ -459,7 +459,7 @@ website.s_key_images_default_image_4 website.s_key_images_default_image_4 - /theme_bistro/static/src/img/content/three_columns_01.jpg + /theme_bistro/static/src/img/content/s_key_images_04.jpg @@ -563,4 +563,25 @@ /theme_bistro/static/src/img/content/s_empowerment_default_image.jpg + + + website.s_text_cover_default_image + website.s_text_cover_default_image + /theme_bistro/static/src/img/backgrounds/08.jpg + + + + + website.s_framed_intro_default_image + website.s_framed_intro_default_image + /theme_bistro/static/src/img/backgrounds/20.jpg + + + + + website.s_showcase_default_image + website.s_showcase_default_image + /theme_bistro/static/src/img/content/s_key_images_04.jpg + + diff --git a/theme_bistro/views/snippets/s_big_number.xml b/theme_bistro/views/snippets/s_big_number.xml index d6f5c2173..4d505df4d 100644 --- a/theme_bistro/views/snippets/s_big_number.xml +++ b/theme_bistro/views/snippets/s_big_number.xml @@ -4,12 +4,12 @@
+
diff --git a/theme_bistro/views/snippets/s_image_title.xml b/theme_bistro/views/snippets/s_image_title.xml index 98026cb1b..7151bf0b3 100644 --- a/theme_bistro/views/snippets/s_image_title.xml +++ b/theme_bistro/views/snippets/s_image_title.xml @@ -2,6 +2,17 @@ - - diff --git a/theme_bistro/views/snippets/s_quadrant.xml b/theme_bistro/views/snippets/s_quadrant.xml index b4dc5d12e..7ff4d2177 100644 --- a/theme_bistro/views/snippets/s_quadrant.xml +++ b/theme_bistro/views/snippets/s_quadrant.xml @@ -2,6 +2,13 @@