diff --git a/theme_cobalt/__manifest__.py b/theme_cobalt/__manifest__.py index 6d8cc15c4..3ef32bbb2 100644 --- a/theme_cobalt/__manifest__.py +++ b/theme_cobalt/__manifest__.py @@ -17,16 +17,8 @@ 'static/description/cobalt_poster.jpg', 'static/description/cobalt_screenshot.jpg', ], - 'images_preview_theme': { - 'website.library_image_03': '/theme_cobalt/static/src/img/pictures/s_image_1.jpg', - 'website.library_image_14': '/theme_cobalt/static/src/img/pictures/s_image_6.jpg', - 'website.library_image_10': '/theme_cobalt/static/src/img/pictures/s_image_4.jpg', - 'website.library_image_13': '/theme_cobalt/static/src/img/pictures/s_image_2.jpg', - 'website.library_image_16': '/theme_cobalt/static/src/img/pictures/s_image_3.jpg', - 'website.library_image_05': '/theme_cobalt/static/src/img/pictures/s_image_5.jpg', - }, 'configurator_snippets': { - 'homepage': ['s_banner', 's_references', 's_text_image', 's_color_blocks_2', 's_images_wall'], + 'homepage': ['s_banner', 's_image_text', 's_key_images', 's_text_image', 's_company_team_detail', 's_references_grid'], }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-cobalt.odoo.com', diff --git a/theme_cobalt/models/theme_cobalt.py b/theme_cobalt/models/theme_cobalt.py index 5a7501a2d..972f62468 100644 --- a/theme_cobalt/models/theme_cobalt.py +++ b/theme_cobalt/models/theme_cobalt.py @@ -7,3 +7,6 @@ class ThemeCobalt(models.AbstractModel): def _theme_cobalt_post_copy(self, mod): self.enable_asset("website.ripple_effect_scss") self.enable_asset("website.ripple_effect_js") + self.enable_view("website.template_header_boxed") + self.enable_view("website.template_footer_call_to_action") + self.enable_view("website.header_navbar_pills_style") diff --git a/theme_cobalt/static/description/cobalt_poster.jpg b/theme_cobalt/static/description/cobalt_poster.jpg index de791ce90..00b9c90a1 100644 Binary files a/theme_cobalt/static/description/cobalt_poster.jpg and b/theme_cobalt/static/description/cobalt_poster.jpg differ diff --git a/theme_cobalt/static/description/cobalt_screenshot.jpg b/theme_cobalt/static/description/cobalt_screenshot.jpg index ca67de467..ac79c73c1 100644 Binary files a/theme_cobalt/static/description/cobalt_screenshot.jpg and b/theme_cobalt/static/description/cobalt_screenshot.jpg differ diff --git a/theme_cobalt/static/description/theme_cobalt.svg b/theme_cobalt/static/description/theme_cobalt.svg index 9a1193096..d162bc1dd 100644 --- a/theme_cobalt/static/description/theme_cobalt.svg +++ b/theme_cobalt/static/description/theme_cobalt.svg @@ -1,40 +1,36 @@ - - theme_cobalt + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -47,315 +43,1476 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - Discover - - - - Welcome - Message - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - Block Title - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - Block Title - - - - - Discover - - - - - - Block Title - - - - - Discover - - - - - - - - - - - - - - - - - - Section Title - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theme_cobalt/static/shapes/s_banner_2.svg b/theme_cobalt/static/shapes/s_banner_2.svg new file mode 100644 index 000000000..97546e574 --- /dev/null +++ b/theme_cobalt/static/shapes/s_banner_2.svg @@ -0,0 +1 @@ +data trends \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_image_text_2.svg b/theme_cobalt/static/shapes/s_image_text_2.svg new file mode 100644 index 000000000..04a066c37 --- /dev/null +++ b/theme_cobalt/static/shapes/s_image_text_2.svg @@ -0,0 +1 @@ +order confirmed \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_key_images_1.svg b/theme_cobalt/static/shapes/s_key_images_1.svg new file mode 100644 index 000000000..9d7c27e9f --- /dev/null +++ b/theme_cobalt/static/shapes/s_key_images_1.svg @@ -0,0 +1 @@ +on the office \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_key_images_2.svg b/theme_cobalt/static/shapes/s_key_images_2.svg new file mode 100644 index 000000000..5350c5904 --- /dev/null +++ b/theme_cobalt/static/shapes/s_key_images_2.svg @@ -0,0 +1 @@ +team spirit \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_key_images_3.svg b/theme_cobalt/static/shapes/s_key_images_3.svg new file mode 100644 index 000000000..415bae1f5 --- /dev/null +++ b/theme_cobalt/static/shapes/s_key_images_3.svg @@ -0,0 +1 @@ +wind turbine \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_key_images_4.svg b/theme_cobalt/static/shapes/s_key_images_4.svg new file mode 100644 index 000000000..10237a681 --- /dev/null +++ b/theme_cobalt/static/shapes/s_key_images_4.svg @@ -0,0 +1 @@ +in progress \ No newline at end of file diff --git a/theme_cobalt/static/src/js/tour.js b/theme_cobalt/static/src/js/tour.js index 5a69d8177..1ff26ea69 100644 --- a/theme_cobalt/static/src/js/tour.js +++ b/theme_cobalt/static/src/js/tour.js @@ -9,9 +9,14 @@ const snippets = [ groupName: "Intro", }, { - id: 's_references', - name: 'References', - groupName: "People", + id: 's_image_text', + name: 'Image - Text', + groupName: "Content", + }, + { + id: 's_key_images', + name: 'Key Images', + groupName: "Columns", }, { id: 's_text_image', @@ -19,33 +24,26 @@ const snippets = [ groupName: "Content", }, { - id: 's_color_blocks_2', - name: 'Big Boxes', - groupName: "Content", + id: 's_company_team_detail', + name: 'Team Detail', + groupName: "People", }, { - id: 's_title', - name: 'Title', - groupName: "Text", - }, - { - id: 's_image_gallery', - name: 'Images Wall', - groupName: "Images", + id: 's_references_grid', + name: 'References Grid', + groupName: "People", }, ]; wTourUtils.registerThemeHomepageTour("cobalt_tour", () => [ - wTourUtils.assertCssVariable('--color-palettes-name', '"cobalt-1"'), + wTourUtils.assertCssVariable('--color-palettes-name', '"default-8"'), ...wTourUtils.insertSnippet(snippets[0]), ...wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), - ...wTourUtils.insertSnippet(snippets[1]), ...wTourUtils.insertSnippet(snippets[2]), ...wTourUtils.insertSnippet(snippets[3]), - ...wTourUtils.insertSnippet(snippets[4]), ...wTourUtils.insertSnippet(snippets[5]), ]); diff --git a/theme_cobalt/static/src/scss/primary_variables.scss b/theme_cobalt/static/src/scss/primary_variables.scss index 932f54f2b..9ece0eab9 100644 --- a/theme_cobalt/static/src/scss/primary_variables.scss +++ b/theme_cobalt/static/src/scss/primary_variables.scss @@ -16,6 +16,10 @@ $o-theme-font-configs: ( 'family': ('Abril Fatface', serif), 'url': 'Abril+Fatface:300,300i,400,400i,700,700i', ), + 'Poppins': ( + 'family': ('Poppins', sans-serif), + 'url': 'Poppins:300,300i,400,400i,700,700i', + ), ); @@ -25,20 +29,28 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'cobalt-1', + 'color-palettes-name': 'default-8', 'font': 'Inter', + 'headings-font': 'Poppins', 'headings-line-height': 1.1, 'btn-ripple': true, - 'btn-secondary-outline': true, - 'btn-border-radius': 2px, + 'btn-border-radius': 10rem, + 'btn-border-radius-sm': 10rem, + 'btn-border-radius-lg': 10rem, + 'btn-padding-y': .5rem, + 'btn-padding-x': 1rem, + 'btn-padding-y-lg': 1rem, + 'btn-padding-x-lg': 2rem, + 'btn-padding-x-sm': .5rem, + 'header-template': 'boxed', + 'header-links-style': 'pills', + 'footer-template': 'call_to_action', ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'cobalt-1'); - $o-color-palettes-compatibility-indexes: ( 1: 'cobalt-1', 2: 'generic-1', diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml index cce9b329f..8f4d19ee6 100644 --- a/theme_cobalt/views/customizations.xml +++ b/theme_cobalt/views/customizations.xml @@ -5,7 +5,11 @@
@@ -14,7 +18,7 @@ - + @@ -22,35 +26,21 @@ - -
- Marketing + +
+
- - - - - The ultimate marketing platform for brands + +

