diff --git a/theme_zap/__manifest__.py b/theme_zap/__manifest__.py index 1a000fc3f..34d85cc44 100644 --- a/theme_zap/__manifest__.py +++ b/theme_zap/__manifest__.py @@ -13,6 +13,10 @@ 'views/snippets/s_cta_box.xml', 'views/snippets/s_banner.xml', + 'views/snippets/s_discovery.xml', + 'views/snippets/s_comparisons.xml', + 'views/snippets/s_showcase.xml', + 'views/snippets/s_cta_card.xml', 'views/snippets/s_striped_top.xml', 'views/snippets/s_call_to_action.xml', 'views/snippets/s_sidegrid.xml', @@ -25,6 +29,7 @@ 'views/snippets/s_masonry_block.xml', 'views/snippets/s_media_list.xml', 'views/snippets/s_numbers.xml', + 'views/snippets/s_numbers_charts.xml', 'views/snippets/s_references.xml', 'views/snippets/s_references_social.xml', 'views/snippets/s_references_grid.xml', @@ -40,6 +45,7 @@ 'views/snippets/s_key_benefits.xml', 'views/snippets/s_pricelist_boxed.xml', 'views/snippets/s_striped_center_top.xml', + 'views/snippets/s_striped.xml', 'views/snippets/s_image_title.xml', 'views/snippets/s_big_number.xml', 'views/snippets/s_images_constellation.xml', @@ -51,16 +57,15 @@ 'static/description/zap_screenshot.jpg', ], 'images_preview_theme': { - 'website.s_banner_default_image': '/theme_zap/static/src/img/content/banner.jpg', - 'website.s_three_columns_default_image_1': '/theme_zap/static/src/img/content/three_columns_01.jpg', - 'website.s_three_columns_default_image_2': '/theme_zap/static/src/img/content/three_columns_02.jpg', + 'website.s_image_text_default_image': '/theme_zap/static/src/img/content/s_image_text.jpg', + 'website.s_media_list_default_image_1': '/theme_zap/static/src/img/content/media_list_01.jpg', + 'website.s_media_list_default_image_2': '/theme_zap/static/src/img/content/media_list_02.jpg', + 'website.s_text_cover_default_image': '/theme_zap/static/src/img/snippets/s_cover.jpg', + 'website.s_text_image_default_image': '/theme_zap/static/src/img/content/s_text_image.jpg', 'website.s_three_columns_default_image_3': '/theme_zap/static/src/img/content/three_columns_03.jpg', - 'website.library_image_08': '/theme_zap/static/src/img/backgrounds/01.jpg', - 'website.s_masonry_block_default_image_1': '/theme_zap/static/src/img/backgrounds/16.jpg', - 'website.library_image_02': '/theme_zap/static/src/img/content/masonry_block_02.jpg', }, 'configurator_snippets': { - 'homepage': ['s_banner', 's_three_columns', 's_color_blocks_2', 's_features', 's_masonry_block', 's_references'], + 'homepage': ['s_discovery', 's_key_images', 's_striped', 's_showcase', 's_image_title', 's_numbers_charts', 's_cta_card'], }, 'new_page_templates': { 'about': { diff --git a/theme_zap/models/theme_zap.py b/theme_zap/models/theme_zap.py index d58433bff..fdb0813d7 100644 --- a/theme_zap/models/theme_zap.py +++ b/theme_zap/models/theme_zap.py @@ -5,9 +5,7 @@ class ThemeZap(models.AbstractModel): _inherit = 'theme.utils' def _theme_zap_post_copy(self, mod): - self.enable_view('website.template_header_hamburger') - self.enable_view('website.no_autohide_menu') - self.enable_view('website.header_navbar_pills_style') + self.enable_view('website.template_header_sales_four') self.enable_view('website.template_footer_links') diff --git a/theme_zap/static/description/theme_zap.svg b/theme_zap/static/description/theme_zap.svg index e63c749ad..0fb629978 100644 --- a/theme_zap/static/description/theme_zap.svg +++ b/theme_zap/static/description/theme_zap.svg @@ -1,228 +1,250 @@ - - + - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - + + - - - + + + - - - + + + - - - - - - - - - - LOGO - - - - Contact + + + + + + + + + + + + + + + + + + + + + + + + + + + Section Title + + + + + + + + + + + + - - - - - - Welcome Message - - - - - Discover + + + + Section title + + + + + + + + + $ 2.4B + + + + + + + + +300,000 + + + + + + + + 75% + + + + + - - - - - - - Entry Title - - - + + + + + + + Section Title + + + + + + + + Section Title + + + + + + - - - - Entry Title - - - + + + + + - - - - Entry Title - - - + + + + + + + + + + + + + + + + Section Title + + + + + + + + + 04 + + + + + + + + 03 + + + + + + + + 02 + + + + + + + + 01 + + + + + + + Section Title + + + + + + + + + + + + Discover + + + Discover + + + Welcome Message + + + + + - - - - - Section Title - - - - - - Details + + + + + + + - + + + + + + + + - - - - - - - Feature #01 - - - - - - - Feature #02 - - - - - - - Feature #03 - - - - - - - - - - - - - - Subtitle #01 - - - Subtitle #02 - - - - - - Section Title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Entry Title - Entry Title - Entry Title - Entry Title - Entry Title - - - - - - - + + + + + diff --git a/theme_zap/static/description/zap_cover.gif b/theme_zap/static/description/zap_cover.gif deleted file mode 100644 index 6d46e6e5f..000000000 Binary files a/theme_zap/static/description/zap_cover.gif and /dev/null differ diff --git a/theme_zap/static/description/zap_cover.png b/theme_zap/static/description/zap_cover.png new file mode 100644 index 000000000..95910dbe1 Binary files /dev/null and b/theme_zap/static/description/zap_cover.png differ diff --git a/theme_zap/static/description/zap_screenshot.jpg b/theme_zap/static/description/zap_screenshot.jpg index 85b6f95e2..70ed84771 100644 Binary files a/theme_zap/static/description/zap_screenshot.jpg and b/theme_zap/static/description/zap_screenshot.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/01.jpg b/theme_zap/static/src/img/backgrounds/01.jpg index 29cb6fe9a..4b8c92f2c 100644 Binary files a/theme_zap/static/src/img/backgrounds/01.jpg and b/theme_zap/static/src/img/backgrounds/01.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/05.jpg b/theme_zap/static/src/img/backgrounds/05.jpg index 8598ba3af..a3823d347 100644 Binary files a/theme_zap/static/src/img/backgrounds/05.jpg and b/theme_zap/static/src/img/backgrounds/05.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/06.jpg b/theme_zap/static/src/img/backgrounds/06.jpg index 81cd08433..c13b50865 100644 Binary files a/theme_zap/static/src/img/backgrounds/06.jpg and b/theme_zap/static/src/img/backgrounds/06.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/08.jpg b/theme_zap/static/src/img/backgrounds/08.jpg index ba36a7b61..636e13cb9 100644 Binary files a/theme_zap/static/src/img/backgrounds/08.jpg and b/theme_zap/static/src/img/backgrounds/08.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/12.jpg b/theme_zap/static/src/img/backgrounds/12.jpg index 0b3c5c951..e3dc0756d 100644 Binary files a/theme_zap/static/src/img/backgrounds/12.jpg and b/theme_zap/static/src/img/backgrounds/12.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/13.jpg b/theme_zap/static/src/img/backgrounds/13.jpg index cc3076875..046cd0dac 100644 Binary files a/theme_zap/static/src/img/backgrounds/13.jpg and b/theme_zap/static/src/img/backgrounds/13.jpg differ diff --git a/theme_zap/static/src/img/backgrounds/16.jpg b/theme_zap/static/src/img/backgrounds/16.jpg index 0d6475c1e..7079aa53e 100644 Binary files a/theme_zap/static/src/img/backgrounds/16.jpg and b/theme_zap/static/src/img/backgrounds/16.jpg differ diff --git a/theme_zap/static/src/img/content/image_text.jpg b/theme_zap/static/src/img/content/image_text.jpg index 7b316dd56..2a5c5ed8f 100644 Binary files a/theme_zap/static/src/img/content/image_text.jpg and b/theme_zap/static/src/img/content/image_text.jpg differ diff --git a/theme_zap/static/src/img/content/picture.jpg b/theme_zap/static/src/img/content/picture.jpg index a72bc508b..dd74301f0 100644 Binary files a/theme_zap/static/src/img/content/picture.jpg and b/theme_zap/static/src/img/content/picture.jpg differ diff --git a/theme_zap/static/src/img/content/s_showcase_default_image.jpg b/theme_zap/static/src/img/content/s_showcase_default_image.jpg new file mode 100644 index 000000000..5719d09cc Binary files /dev/null and b/theme_zap/static/src/img/content/s_showcase_default_image.jpg differ diff --git a/theme_zap/static/src/img/content/s_text_cover.jpg b/theme_zap/static/src/img/content/s_text_cover.jpg new file mode 100644 index 000000000..1a2433255 Binary files /dev/null and b/theme_zap/static/src/img/content/s_text_cover.jpg differ diff --git a/theme_zap/static/src/img/content/text_image.jpg b/theme_zap/static/src/img/content/text_image.jpg index fa4af6667..32ff6d50f 100644 Binary files a/theme_zap/static/src/img/content/text_image.jpg and b/theme_zap/static/src/img/content/text_image.jpg differ diff --git a/theme_zap/static/src/js/tour.js b/theme_zap/static/src/js/tour.js index 972689ca3..4765a4356 100644 --- a/theme_zap/static/src/js/tour.js +++ b/theme_zap/static/src/js/tour.js @@ -4,39 +4,44 @@ import * as wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_banner', - name: 'Banner', + id: 's_discovery', + name: 'Discovery', groupName: "Intro", }, { - id: 's_three_columns', - name: 'Columns', + id: 's_key_images', + name: 'Key Images', groupName: "Columns", }, { - id: 's_color_blocks_2', - name: 'Big Boxes', + id: 's_striped', + name: 'Striped', groupName: "Content", }, { - id: 's_features', - name: 'Features', + id: 's_showcase', + name: 'Showcase', groupName: "Content", }, { - id: 's_masonry_block', - name: 'Masonry', + id: 's_image_title', + name: 'Image Title', groupName: "Images", }, { - id: 's_references', - name: 'References', - groupName: "People", + id: 's_numbers_charts', + name: 'Numbers Charts', + groupName: "Content", + }, + { + id: 's_cta_card', + name: 'CTA Card', + groupName: "Content", }, ]; wTourUtils.registerThemeHomepageTour("zap_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"zap-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"base-2"'), ...wTourUtils.dragNDrop(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), @@ -48,4 +53,5 @@ wTourUtils.registerThemeHomepageTour("zap_tour", () => [ ...wTourUtils.clickOnSnippet(snippets[5], 'top'), wTourUtils.changeBackgroundColor(), wTourUtils.selectColorPalette(), + ...wTourUtils.dragNDrop(snippets[6]), ]); diff --git a/theme_zap/static/src/scss/bootstrap_overridden.scss b/theme_zap/static/src/scss/bootstrap_overridden.scss index a35e7cbc0..f44e19a2b 100644 --- a/theme_zap/static/src/scss/bootstrap_overridden.scss +++ b/theme_zap/static/src/scss/bootstrap_overridden.scss @@ -57,12 +57,6 @@ // Bootstrap //------------------------------------------------------------------------------// -// Options -// -// Quickly modify global styling by enabling or disabling optional features. - -$enable-shadows: true; - // Spacing // // Control the default styling of most Bootstrap elements by modifying these diff --git a/theme_zap/static/src/scss/primary_variables.scss b/theme_zap/static/src/scss/primary_variables.scss index 52de288b4..cf28cf6c0 100644 --- a/theme_zap/static/src/scss/primary_variables.scss +++ b/theme_zap/static/src/scss/primary_variables.scss @@ -4,16 +4,14 @@ $o-website-values-palettes: ( ( - 'color-palettes-name': 'zap-1', + 'color-palettes-name': 'base-2', // Header - 'header-template': 'hamburger', - 'logo-height': 2.75rem, - 'fixed-logo-height': 2rem, - 'header-links-style': 'fill', + 'header-template': 'sales_four', // Font - 'font': 'Lato', + 'font': 'Open Sans', + 'headings-font': 'Manrope', // Buttons 'btn-padding-y': .625rem, @@ -98,6 +96,10 @@ $o-theme-font-configs: ( ), ) ), + 'Manrope': ( + 'family': ('Manrope', sans-serif), + 'url': 'Manrope:300,300i,400,400i,600,600i', + ), ); // Headings @@ -169,8 +171,6 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'zap-1'); - $o-color-palettes-compatibility-indexes: ( 1: 'zap-1', 2: 'zap-2', diff --git a/theme_zap/views/images_library.xml b/theme_zap/views/images_library.xml index 48b5a67b2..aebec6872 100644 --- a/theme_zap/views/images_library.xml +++ b/theme_zap/views/images_library.xml @@ -411,6 +411,14 @@ /theme_zap/static/src/img/content/s_images_mosaic_default_image_5.jpg + + + website.s_showcase_default_image + website.s_showcase_default_image + /theme_zap/static/src/img/content/s_showcase_default_image.jpg + + + website.s_intro_pill_default_image @@ -467,4 +475,11 @@ /theme_zap/static/src/img/content/s_empowerment_default_image.jpg + + + website.s_text_cover_default_image + website.s_text_cover_default_image + /theme_zap/static/src/img/content/s_text_cover.jpg + + diff --git a/theme_zap/views/snippets/s_banner.xml b/theme_zap/views/snippets/s_banner.xml index 3f129cf5a..98bb6fddd 100644 --- a/theme_zap/views/snippets/s_banner.xml +++ b/theme_zap/views/snippets/s_banner.xml @@ -47,14 +47,4 @@ -
- - - diff --git a/theme_zap/views/snippets/s_comparisons.xml b/theme_zap/views/snippets/s_comparisons.xml new file mode 100644 index 000000000..e68be7a24 --- /dev/null +++ b/theme_zap/views/snippets/s_comparisons.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/theme_zap/views/snippets/s_cta_card.xml b/theme_zap/views/snippets/s_cta_card.xml new file mode 100644 index 000000000..67d963325 --- /dev/null +++ b/theme_zap/views/snippets/s_cta_card.xml @@ -0,0 +1,47 @@ + + + + + + diff --git a/theme_zap/views/snippets/s_discovery.xml b/theme_zap/views/snippets/s_discovery.xml new file mode 100644 index 000000000..2576ad268 --- /dev/null +++ b/theme_zap/views/snippets/s_discovery.xml @@ -0,0 +1,41 @@ + + + + + + diff --git a/theme_zap/views/snippets/s_image_text.xml b/theme_zap/views/snippets/s_image_text.xml index 049830ac7..6a86e3fbb 100644 --- a/theme_zap/views/snippets/s_image_text.xml +++ b/theme_zap/views/snippets/s_image_text.xml @@ -6,14 +6,6 @@ - - - - - - -


-
diff --git a/theme_zap/views/snippets/s_image_title.xml b/theme_zap/views/snippets/s_image_title.xml index c5958615d..6501ad8cf 100644 --- a/theme_zap/views/snippets/s_image_title.xml +++ b/theme_zap/views/snippets/s_image_title.xml @@ -2,9 +2,16 @@ diff --git a/theme_zap/views/snippets/s_key_images.xml b/theme_zap/views/snippets/s_key_images.xml index 2b301856b..5b14585de 100644 --- a/theme_zap/views/snippets/s_key_images.xml +++ b/theme_zap/views/snippets/s_key_images.xml @@ -2,6 +2,9 @@