diff --git a/theme_monglia/__manifest__.py b/theme_monglia/__manifest__.py index eddfec755..ef9ef9a6b 100644 --- a/theme_monglia/__manifest__.py +++ b/theme_monglia/__manifest__.py @@ -17,6 +17,22 @@ 'static/description/monglia_description.png', 'static/description/monglia_screenshot.jpeg', ], + 'images_preview_theme': { + 'website.s_cover_default_image': '/theme_monglia/static/src/img/snippets/s_cover.jpg', + 'website.s_media_list_default_image_1': '/theme_monglia/static/src/img/snippets/s_media_list_1.jpg', + 'website.s_media_list_default_image_2': '/theme_monglia/static/src/img/snippets/s_media_list_2.jpg', + 'website.s_media_list_default_image_3': '/theme_monglia/static/src/img/snippets/s_media_list_3.jpg', + 'website.s_text_image_default_image': '/theme_monglia/static/src/img/snippets/s_text_image.jpg', + 'website.s_three_columns_default_image_1': '/theme_monglia/static/src/img/snippets/library_image_11.jpg', + 'website.s_three_columns_default_image_2': '/theme_monglia/static/src/img/snippets/library_image_13.jpg', + 'website.s_three_columns_default_image_3': '/theme_monglia/static/src/img/snippets/library_image_07.jpg', + 'website.library_image_03': '/theme_monglia/static/src/img/snippets/library_image_03.jpg', + 'website.library_image_10': '/theme_monglia/static/src/img/snippets/library_image_10.jpg', + 'website.library_image_13': '/theme_monglia/static/src/img/snippets/library_image_23.jpg', + 'website.library_image_02': '/theme_monglia/static/src/img/snippets/library_image_05.jpg', + 'website.library_image_14': '/theme_monglia/static/src/img/snippets/library_image_14.jpg', + 'website.library_image_16': '/theme_monglia/static/src/img/snippets/library_image_16.jpg', + }, 'license': 'LGPL-3', 'live_test_url': 'https://theme-monglia.odoo.com', 'assets': { diff --git a/theme_monglia/data/ir_asset.xml b/theme_monglia/data/ir_asset.xml index 3f07abc8c..8dd515210 100644 --- a/theme_monglia/data/ir_asset.xml +++ b/theme_monglia/data/ir_asset.xml @@ -1,60 +1,58 @@ - - - theme_monglia.s_banner_parallax_000_variables_scss - Banner parallax 000 variables SCSS - web._assets_primary_variables - theme_monglia/static/src/old_snippets/s_banner_parallax/000_variables.scss - - + + theme_monglia.s_banner_parallax_000_variables_scss + Banner parallax 000 variables SCSS + web._assets_primary_variables + theme_monglia/static/src/old_snippets/s_banner_parallax/000_variables.scss + + - - theme_monglia.s_features_carousel_000_variables_scss - Features carousel 000 variables SCSS - web._assets_primary_variables - theme_monglia/static/src/old_snippets/s_features_carousel/000_variables.scss - - + + theme_monglia.s_features_carousel_000_variables_scss + Features carousel 000 variables SCSS + web._assets_primary_variables + theme_monglia/static/src/old_snippets/s_features_carousel/000_variables.scss + + - - theme_monglia.s_products_carousel_000_variables_scss - Products carousel 000 variables SCSS - web._assets_primary_variables - theme_monglia/static/src/old_snippets/s_products_carousel/000_variables.scss - - + + theme_monglia.s_products_carousel_000_variables_scss + Products carousel 000 variables SCSS + web._assets_primary_variables + theme_monglia/static/src/old_snippets/s_products_carousel/000_variables.scss + + - - theme_monglia.s_big_icons_000_variables_scss - Big icons 000 variables SCSS - web._assets_primary_variables - theme_monglia/static/src/old_snippets/s_big_icons/000_variables.scss - - + + theme_monglia.s_big_icons_000_variables_scss + Big icons 000 variables SCSS + web._assets_primary_variables + theme_monglia/static/src/old_snippets/s_big_icons/000_variables.scss + + - - theme_monglia.primary_variables_scss - Primary variables SCSS - web._assets_primary_variables - theme_monglia/static/src/scss/primary_variables.scss - + + theme_monglia.primary_variables_scss + Primary variables SCSS + web._assets_primary_variables + theme_monglia/static/src/scss/primary_variables.scss + - - theme_monglia.secondary_variables_scss - Secondary variables SCSS - web._assets_secondary_variables - theme_monglia/static/src/scss/secondary_variables.scss - + + theme_monglia.secondary_variables_scss + Secondary variables SCSS + web._assets_secondary_variables + theme_monglia/static/src/scss/secondary_variables.scss + - - theme_monglia.compatibility_saas_11_4_variables_scss - Compatibility saas 11 4 variables SCSS - web._assets_primary_variables - /theme_monglia/static/src/scss/compatibility-saas-11.4-variables.scss - - + + theme_monglia.compatibility_saas_11_4_variables_scss + Compatibility saas 11 4 variables SCSS + web._assets_primary_variables + /theme_monglia/static/src/scss/compatibility-saas-11.4-variables.scss + + - diff --git a/theme_monglia/models/theme_monglia.py b/theme_monglia/models/theme_monglia.py index 10ac24bab..1f805565e 100644 --- a/theme_monglia/models/theme_monglia.py +++ b/theme_monglia/models/theme_monglia.py @@ -8,9 +8,5 @@ class ThemeMonglia(models.AbstractModel): # For compatibility # self.enable_asset('theme_common.compatibility_saas_10_1') - self.disable_view('website.template_header_default') - self.enable_view('website.template_header_hamburger') - self.enable_header_off_canvas() - self.disable_view('website.footer_custom') self.enable_view('website.template_footer_minimalist') diff --git a/theme_monglia/static/description/monglia_description.png b/theme_monglia/static/description/monglia_description.png index 7ef0a5020..aed35ced4 100644 Binary files a/theme_monglia/static/description/monglia_description.png and b/theme_monglia/static/description/monglia_description.png differ diff --git a/theme_monglia/static/description/monglia_screenshot.jpeg b/theme_monglia/static/description/monglia_screenshot.jpeg index d25eeec8b..34b1c5666 100644 Binary files a/theme_monglia/static/description/monglia_screenshot.jpeg and b/theme_monglia/static/description/monglia_screenshot.jpeg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_03.jpg b/theme_monglia/static/src/img/snippets/library_image_03.jpg new file mode 100644 index 000000000..7d652eaa4 Binary files /dev/null and b/theme_monglia/static/src/img/snippets/library_image_03.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_05.jpg b/theme_monglia/static/src/img/snippets/library_image_05.jpg new file mode 100644 index 000000000..aacd92455 Binary files /dev/null and b/theme_monglia/static/src/img/snippets/library_image_05.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_07.jpg b/theme_monglia/static/src/img/snippets/library_image_07.jpg index b65ef10b0..5916b8942 100644 Binary files a/theme_monglia/static/src/img/snippets/library_image_07.jpg and b/theme_monglia/static/src/img/snippets/library_image_07.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_10.jpg b/theme_monglia/static/src/img/snippets/library_image_10.jpg new file mode 100644 index 000000000..c5802f1ef Binary files /dev/null and b/theme_monglia/static/src/img/snippets/library_image_10.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_11.jpg b/theme_monglia/static/src/img/snippets/library_image_11.jpg index 1c455954f..bf5a9682b 100644 Binary files a/theme_monglia/static/src/img/snippets/library_image_11.jpg and b/theme_monglia/static/src/img/snippets/library_image_11.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_13.jpg b/theme_monglia/static/src/img/snippets/library_image_13.jpg index 84a5e7623..f30222cc5 100644 Binary files a/theme_monglia/static/src/img/snippets/library_image_13.jpg and b/theme_monglia/static/src/img/snippets/library_image_13.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_14.jpg b/theme_monglia/static/src/img/snippets/library_image_14.jpg new file mode 100644 index 000000000..749124cb4 Binary files /dev/null and b/theme_monglia/static/src/img/snippets/library_image_14.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_16.jpg b/theme_monglia/static/src/img/snippets/library_image_16.jpg new file mode 100644 index 000000000..cc5cf242f Binary files /dev/null and b/theme_monglia/static/src/img/snippets/library_image_16.jpg differ diff --git a/theme_monglia/static/src/img/snippets/library_image_23.jpg b/theme_monglia/static/src/img/snippets/library_image_23.jpg new file mode 100644 index 000000000..44d752a2d Binary files /dev/null and b/theme_monglia/static/src/img/snippets/library_image_23.jpg differ diff --git a/theme_monglia/static/src/js/tour.js b/theme_monglia/static/src/js/tour.js index 130b2ac5b..bb7e6e897 100644 --- a/theme_monglia/static/src/js/tour.js +++ b/theme_monglia/static/src/js/tour.js @@ -1,11 +1,6 @@ -odoo.define("theme_monglia.tour.monglia", 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 = [ { @@ -16,45 +11,41 @@ const snippets = [ id: 's_title', name: 'Title', }, + { + id: 's_text_block', + name: 'Text', + }, + { + id: 's_three_columns', + name: 'Columns', + }, + { + id: 's_image_wall', + name: 'Images Wall', + }, + { + id: 's_title', + name: 'Title', + }, { id: 's_media_list', name: 'Media List', }, - { - id: 's_carousel', - name: 'Carousel', - }, - { - id: 's_call_to_action', - name: 'Call to Action', - }, { id: 's_text_image', name: 'Text - Image', }, - { - id: 's_image_text', - name: 'Image - Text', - }, - ]; wTourUtils.registerThemeHomepageTour("monglia_tour", [ wTourUtils.dragNDrop(snippets[0]), wTourUtils.clickOnText(snippets[0], 'h1', 'top'), wTourUtils.goBackToBlocks(), - wTourUtils.dragNDrop(snippets[1]), wTourUtils.dragNDrop(snippets[2]), wTourUtils.dragNDrop(snippets[3]), - wTourUtils.dragNDrop(snippets[4]), - wTourUtils.clickOnSnippet(snippets[4], 'top'), - wTourUtils.changeBackgroundColor('left'), - wTourUtils.selectColorPalette(), - wTourUtils.goBackToBlocks('left'), - wTourUtils.dragNDrop(snippets[5]), wTourUtils.dragNDrop(snippets[6]), + wTourUtils.dragNDrop(snippets[7]), ]); -}); diff --git a/theme_monglia/static/src/scss/primary_variables.scss b/theme_monglia/static/src/scss/primary_variables.scss index 55287f0fd..73e022d16 100644 --- a/theme_monglia/static/src/scss/primary_variables.scss +++ b/theme_monglia/static/src/scss/primary_variables.scss @@ -55,10 +55,10 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (36 / 14); -$o-theme-h2-font-size-multiplier: (30 / 14); -$o-theme-h3-font-size-multiplier: (24 / 14); -$o-theme-h4-font-size-multiplier: (18 / 14); +$o-theme-h1-font-size-multiplier: (48 / 14); +$o-theme-h2-font-size-multiplier: (36 / 14); +$o-theme-h3-font-size-multiplier: (30 / 14); +$o-theme-h4-font-size-multiplier: (24 / 14); $o-theme-h5-font-size-multiplier: 1; $o-theme-h6-font-size-multiplier: (12 / 14); @@ -137,23 +137,18 @@ $o-website-values-palettes: ( ( 'color-palettes-name': 'monglia-1', - 'header-font-size': (18 / 16) * 1rem, + 'header-font-size': (20 / 16) * 1rem, 'font': 'Roboto', 'headings-font': 'Darker Grotesque', 'navbar-font': 'Darker Grotesque', - 'buttons-font': 'Darker Grotesque', - 'header-template': 'hamburger', - 'hamburger-type': 'off-canvas', - 'hamburger-position': 'left', + 'buttons-font': 'Roboto', 'footer-template': 'minimalist', 'btn-border-radius': 0, 'btn-border-radius-sm': 0, 'btn-border-radius-lg': 0, - 'btn-font-size': 1.2rem, 'btn-padding-y': .474rem, 'btn-padding-x': 1.25rem, - 'btn-font-size-lg': 2rem, 'btn-padding-y-lg': .4rem, 'btn-padding-x-lg': 2rem, ), @@ -186,3 +181,7 @@ $o-color-palettes-compatibility-indexes: ( 22: 'generic-16', 23: 'generic-17', ); + +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blocks/04', (5:5, 3:2, 2:3, 1:4)); +$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Blocks/04', 'second', (5:5, 3:2, 2:3, 1:4)); + diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml index 5f742d21f..b06854971 100644 --- a/theme_monglia/views/customizations.xml +++ b/theme_monglia/views/customizations.xml @@ -5,16 +5,23 @@ + + +