diff --git a/theme_cobalt/__manifest__.py b/theme_cobalt/__manifest__.py index 946d40287..5deaeb885 100644 --- a/theme_cobalt/__manifest__.py +++ b/theme_cobalt/__manifest__.py @@ -16,6 +16,14 @@ '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', + }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-cobalt.odoo.com', 'assets': { diff --git a/theme_cobalt/data/ir_asset.xml b/theme_cobalt/data/ir_asset.xml index 9043aad52..84137c701 100644 --- a/theme_cobalt/data/ir_asset.xml +++ b/theme_cobalt/data/ir_asset.xml @@ -1,21 +1,19 @@ - - - theme_cobalt.primary_variables_scss - Primary variables SCSS - web._assets_primary_variables - theme_cobalt/static/src/scss/primary_variables.scss - + + theme_cobalt.primary_variables_scss + Primary variables SCSS + web._assets_primary_variables + theme_cobalt/static/src/scss/primary_variables.scss + - - theme_cobalt.bootstrap_overridden_scss - Bootstrap overridden SCSS - web._assets_frontend_helpers - prepend - theme_cobalt/static/src/scss/bootstrap_overridden.scss - + + theme_cobalt.bootstrap_overridden_scss + Bootstrap overridden SCSS + web._assets_frontend_helpers + prepend + theme_cobalt/static/src/scss/bootstrap_overridden.scss + - diff --git a/theme_cobalt/static/description/cobalt_poster.jpg b/theme_cobalt/static/description/cobalt_poster.jpg index bbb8233d6..de791ce90 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 4f5a54ca5..0179c57e3 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/shapes/s_banner.svg b/theme_cobalt/static/shapes/s_banner.svg new file mode 100644 index 000000000..0449a6219 --- /dev/null +++ b/theme_cobalt/static/shapes/s_banner.svg @@ -0,0 +1 @@ +interaction design \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_image_text.svg b/theme_cobalt/static/shapes/s_image_text.svg new file mode 100644 index 000000000..a1a2b80dc --- /dev/null +++ b/theme_cobalt/static/shapes/s_image_text.svg @@ -0,0 +1 @@ +status update \ No newline at end of file diff --git a/theme_cobalt/static/shapes/s_text_image.svg b/theme_cobalt/static/shapes/s_text_image.svg new file mode 100644 index 000000000..68f71b588 --- /dev/null +++ b/theme_cobalt/static/shapes/s_text_image.svg @@ -0,0 +1 @@ +product teardown \ No newline at end of file diff --git a/theme_cobalt/static/src/img/illustrations/s_text_image_default_image.svg b/theme_cobalt/static/shapes/website.s_text_image_default_image.svg similarity index 100% rename from theme_cobalt/static/src/img/illustrations/s_text_image_default_image.svg rename to theme_cobalt/static/shapes/website.s_text_image_default_image.svg diff --git a/theme_cobalt/static/src/img/illustrations/s_image_text_default_image.svg b/theme_cobalt/static/src/img/illustrations/s_image_text_default_image.svg deleted file mode 100644 index 84ec5b72f..000000000 --- a/theme_cobalt/static/src/img/illustrations/s_image_text_default_image.svg +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/theme_cobalt/static/src/img/pictures/s_gallery_1.jpg b/theme_cobalt/static/src/img/pictures/s_gallery_1.jpg new file mode 100644 index 000000000..30916cdca Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_gallery_1.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_gallery_2.jpg b/theme_cobalt/static/src/img/pictures/s_gallery_2.jpg new file mode 100644 index 000000000..a6af99986 Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_gallery_2.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_gallery_3.jpg b/theme_cobalt/static/src/img/pictures/s_gallery_3.jpg new file mode 100644 index 000000000..6eda4e676 Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_gallery_3.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_image_1.jpg b/theme_cobalt/static/src/img/pictures/s_image_1.jpg new file mode 100644 index 000000000..5a6b8ed31 Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_image_1.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_image_2.jpg b/theme_cobalt/static/src/img/pictures/s_image_2.jpg new file mode 100644 index 000000000..0cdf83f8a Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_image_2.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_image_3.jpg b/theme_cobalt/static/src/img/pictures/s_image_3.jpg new file mode 100644 index 000000000..18c395f68 Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_image_3.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_image_4.jpg b/theme_cobalt/static/src/img/pictures/s_image_4.jpg new file mode 100644 index 000000000..af8556db7 Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_image_4.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_image_5.jpg b/theme_cobalt/static/src/img/pictures/s_image_5.jpg new file mode 100644 index 000000000..4b9e9a926 Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_image_5.jpg differ diff --git a/theme_cobalt/static/src/img/pictures/s_image_6.jpg b/theme_cobalt/static/src/img/pictures/s_image_6.jpg new file mode 100644 index 000000000..9839f32bd Binary files /dev/null and b/theme_cobalt/static/src/img/pictures/s_image_6.jpg differ diff --git a/theme_cobalt/static/src/js/tour.js b/theme_cobalt/static/src/js/tour.js index 60a8fef1a..0fa42b5d6 100644 --- a/theme_cobalt/static/src/js/tour.js +++ b/theme_cobalt/static/src/js/tour.js @@ -1,16 +1,11 @@ -odoo.define("theme_cobalt.tour.cobalt", function (require) { -"use strict"; +/** @odoo-module */ -const core = require("web.core"); -const _t = core._t; - -const wTourUtils = require("website.tour_utils"); -var tour = require("web_tour.tour"); +import wTourUtils from 'website.tour_utils'; const snippets = [ { - id: 's_text_image', - name: 'Image - Text', + id: 's_banner', + name: 'Banner', }, { id: 's_references', @@ -21,12 +16,16 @@ const snippets = [ name: 'Text - Image', }, { - id: 's_three_columns', - name: 'Columns', + id: 's_color_blocks_2', + name: 'Big Boxes', }, { - id: 's_picture', - name: 'Picture', + id: 's_title', + name: 'Title', + }, + { + id: 's_image_gallery', + name: 'Images Wall', }, ]; @@ -41,8 +40,6 @@ wTourUtils.registerThemeHomepageTour("cobalt_tour", [ wTourUtils.dragNDrop(snippets[3]), wTourUtils.dragNDrop(snippets[4]), - wTourUtils.clickOnSnippet(snippets[4], 'top'), - wTourUtils.changeOption('BackgroundShape', 'we-toggler', _t('Background Shape')), - wTourUtils.selectNested('we-select-page', 'BackgroundShape', ':not(.o_we_pager_controls)', _t('Background Shape')), + wTourUtils.dragNDrop(snippets[5]), + ]); -}); diff --git a/theme_cobalt/static/src/scss/primary_variables.scss b/theme_cobalt/static/src/scss/primary_variables.scss index d795e4767..8e4a2ccac 100644 --- a/theme_cobalt/static/src/scss/primary_variables.scss +++ b/theme_cobalt/static/src/scss/primary_variables.scss @@ -2,11 +2,11 @@ // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (48.83 / 16); -$o-theme-h2-font-size-multiplier: (39.06 / 16); -$o-theme-h3-font-size-multiplier: (31.25 / 16); -$o-theme-h4-font-size-multiplier: (25.00 / 16); -$o-theme-h5-font-size-multiplier: (20.00 / 16); +$o-theme-h1-font-size-multiplier: (62 / 16); +$o-theme-h2-font-size-multiplier: (48 / 16); +$o-theme-h3-font-size-multiplier: (32 / 16); +$o-theme-h4-font-size-multiplier: (24 / 16); +$o-theme-h5-font-size-multiplier: (20 / 16); $o-theme-h6-font-size-multiplier: 1.1; $o-theme-font-configs: ( @@ -35,20 +35,12 @@ $o-website-values-palettes: ( 'navbar-font': 'Inter', 'buttons-font': 'Inter', - 'font-size-base': (14 / 16) * 1rem, - 'header-font-size': (14 / 16) * 1rem, - 'hamburger-type': 'off-canvas', 'menu-box-shadow': false, 'btn-ripple': true, 'btn-secondary-outline': true, - 'btn-font-size': (14 / 16) * 1rem, 'btn-border-radius': 2px, - - 'btn-font-size-lg': (12 / 16) * 1rem, - 'btn-padding-y-lg': 1rem, - 'btn-padding-x-lg': 3.3rem, ), ); @@ -78,7 +70,9 @@ $o-color-palettes-compatibility-indexes: ( //------------------------------------------------------------------------------ // Shapes //------------------------------------------------------------------------------ - +// Keep for compatibility $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/03', (2: 2)); $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Bold/01', (2: 2)); $o-bg-shapes: add-footer-shape-colors-mapping('web_editor', 'Bold/01', (2: 'footer')); +// New +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/11_001', (3: 1)); diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml index c00711917..46b002805 100644 --- a/theme_cobalt/views/customizations.xml +++ b/theme_cobalt/views/customizations.xml @@ -1,42 +1,44 @@ - - - - - - - - - - DISCOVER MORE + + @@ -120,9 +128,8 @@ @@ -140,87 +147,103 @@

