diff --git a/theme_nano/__manifest__.py b/theme_nano/__manifest__.py index 7ea73efe3..5dfeb7739 100644 --- a/theme_nano/__manifest__.py +++ b/theme_nano/__manifest__.py @@ -42,6 +42,10 @@ 'views/snippets/s_shape_image.xml', 'views/snippets/s_text_cover.xml', 'views/snippets/s_empowerment.xml', + 'views/snippets/s_discovery.xml', + 'views/snippets/s_numbers.xml', + 'views/snippets/s_image_text_overlap.xml', + 'views/snippets/s_company_team_basic.xml', 'views/new_page_template.xml', ], 'images': [ @@ -57,6 +61,7 @@ 'website.library_image_03': '/theme_nano/static/src/img/snippets/s_images_wall_05.jpg', 'website.library_image_02': '/theme_nano/static/src/img/snippets/s_images_wall_06.jpg', 'website.s_parallax_default_image': '/theme_nano/static/src/img/snippets/s_parallax.jpg', + 'website.s_picture_default_image': '/theme_nano/static/src/img/snippets/s_picture.jpg', 'website.s_reference_demo_image_1': '/theme_nano/static/src/img/snippets/s_reference_01.png', 'website.s_reference_demo_image_2': '/theme_nano/static/src/img/snippets/s_reference_02.png', 'website.s_reference_demo_image_3': '/theme_nano/static/src/img/snippets/s_reference_03.png', @@ -65,7 +70,7 @@ 'website.s_reference_default_image_6': '/theme_nano/static/src/img/snippets/s_reference_06.png', }, 'configurator_snippets': { - 'homepage': ['s_cover', 's_features', 's_text_block', 's_images_wall', 's_parallax', 's_references'], + 'homepage': ['s_discovery', 's_parallax', 's_text_block', 's_key_images', 's_image_text_overlap', 's_company_team_basic', 's_references', 's_numbers', 's_cta_box'], }, 'new_page_templates': { 'about': { diff --git a/theme_nano/models/theme_nano.py b/theme_nano/models/theme_nano.py index 63b12ec5a..25336b929 100644 --- a/theme_nano/models/theme_nano.py +++ b/theme_nano/models/theme_nano.py @@ -5,12 +5,8 @@ class ThemeNano(models.AbstractModel): _inherit = 'theme.utils' def _theme_nano_post_copy(self, mod): - self.enable_view('website.template_header_search') - self.enable_view('website.header_navbar_pills_style') self.enable_view('website.template_footer_descriptive') - 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_nano/static/description/nano_cover.gif b/theme_nano/static/description/nano_cover.gif deleted file mode 100644 index d048af29b..000000000 Binary files a/theme_nano/static/description/nano_cover.gif and /dev/null differ diff --git a/theme_nano/static/description/nano_cover.jpg b/theme_nano/static/description/nano_cover.jpg new file mode 100644 index 000000000..8e873996f Binary files /dev/null and b/theme_nano/static/description/nano_cover.jpg differ diff --git a/theme_nano/static/description/nano_screenshot.jpg b/theme_nano/static/description/nano_screenshot.jpg index 85f6c135d..130520761 100644 Binary files a/theme_nano/static/description/nano_screenshot.jpg and b/theme_nano/static/description/nano_screenshot.jpg differ diff --git a/theme_nano/static/description/theme_nano.svg b/theme_nano/static/description/theme_nano.svg index 50d8ddd95..e95018989 100644 --- a/theme_nano/static/description/theme_nano.svg +++ b/theme_nano/static/description/theme_nano.svg @@ -1,172 +1,238 @@ - - + - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - - - LOGO - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - Welcome Message - - - - - Contact us + + + + + + + KPI + + + KPI + + + KPI + + + + + + Section title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Section title + + + + + + + Section title + + + + + + + + + + + + + + + + + + + + - - - - - - Feature #01 - - - - - - Feature #02 - - - - - - Feature #03 - - + + + + + + + Welcome message + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Section Title - - - - - - Section Title - - - - - - - Entry Title - - - - - - - Entry Title - - - - - - - - - - - - - + + + + - + + + + + diff --git a/theme_nano/static/src/img/snippets/s_key_images_default_image_1.jpg b/theme_nano/static/src/img/snippets/s_key_images_default_image_1.jpg new file mode 100644 index 000000000..7c07acb53 Binary files /dev/null and b/theme_nano/static/src/img/snippets/s_key_images_default_image_1.jpg differ diff --git a/theme_nano/static/src/img/snippets/s_key_images_default_image_2.jpg b/theme_nano/static/src/img/snippets/s_key_images_default_image_2.jpg new file mode 100644 index 000000000..2cfa4e3f9 Binary files /dev/null and b/theme_nano/static/src/img/snippets/s_key_images_default_image_2.jpg differ diff --git a/theme_nano/static/src/img/snippets/s_key_images_default_image_3.jpg b/theme_nano/static/src/img/snippets/s_key_images_default_image_3.jpg new file mode 100644 index 000000000..f7cdf6fd7 Binary files /dev/null and b/theme_nano/static/src/img/snippets/s_key_images_default_image_3.jpg differ diff --git a/theme_nano/static/src/img/snippets/s_key_images_default_image_4.jpg b/theme_nano/static/src/img/snippets/s_key_images_default_image_4.jpg new file mode 100644 index 000000000..c991a446e Binary files /dev/null and b/theme_nano/static/src/img/snippets/s_key_images_default_image_4.jpg differ diff --git a/theme_nano/static/src/img/snippets/s_parallax.jpg b/theme_nano/static/src/img/snippets/s_parallax.jpg index cd73e323a..efb79b942 100644 Binary files a/theme_nano/static/src/img/snippets/s_parallax.jpg and b/theme_nano/static/src/img/snippets/s_parallax.jpg differ diff --git a/theme_nano/static/src/img/snippets/s_picture.jpg b/theme_nano/static/src/img/snippets/s_picture.jpg index 19928f3f4..a143ec1c5 100644 Binary files a/theme_nano/static/src/img/snippets/s_picture.jpg and b/theme_nano/static/src/img/snippets/s_picture.jpg differ diff --git a/theme_nano/static/src/img/snippets/s_reference_01.png b/theme_nano/static/src/img/snippets/s_reference_01.png index 7a6b09eef..91ec5827a 100644 Binary files a/theme_nano/static/src/img/snippets/s_reference_01.png and b/theme_nano/static/src/img/snippets/s_reference_01.png differ diff --git a/theme_nano/static/src/img/snippets/s_reference_02.png b/theme_nano/static/src/img/snippets/s_reference_02.png index 07b087bf3..7c1293f2f 100644 Binary files a/theme_nano/static/src/img/snippets/s_reference_02.png and b/theme_nano/static/src/img/snippets/s_reference_02.png differ diff --git a/theme_nano/static/src/img/snippets/s_reference_03.png b/theme_nano/static/src/img/snippets/s_reference_03.png index 2fa325683..d143b2cf8 100644 Binary files a/theme_nano/static/src/img/snippets/s_reference_03.png and b/theme_nano/static/src/img/snippets/s_reference_03.png differ diff --git a/theme_nano/static/src/img/snippets/s_reference_04.png b/theme_nano/static/src/img/snippets/s_reference_04.png index 210aa86ee..9e09465f0 100644 Binary files a/theme_nano/static/src/img/snippets/s_reference_04.png and b/theme_nano/static/src/img/snippets/s_reference_04.png differ diff --git a/theme_nano/static/src/img/snippets/s_reference_05.png b/theme_nano/static/src/img/snippets/s_reference_05.png index 83707b43f..9fb2c7ea1 100644 Binary files a/theme_nano/static/src/img/snippets/s_reference_05.png and b/theme_nano/static/src/img/snippets/s_reference_05.png differ diff --git a/theme_nano/static/src/img/snippets/s_reference_06.png b/theme_nano/static/src/img/snippets/s_reference_06.png index aa317817c..e7a5c9c73 100644 Binary files a/theme_nano/static/src/img/snippets/s_reference_06.png and b/theme_nano/static/src/img/snippets/s_reference_06.png differ diff --git a/theme_nano/static/src/js/tour.js b/theme_nano/static/src/js/tour.js index c8cc2d14d..cbb102872 100644 --- a/theme_nano/static/src/js/tour.js +++ b/theme_nano/static/src/js/tour.js @@ -4,35 +4,50 @@ import * as wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_cover', - name: 'Cover', + id: 's_discovery', + name: 'Discovery', groupName: "Intro", }, - { - id: 's_features', - name: 'Features', - groupName: "Content", - }, - { - id: 's_text_block', - name: 'Text', - groupName: "Text", - }, - { - id: 's_images_wall', - name: 'Images Wall', - groupName: "Images", - }, { id: 's_parallax', name: 'Parallax', groupName: "Images", }, + { + id: 's_text_block', + name: 'Text', + groupName: "Text", + }, + { + id: 's_key_images', + name: 'Key Images', + groupName: "Columns", + }, + { + id: 's_image_text_overlap', + name: 'Image - Text Overlap', + groupName: "Content", + }, + { + id: 's_company_team', + name: 'Team', + groupName: "People", + }, { id: 's_references', name: 'References', groupName: "People", }, + { + id: 's_numbers', + name: 'Numbers', + groupName: "Content", + }, + { + id: 's_cta_box', + name: 'Box Call to Action', + groupName: "Content", + }, ]; wTourUtils.registerThemeHomepageTour("nano_tour", () => [ diff --git a/theme_nano/static/src/scss/primary_variables.scss b/theme_nano/static/src/scss/primary_variables.scss index 7e679d60f..7f1c354ca 100644 --- a/theme_nano/static/src/scss/primary_variables.scss +++ b/theme_nano/static/src/scss/primary_variables.scss @@ -7,24 +7,29 @@ $o-website-values-palettes: ( 'color-palettes-name': 'nano-1', // Header - 'header-template': 'search', 'header-font-size': 1rem, 'header-links-style': 'fill', 'menu-border-radius': 0, // Font - 'font': 'Oxygen', - 'headings-font': 'Nunito', - 'buttons-font': 'Nunito', + 'font': 'Inter', + 'headings-font': 'Manrope', + 'buttons-font': 'Manrope', + + // Buttons + 'btn-padding-y': .5rem, + 'btn-padding-x': 1rem, + 'btn-padding-y-lg': 1rem, + 'btn-padding-x-lg': 2rem, + 'btn-border-radius': 10rem, + 'btn-border-radius-sm': 10rem, + 'btn-border-radius-lg': 10rem, // Body - 'layout': 'postcard', 'btn-ripple': true, // Footer 'footer-template': 'descriptive', - 'footer-effect': 'slideout_slide_hover', - 'footer-scrolltop': true, ), ); @@ -87,6 +92,14 @@ $o-theme-font-configs: ( 'family': ('Nunito', sans-serif), 'url': 'Nunito:300,300i,400,400i,700,700i', ), + 'Manrope': ( + 'family': ('Manrope', sans-serif), + 'url': 'Manrope:300,300i,400,400i,700,700i', + ), + 'Inter': ( + 'family': ('Inter', sans-serif), + 'url': 'Inter:300,300i,400,400i,700,700i', + ), ); // Headings @@ -114,7 +127,7 @@ $o-theme-btn-font-weight: 400; $o-theme-color-palettes: map-merge($o-theme-color-palettes, ( 'nano-1': ( - 'alpha': #ed8558, + 'alpha': #e33a07, 'beta': #74bcc5, 'gamma': #7cc086, 'delta': #afd5a6, diff --git a/theme_nano/views/images_library.xml b/theme_nano/views/images_library.xml index dc124f65b..0add10e69 100644 --- a/theme_nano/views/images_library.xml +++ b/theme_nano/views/images_library.xml @@ -449,22 +449,22 @@ website.s_key_images_default_image_1 website.s_key_images_default_image_1 - /theme_nano/static/src/img/theme/05.jpg + /theme_nano/static/src/img/snippets/s_key_images_default_image_1.jpg website.s_key_images_default_image_2 website.s_key_images_default_image_2 - /theme_nano/static/src/img/theme/06.jpg + /theme_nano/static/src/img/snippets/s_key_images_default_image_2.jpg website.s_key_images_default_image_3 website.s_key_images_default_image_3 - /theme_nano/static/src/img/theme/07.jpg + /theme_nano/static/src/img/snippets/s_key_images_default_image_3.jpg website.s_key_images_default_image_4 website.s_key_images_default_image_4 - /theme_nano/static/src/img/theme/08.jpg + /theme_nano/static/src/img/snippets/s_key_images_default_image_4.jpg diff --git a/theme_nano/views/new_page_template.xml b/theme_nano/views/new_page_template.xml index 38d757510..561c6292d 100644 --- a/theme_nano/views/new_page_template.xml +++ b/theme_nano/views/new_page_template.xml @@ -39,30 +39,21 @@ - - @@ -193,7 +184,13 @@ + + diff --git a/theme_nano/views/snippets/s_big_number.xml b/theme_nano/views/snippets/s_big_number.xml index 13eae023d..8e708a329 100644 --- a/theme_nano/views/snippets/s_big_number.xml +++ b/theme_nano/views/snippets/s_big_number.xml @@ -4,13 +4,13 @@
+
diff --git a/theme_nano/views/snippets/s_company_team_basic.xml b/theme_nano/views/snippets/s_company_team_basic.xml new file mode 100644 index 000000000..352d54f15 --- /dev/null +++ b/theme_nano/views/snippets/s_company_team_basic.xml @@ -0,0 +1,85 @@ + + + + + + diff --git a/theme_nano/views/snippets/s_cover.xml b/theme_nano/views/snippets/s_cover.xml index d9485769d..d1c125b99 100644 --- a/theme_nano/views/snippets/s_cover.xml +++ b/theme_nano/views/snippets/s_cover.xml @@ -18,14 +18,4 @@ - - diff --git a/theme_nano/views/snippets/s_cta_box.xml b/theme_nano/views/snippets/s_cta_box.xml index bf8b93f07..6c5bfc349 100644 --- a/theme_nano/views/snippets/s_cta_box.xml +++ b/theme_nano/views/snippets/s_cta_box.xml @@ -2,25 +2,29 @@ diff --git a/theme_nano/views/snippets/s_discovery.xml b/theme_nano/views/snippets/s_discovery.xml new file mode 100644 index 000000000..8d7187003 --- /dev/null +++ b/theme_nano/views/snippets/s_discovery.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/theme_nano/views/snippets/s_image_text_overlap.xml b/theme_nano/views/snippets/s_image_text_overlap.xml new file mode 100644 index 000000000..00b5e8f9d --- /dev/null +++ b/theme_nano/views/snippets/s_image_text_overlap.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/theme_nano/views/snippets/s_key_images.xml b/theme_nano/views/snippets/s_key_images.xml index 2b301856b..695665daa 100644 --- a/theme_nano/views/snippets/s_key_images.xml +++ b/theme_nano/views/snippets/s_key_images.xml @@ -2,23 +2,62 @@ diff --git a/theme_nano/views/snippets/s_numbers.xml b/theme_nano/views/snippets/s_numbers.xml new file mode 100644 index 000000000..f7c2ccf14 --- /dev/null +++ b/theme_nano/views/snippets/s_numbers.xml @@ -0,0 +1,32 @@ + + + + + + diff --git a/theme_nano/views/snippets/s_parallax.xml b/theme_nano/views/snippets/s_parallax.xml index 14c7cd64e..39ba78614 100644 --- a/theme_nano/views/snippets/s_parallax.xml +++ b/theme_nano/views/snippets/s_parallax.xml @@ -5,19 +5,10 @@ - {"shape":"web_editor/Rainy/10", "flip":["x","y"]} + - - -
- - - -
-
-

Feel free to come up with your big idea.
We take care of the rest.

-
-
+ + diff --git a/theme_nano/views/snippets/s_references.xml b/theme_nano/views/snippets/s_references.xml index 50989e6f6..f64c64a24 100644 --- a/theme_nano/views/snippets/s_references.xml +++ b/theme_nano/views/snippets/s_references.xml @@ -6,6 +6,13 @@ + +

Trusted by industry leaders

+
+ + + + diff --git a/theme_nano/views/snippets/s_references_grid.xml b/theme_nano/views/snippets/s_references_grid.xml index 25cceb526..94721ca2c 100644 --- a/theme_nano/views/snippets/s_references_grid.xml +++ b/theme_nano/views/snippets/s_references_grid.xml @@ -4,7 +4,7 @@ diff --git a/theme_nano/views/snippets/s_references_social.xml b/theme_nano/views/snippets/s_references_social.xml index 3f1ba0753..0a57cfde6 100644 --- a/theme_nano/views/snippets/s_references_social.xml +++ b/theme_nano/views/snippets/s_references_social.xml @@ -3,6 +3,9 @@ - diff --git a/theme_nano/views/snippets/s_text_block.xml b/theme_nano/views/snippets/s_text_block.xml index 4ca830726..00c76539e 100644 --- a/theme_nano/views/snippets/s_text_block.xml +++ b/theme_nano/views/snippets/s_text_block.xml @@ -4,11 +4,17 @@