diff --git a/theme_buzzy/__manifest__.py b/theme_buzzy/__manifest__.py index 8479a8280..c171f28b0 100644 --- a/theme_buzzy/__manifest__.py +++ b/theme_buzzy/__manifest__.py @@ -12,6 +12,7 @@ 'views/images_library.xml', 'views/snippets/s_cta_box.xml', + 'views/snippets/s_discovery.xml', 'views/snippets/s_striped_top.xml', 'views/snippets/s_title.xml', 'views/snippets/s_banner.xml', @@ -55,6 +56,7 @@ 'views/snippets/s_carousel.xml', 'views/snippets/s_pricelist_boxed.xml', 'views/snippets/s_image_hexagonal.xml', + 'views/snippets/s_image_punchy.xml', 'views/snippets/s_striped_center_top.xml', 'views/snippets/s_image_title.xml', 'views/snippets/s_key_images.xml', @@ -69,7 +71,7 @@ 'static/description/buzzy_screenshot.jpg', ], 'configurator_snippets': { - 'homepage': ['s_banner', 's_text_image', 's_three_columns', 's_image_text', 's_numbers', 's_call_to_action'], + 'homepage': ['s_banner', 's_discovery', 's_showcase', 's_key_benefits', 's_accordion_image', 's_cta_box'], }, 'new_page_templates': { 'about': { diff --git a/theme_buzzy/models/theme_buzzy.py b/theme_buzzy/models/theme_buzzy.py index 5cfd5375f..e0b07bc51 100644 --- a/theme_buzzy/models/theme_buzzy.py +++ b/theme_buzzy/models/theme_buzzy.py @@ -5,7 +5,7 @@ class ThemeBuzzy(models.AbstractModel): _inherit = 'theme.utils' def _theme_buzzy_post_copy(self, mod): - self.enable_view('website.template_footer_minimalist') + self.enable_view('website.template_footer_headline') self.enable_asset("website.ripple_effect_scss") self.enable_asset("website.ripple_effect_js") diff --git a/theme_buzzy/static/description/buzzy_cover.jpg b/theme_buzzy/static/description/buzzy_cover.jpg index 93354b35b..47aa733b7 100644 Binary files a/theme_buzzy/static/description/buzzy_cover.jpg and b/theme_buzzy/static/description/buzzy_cover.jpg differ diff --git a/theme_buzzy/static/description/buzzy_screenshot.jpg b/theme_buzzy/static/description/buzzy_screenshot.jpg index 09da35376..96774a2f3 100644 Binary files a/theme_buzzy/static/description/buzzy_screenshot.jpg and b/theme_buzzy/static/description/buzzy_screenshot.jpg differ diff --git a/theme_buzzy/static/description/theme_buzzy.svg b/theme_buzzy/static/description/theme_buzzy.svg index 538e20ff9..9a25d01d4 100644 --- a/theme_buzzy/static/description/theme_buzzy.svg +++ b/theme_buzzy/static/description/theme_buzzy.svg @@ -1,45 +1,6 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -52,580 +13,777 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - + + + + + - - Discover - - - + + + + + + - WelcomeMessage - - - - - - - + + + + + + - - Section Title - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - Entry Title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - Entry Title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Entry Title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Section Title - Discover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Section Title - Discover - - - - - - - - - - Get in touch - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme_buzzy/static/shapes/s_banner_2.svg b/theme_buzzy/static/shapes/s_banner_2.svg new file mode 100644 index 000000000..e83c17142 --- /dev/null +++ b/theme_buzzy/static/shapes/s_banner_2.svg @@ -0,0 +1 @@ +High five \ No newline at end of file diff --git a/theme_buzzy/static/shapes/s_showcase.svg b/theme_buzzy/static/shapes/s_showcase.svg new file mode 100644 index 000000000..3137739d8 --- /dev/null +++ b/theme_buzzy/static/shapes/s_showcase.svg @@ -0,0 +1 @@ +digital nomad \ No newline at end of file diff --git a/theme_buzzy/static/src/img/photos/s_showcase.jpg b/theme_buzzy/static/src/img/photos/s_showcase.jpg new file mode 100644 index 000000000..ce29ee21c Binary files /dev/null and b/theme_buzzy/static/src/img/photos/s_showcase.jpg differ diff --git a/theme_buzzy/static/src/js/tour.js b/theme_buzzy/static/src/js/tour.js index 15b01687b..fae2d90f0 100644 --- a/theme_buzzy/static/src/js/tour.js +++ b/theme_buzzy/static/src/js/tour.js @@ -9,34 +9,34 @@ const snippets = [ groupName: "Intro", }, { - id: 's_text_image', - name: 'Text - Image', + id: 's_discovery', + name: 'Discovery', + groupName: "Intro", + }, + { + id: 's_showcase', + name: 'Showcase', groupName: "Content", }, { - id: 's_three_columns', - name: 'Columns', + id: 's_key_benefits', + name: 'Key benefits', groupName: "Columns", }, { - id: 's_image_text', - name: 'Image - Text', + id: 's_accordion_image', + name: 'Accordion Image', groupName: "Content", }, { - id: 's_numbers', - name: 'Numbers', - groupName: "Content", - }, - { - id: 's_call_to_action', - name: 'Call to Action', + id: 's_cta_box', + name: 'Box Call to Action', groupName: "Content", }, ]; wTourUtils.registerThemeHomepageTour("buzzy_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"kiddo-2"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-24"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), diff --git a/theme_buzzy/static/src/scss/primary_variables.scss b/theme_buzzy/static/src/scss/primary_variables.scss index 16e7c70e5..e8d72bce5 100644 --- a/theme_buzzy/static/src/scss/primary_variables.scss +++ b/theme_buzzy/static/src/scss/primary_variables.scss @@ -4,7 +4,7 @@ $o-website-values-palettes: ( ( - 'color-palettes-name': 'kiddo-2', + 'color-palettes-name': 'default-24', // Header 'logo-height': 2.75rem, @@ -12,25 +12,21 @@ $o-website-values-palettes: ( // Font 'font': 'Montserrat', + 'headings-font': 'Quicksand', // Buttons - 'btn-padding-y': .45rem, - 'btn-padding-x': 1.35rem, + 'btn-padding-x': 1rem, 'btn-padding-y-sm': .3rem, - 'btn-padding-x-sm': .9rem, - 'btn-padding-y-lg': .6rem, - 'btn-padding-x-lg': 1.8rem, + 'btn-padding-x-sm': .75rem, + 'btn-padding-y-lg': 1.25rem, + 'btn-padding-x-lg': 2.5rem, 'btn-border-radius': 10rem, 'btn-border-radius-sm': 10rem, 'btn-border-radius-lg': 10rem, 'btn-ripple': true, - 'input-padding-y': .45rem, - 'input-padding-y-sm': .3rem, - 'input-padding-y-lg': .6rem, - // Footer - 'footer-template': 'minimalist', + 'footer-template': 'headline', 'footer-effect': 'slideout_slide_hover', 'footer-scrolltop': true, ), @@ -40,7 +36,7 @@ $o-website-values-palettes: ( // Palettes //------------------------------------------------------------------------------ -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'kiddo-2'); +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-24'); //------------------------------------------------------------------------------ // Fonts @@ -98,6 +94,15 @@ $o-theme-font-configs: ( 'Montserrat': ( 'family': ('Montserrat', serif), 'url': 'Montserrat:300,300i,400,400i,600,600i', + 'properties': ( + 'base': ( + 'font-size-base': (14 / 16) * 1rem, + ), + ) + ), + 'Quicksand': ( + 'family': ('Quicksand', sans-serif), + 'url': 'Quicksand:300,400,600', ), ); diff --git a/theme_buzzy/views/images_library.xml b/theme_buzzy/views/images_library.xml index bb955c5e3..d28559dfb 100644 --- a/theme_buzzy/views/images_library.xml +++ b/theme_buzzy/views/images_library.xml @@ -224,5 +224,17 @@ website.s_empowerment_default_image /theme_buzzy/static/src/img/photos/s_empowerment_default_image.jpg + + + website.s_image_punchy_default_image + website.s_image_punchy_default_image + /theme_buzzy/static/src/img/photos/library_image_03.jpg + + + + website.s_showcase_default_image + website.s_showcase_default_image + /theme_buzzy/static/src/img/photos/s_showcase.jpg + diff --git a/theme_buzzy/views/new_page_template.xml b/theme_buzzy/views/new_page_template.xml index dfdd2562a..ace99fdca 100644 --- a/theme_buzzy/views/new_page_template.xml +++ b/theme_buzzy/views/new_page_template.xml @@ -39,33 +39,6 @@ - - - - - -
+
@@ -148,11 +122,11 @@ - {"shape":"web_editor/Airy/13_001","flip":[]} + {'shape':'web_editor/Airy/13_001','colors':{'c1':'o-color-4','c4':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'} -
+
@@ -329,11 +303,11 @@ - {"shape":"web_editor/Airy/13_001","flip":[]} + {'shape':'web_editor/Airy/13_001','colors':{'c1':'o-color-4','c4':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'} -
+
diff --git a/theme_buzzy/views/snippets/s_accordion_image.xml b/theme_buzzy/views/snippets/s_accordion_image.xml index 18bc3351e..2b0444c45 100644 --- a/theme_buzzy/views/snippets/s_accordion_image.xml +++ b/theme_buzzy/views/snippets/s_accordion_image.xml @@ -2,8 +2,14 @@ diff --git a/theme_buzzy/views/snippets/s_banner.xml b/theme_buzzy/views/snippets/s_banner.xml index ca85bf381..a3a57c155 100644 --- a/theme_buzzy/views/snippets/s_banner.xml +++ b/theme_buzzy/views/snippets/s_banner.xml @@ -2,51 +2,29 @@ - - diff --git a/theme_buzzy/views/snippets/s_call_to_action.xml b/theme_buzzy/views/snippets/s_call_to_action.xml index f41443bdf..52f867cf1 100644 --- a/theme_buzzy/views/snippets/s_call_to_action.xml +++ b/theme_buzzy/views/snippets/s_call_to_action.xml @@ -5,15 +5,6 @@ - {"shape":"web_editor/Rainy/08_001","flip":[]} - - - -
- - - - diff --git a/theme_buzzy/views/snippets/s_cta_box.xml b/theme_buzzy/views/snippets/s_cta_box.xml index b827352ab..bde94b598 100644 --- a/theme_buzzy/views/snippets/s_cta_box.xml +++ b/theme_buzzy/views/snippets/s_cta_box.xml @@ -4,8 +4,17 @@ + + diff --git a/theme_buzzy/views/snippets/s_discovery.xml b/theme_buzzy/views/snippets/s_discovery.xml new file mode 100644 index 000000000..0cd860ab3 --- /dev/null +++ b/theme_buzzy/views/snippets/s_discovery.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/theme_buzzy/views/snippets/s_features_grid.xml b/theme_buzzy/views/snippets/s_features_grid.xml index 132c04d4b..9cdc7f3e8 100644 --- a/theme_buzzy/views/snippets/s_features_grid.xml +++ b/theme_buzzy/views/snippets/s_features_grid.xml @@ -2,10 +2,6 @@