Latest projects

- - s_three_columns_1 -

Hey Balàzs!
-

This minimalist weather application was created to be multi-platform. It’s available for iPhone or Android phones.

- READ MORE -
- - s_three_columns_2 -
Frank Clothes eCommerce
-

We wanted to propose a friendly shopping experience for the fans of Frank Clothes. Read more how we developed it.

- READ MORE -
- - s_three_columns_3 -
Earthquake Monitor
-

We developed this application to help the population of Goma living under the threat of a volcano.Now it’s available for every area.

- READ MORE -
- + + + + + + + + + diff --git a/theme_cobalt/views/images.xml b/theme_cobalt/views/images.xml index 221a2dee1..67cecce81 100644 --- a/theme_cobalt/views/images.xml +++ b/theme_cobalt/views/images.xml @@ -1,204 +1,234 @@ - - - - website.s_cover_default_image - website.s_cover_default_image - /theme_cobalt/static/src/img/pictures/s_cover.jpg - + + + + website.s_cover_default_image + website.s_cover_default_image + /theme_cobalt/static/src/img/pictures/s_cover.jpg + - - - website.s_banner_default_image - website.s_banner_default_image - /theme_cobalt/static/src/img/pictures/s_banner.jpg - + + + website.s_banner_default_image + website.s_banner_default_image + /theme_cobalt/static/src/img/pictures/s_banner.jpg + - - - website.s_text_image_default_image - website.s_text_image_default_image - /theme_cobalt/static/src/img/illustrations/s_text_image_default_image.svg - + + + website.s_picture_default_image + website.s_picture_default_image + /theme_cobalt/static/src/img/pictures/s_picture.jpg + - - - website.s_image_text_default_image - website.s_image_text_default_image - /theme_cobalt/static/src/img/illustrations/s_image_text_default_image.svg - + + + website.library_image_11 + website.library_image_11 + /theme_cobalt/static/src/img/pictures/s_three_columns_1.jpg + + + s_three_columns_default_image_2 + s_three_columns_default_image_2 + /theme_cobalt/static/src/img/pictures/s_three_columns_2.jpg + + + website.library_image_07 + website.library_image_07 + /theme_cobalt/static/src/img/pictures/s_three_columns_3.jpg + - - - website.s_picture_default_image - website.s_picture_default_image - /theme_cobalt/static/src/img/pictures/s_picture.jpg - + + + website.s_masonry_block_default_image_1 + website.s_masonry_block_default_image_1 + /theme_cobalt/static/src/img/pictures/s_masonry_block_1.jpg + - - - website.library_image_11 - website.library_image_11 - /theme_cobalt/static/src/img/pictures/s_three_columns_1.jpg - - - website.library_image_13 - website.library_image_13 - /theme_cobalt/static/src/img/pictures/s_three_columns_2.jpg - - - website.library_image_07 - website.library_image_07 - /theme_cobalt/static/src/img/pictures/s_three_columns_3.jpg - + + + website.s_carousel_default_image_1 + website.s_carousel_default_image_1 + /theme_cobalt/static/src/img/pictures/s_carousel_1.jpg + + + website.s_carousel_default_image_2 + website.s_carousel_default_image_2 + /theme_cobalt/static/src/img/pictures/s_carousel_2.jpg + + + website.s_carousel_default_image_3 + website.s_carousel_default_image_3 + /theme_cobalt/static/src/img/pictures/s_carousel_3.jpg + - - - website.s_masonry_block_default_image_1 - website.s_masonry_block_default_image_1 - /theme_cobalt/static/src/img/pictures/s_masonry_block_1.jpg - + + + website.s_parallax_default_image + website.s_parallax_default_image + /theme_cobalt/static/src/img/pictures/s_parallax.jpg + - - - website.s_carousel_default_image_1 - website.s_carousel_default_image_1 - /theme_cobalt/static/src/img/pictures/s_carousel_1.jpg - - - website.s_carousel_default_image_2 - website.s_carousel_default_image_2 - /theme_cobalt/static/src/img/pictures/s_carousel_2.jpg - - - website.s_carousel_default_image_3 - website.s_carousel_default_image_3 - /theme_cobalt/static/src/img/pictures/s_carousel_3.jpg - + + + website.s_company_team_image_1 + website.s_company_team_image_1 + /theme_cobalt/static/src/img/pictures/s_company_team_image_1.jpg + + + website.s_company_team_image_2 + website.s_company_team_image_2 + /theme_cobalt/static/src/img/pictures/s_company_team_image_2.jpg + + + website.s_company_team_image_3 + website.s_company_team_image_3 + /theme_cobalt/static/src/img/pictures/s_company_team_image_3.jpg + + + website.s_company_team_image_4 + website.s_company_team_image_4 + /theme_cobalt/static/src/img/pictures/s_company_team_image_4.jpg + - - - website.s_parallax_default_image - website.s_parallax_default_image - /theme_cobalt/static/src/img/pictures/s_parallax.jpg - + + + + website.s_quotes_carousel_demo_image_3 + website.s_quotes_carousel_demo_image_3 + /theme_cobalt/static/src/img/pictures/s_company_team_image_4.jpg + + + + website.s_quotes_carousel_demo_image_4 + website.s_quotes_carousel_demo_image_4 + /theme_cobalt/static/src/img/pictures/s_company_team_image_2.jpg + + + + website.s_quotes_carousel_demo_image_1 + website.s_quotes_carousel_demo_image_1 + /theme_cobalt/static/src/img/pictures/s_quotes_carousel_bg_slide2.jpg + + + + website.s_quotes_carousel_demo_image_5 + website.s_quotes_carousel_demo_image_5 + /theme_cobalt/static/src/img/pictures/s_company_team_image_3.jpg + + + + website.s_quotes_carousel_demo_image_2 + website.s_quotes_carousel_demo_image_2 + /theme_cobalt/static/src/img/pictures/s_quotes_carousel_bg_slide3.jpg + - - - website.s_company_team_image_1 - website.s_company_team_image_1 - /theme_cobalt/static/src/img/pictures/s_company_team_image_1.jpg - - - website.s_company_team_image_2 - website.s_company_team_image_2 - /theme_cobalt/static/src/img/pictures/s_company_team_image_2.jpg - - - website.s_company_team_image_3 - website.s_company_team_image_3 - /theme_cobalt/static/src/img/pictures/s_company_team_image_3.jpg - - - website.s_company_team_image_4 - website.s_company_team_image_4 - /theme_cobalt/static/src/img/pictures/s_company_team_image_4.jpg - + + + website.s_product_catalog_default_image + website.s_product_catalog_default_image + /theme_cobalt/static/src/img/pictures/s_product_catalog.jpg + - - - - website.s_quotes_carousel_demo_image_3 - website.s_quotes_carousel_demo_image_3 - /theme_cobalt/static/src/img/pictures/s_company_team_image_4.jpg - - - - website.s_quotes_carousel_demo_image_4 - website.s_quotes_carousel_demo_image_4 - /theme_cobalt/static/src/img/pictures/s_company_team_image_2.jpg - - - - website.s_quotes_carousel_demo_image_1 - website.s_quotes_carousel_demo_image_1 - /theme_cobalt/static/src/img/pictures/s_quotes_carousel_bg_slide2.jpg - - - - website.s_quotes_carousel_demo_image_5 - website.s_quotes_carousel_demo_image_5 - /theme_cobalt/static/src/img/pictures/s_company_team_image_3.jpg - - - - website.s_quotes_carousel_demo_image_2 - website.s_quotes_carousel_demo_image_2 - /theme_cobalt/static/src/img/pictures/s_quotes_carousel_bg_slide3.jpg - + + + website.s_media_list_default_image_1 + website.s_media_list_default_image_1 + /theme_cobalt/static/src/img/pictures/s_media_list_1.jpg + + + website.s_media_list_default_image_2 + website.s_media_list_default_image_2 + /theme_cobalt/static/src/img/pictures/s_media_list_2.jpg + + + website.s_media_list_default_image_3 + website.s_media_list_default_image_3 + /theme_cobalt/static/src/img/pictures/s_media_list_3.jpg + - - - website.s_product_catalog_default_image - website.s_product_catalog_default_image - /theme_cobalt/static/src/img/pictures/s_product_catalog.jpg - + + + website.s_product_list_default_image_1 + website.s_product_list_default_image_1 + /theme_cobalt/static/src/img/pictures/s_product_list_1.jpg + + + website.s_product_list_default_image_2 + website.s_product_list_default_image_2 + /theme_cobalt/static/src/img/pictures/s_product_list_2.jpg + + + website.s_product_list_default_image_3 + website.s_product_list_default_image_3 + /theme_cobalt/static/src/img/pictures/s_product_list_3.jpg + + + website.s_product_list_default_image_4 + website.s_product_list_default_image_4 + /theme_cobalt/static/src/img/pictures/s_product_list_4.jpg + + + website.s_product_list_default_image_5 + website.s_product_list_default_image_5 + /theme_cobalt/static/src/img/pictures/s_product_list_5.jpg + + + website.s_product_list_default_image_6 + website.s_product_list_default_image_6 + /theme_cobalt/static/src/img/pictures/s_product_list_6.jpg + - - - website.s_media_list_default_image_1 - website.s_media_list_default_image_1 - /theme_cobalt/static/src/img/pictures/s_media_list_1.jpg - - - website.s_media_list_default_image_2 - website.s_media_list_default_image_2 - /theme_cobalt/static/src/img/pictures/s_media_list_2.jpg - - - website.s_media_list_default_image_3 - website.s_media_list_default_image_3 - /theme_cobalt/static/src/img/pictures/s_media_list_3.jpg - + + + website.s_popup_default_image + website.s_popup_default_image + /theme_cobalt/static/src/img/pictures/s_popup.jpeg + - - - website.s_product_list_default_image_1 - website.s_product_list_default_image_1 - /theme_cobalt/static/src/img/pictures/s_product_list_1.jpg - - - website.s_product_list_default_image_2 - website.s_product_list_default_image_2 - /theme_cobalt/static/src/img/pictures/s_product_list_2.jpg - - - website.s_product_list_default_image_3 - website.s_product_list_default_image_3 - /theme_cobalt/static/src/img/pictures/s_product_list_3.jpg - - - website.s_product_list_default_image_4 - website.s_product_list_default_image_4 - /theme_cobalt/static/src/img/pictures/s_product_list_4.jpg - - - website.s_product_list_default_image_5 - website.s_product_list_default_image_5 - /theme_cobalt/static/src/img/pictures/s_product_list_5.jpg - - - website.s_product_list_default_image_6 - website.s_product_list_default_image_6 - /theme_cobalt/static/src/img/pictures/s_product_list_6.jpg - + + + website.library_image_10 + website.library_image_10 + /theme_cobalt/static/src/img/pictures/s_image_4.jpg + + + website.library_image_13 + website.library_image_13 + /theme_cobalt/static/src/img/pictures/s_image_2.jpg + + + website.library_image_05 + website.library_image_05 + /theme_cobalt/static/src/img/pictures/s_image_5.jpg + + + website.library_image_16 + website.library_image_16 + /theme_cobalt/static/src/img/pictures/s_image_3.jpg + + + website.library_image_14 + website.library_image_14 + /theme_cobalt/static/src/img/pictures/s_image_6.jpg + + + + website.library_image_08 + website.library_image_08 + /theme_cobalt/static/src/img/pictures/s_gallery_1.jpg + + + website.library_image_03 + website.library_image_03 + /theme_cobalt/static/src/img/pictures/s_image_1.jpg + + + website.library_image_02 + website.library_image_02 + /theme_cobalt/static/src/img/pictures/s_gallery_3.jpg + - - - website.s_popup_default_image - website.s_popup_default_image - /theme_cobalt/static/src/img/pictures/s_popup.jpeg -