The
ultimate
marketing platform

 -

Building game-changing digital experiences designed to set your brand apart.

- - - - - - - - - - @@ -58,17 +48,21 @@ @@ -273,7 +266,7 @@ @@ -563,7 +613,7 @@ @@ -572,6 +622,9 @@ + + + @@ -580,6 +633,9 @@ + + + @@ -591,7 +647,7 @@ - Building the future
with NovaDev Solutions + Building the future
with NovaDev Solutions @@ -607,4 +663,47 @@ + + + + + + + + + diff --git a/theme_cobalt/views/images.xml b/theme_cobalt/views/images.xml index 1271030a0..b66beecf0 100644 --- a/theme_cobalt/views/images.xml +++ b/theme_cobalt/views/images.xml @@ -30,8 +30,8 @@ /theme_cobalt/static/src/img/pictures/s_three_columns_1.jpg - s_three_columns_default_image_2 - s_three_columns_default_image_2 + website.s_three_columns_default_image_2 + website.s_three_columns_default_image_2 /theme_cobalt/static/src/img/pictures/s_three_columns_2.jpg @@ -397,4 +397,54 @@ /theme_cobalt/static/src/img/pictures/s_image_3.jpg + + + website.s_striped_top_default_image + website.s_striped_top_default_image + /theme_cobalt/static/src/img/pictures/s_picture.jpg + + + + + website.s_sidegrid_default_image_1 + website.s_sidegrid_default_image_1 + /theme_cobalt/static/src/img/pictures/s_gallery_3.jpg + + + website.s_sidegrid_default_image_2 + website.s_sidegrid_default_image_2 + /theme_cobalt/static/src/img/pictures/s_image_3.jpg + + + website.s_sidegrid_default_image_3 + website.s_sidegrid_default_image_3 + /theme_cobalt/static/src/img/pictures/s_image_4.jpg + + + website.s_sidegrid_default_image_4 + website.s_sidegrid_default_image_4 + /theme_cobalt/static/src/img/pictures/s_kickoff_default_image.jpg + + + + + website.s_framed_intro_default_image + website.s_framed_intro_default_image + /theme_cobalt/static/src/img/pictures/s_image_5.jpg + + + + + website.s_shape_image_default_image + website.s_shape_image_default_image + /theme_cobalt/static/src/img/pictures/s_banner.jpg + + + + + website.s_showcase_default_image + website.s_showcase_default_image + /theme_cobalt/static/src/img/pictures/s_image_5.jpg + + diff --git a/theme_cobalt/views/new_page_template.xml b/theme_cobalt/views/new_page_template.xml index 081c348a9..8bbc10138 100644 --- a/theme_cobalt/views/new_page_template.xml +++ b/theme_cobalt/views/new_page_template.xml @@ -46,9 +46,10 @@ @@ -96,9 +97,10 @@