diff --git a/theme_avantgarde/__manifest__.py b/theme_avantgarde/__manifest__.py index 3cb0e053e..be64fae19 100644 --- a/theme_avantgarde/__manifest__.py +++ b/theme_avantgarde/__manifest__.py @@ -16,6 +16,14 @@ 'static/description/poster.jpg', 'static/description/avantgarde_screenshot.jpg', ], + 'images_preview_theme': { + 'website.s_cover_default_image': '/theme_avantgarde/static/src/img/pictures/bg_image_08.jpg', + 'website.s_picture_default_image': '/theme_avantgarde/static/src/img/pictures/bg_image_14.jpg', + 'website.s_three_columns_default_image_1': '/theme_avantgarde/static/src/img/pictures/bg_image_15', + 'website.s_three_columns_default_image_2': '/theme_avantgarde/static/src/img/pictures/bg_image_16.jpg', + 'website.s_three_columns_default_image_2': '/theme_avantgarde/static/src/img/pictures/bg_image_17.jpg', + 'website.s_text_image_default_image': '/theme_avantgarde/static/src/img/pictures/bg_image_13.jpg', + }, 'depends': ['theme_common'], 'license': 'LGPL-3', 'live_test_url': 'https://theme-avantgarde.odoo.com', diff --git a/theme_avantgarde/data/ir_asset.xml b/theme_avantgarde/data/ir_asset.xml index 43804b530..d02adfda6 100644 --- a/theme_avantgarde/data/ir_asset.xml +++ b/theme_avantgarde/data/ir_asset.xml @@ -1,36 +1,34 @@ - - - theme_avantgarde.s_showcase_slider_000_variables_scss - Showcase slider 000 variables SCSS - web._assets_primary_variables - theme_avantgarde/static/src/old_snippets/s_showcase_slider/000_variables.scss - - + + theme_avantgarde.s_showcase_slider_000_variables_scss + Showcase slider 000 variables SCSS + web._assets_primary_variables + theme_avantgarde/static/src/old_snippets/s_showcase_slider/000_variables.scss + + - - theme_avantgarde.s_css_slider_000_variables_scss - Css slider 000 variables SCSS - web._assets_primary_variables - theme_avantgarde/static/src/old_snippets/s_css_slider/000_variables.scss - - + + theme_avantgarde.s_css_slider_000_variables_scss + Css slider 000 variables SCSS + web._assets_primary_variables + theme_avantgarde/static/src/old_snippets/s_css_slider/000_variables.scss + + - - theme_avantgarde.primary_variables_scss - Primary variables SCSS - web._assets_primary_variables - theme_avantgarde/static/src/scss/primary_variables.scss - + + theme_avantgarde.primary_variables_scss + Primary variables SCSS + web._assets_primary_variables + theme_avantgarde/static/src/scss/primary_variables.scss + - - theme_avantgarde.secondary_variables_scss - Secondary variables SCSS - web._assets_secondary_variables - theme_avantgarde/static/src/scss/secondary_variables.scss - + + theme_avantgarde.secondary_variables_scss + Secondary variables SCSS + web._assets_secondary_variables + theme_avantgarde/static/src/scss/secondary_variables.scss + - diff --git a/theme_avantgarde/models/theme_avantgarde.py b/theme_avantgarde/models/theme_avantgarde.py index 12c857f12..c7282cf1e 100644 --- a/theme_avantgarde/models/theme_avantgarde.py +++ b/theme_avantgarde/models/theme_avantgarde.py @@ -9,11 +9,10 @@ class ThemeAvantgarde(models.AbstractModel): # self.enable_asset('theme_common.compatibility_saas_10_2') self.disable_view('website.template_header_default') - self.enable_view('website.template_header_magazine') - self.enable_header_off_canvas() + self.enable_view('website.template_header_hamburger') + self.enable_view('website.template_header_default_align_right') + self.enable_view('website.template_header_hamburger_align_right') self.disable_view('website.footer_custom') - self.enable_view('website.template_footer_centered') + self.enable_view('website.template_footer_descriptive') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') diff --git a/theme_avantgarde/static/description/avantgarde_screenshot.jpg b/theme_avantgarde/static/description/avantgarde_screenshot.jpg index d53d3ecac..1f1b6ef3b 100644 Binary files a/theme_avantgarde/static/description/avantgarde_screenshot.jpg and b/theme_avantgarde/static/description/avantgarde_screenshot.jpg differ diff --git a/theme_avantgarde/static/description/poster.jpg b/theme_avantgarde/static/description/poster.jpg index aebd3e6de..386aac67a 100644 Binary files a/theme_avantgarde/static/description/poster.jpg and b/theme_avantgarde/static/description/poster.jpg differ diff --git a/theme_avantgarde/static/src/js/tour.js b/theme_avantgarde/static/src/js/tour.js index b664e5f0d..08992e6a5 100644 --- a/theme_avantgarde/static/src/js/tour.js +++ b/theme_avantgarde/static/src/js/tour.js @@ -1,33 +1,26 @@ -odoo.define("theme_avantgarde.tour.avantgarde", function (require) { -"use strict"; - -const wTourUtils = require("website.tour_utils"); -var tour = require("web_tour.tour"); +/** @odoo-module */ +import wTourUtils from 'website.tour_utils'; const snippets = [ { - id: 's_title', - name: 'Title', + id: 's_cover', + name: 'Cover', }, { - id: 's_carousel', - name: 'Carousel', + id: 's_picture', + name: 'Picture', + }, + { + id: 's_three_columns', + name: 'Columns', }, { id: 's_text_image', - name: 'Image - Text', + name: 'Text - Image', }, { - id: 's_images_wall', - name: 'Images Wall', - }, - { - id: 's_references', - name: 'References', - }, - { - id: 's_quotes_carousel', - name: 'Quotes', + id: 's_call_to_action', + name: 'Call to Action', }, ]; @@ -35,17 +28,11 @@ wTourUtils.registerThemeHomepageTour("avantgarde_tour", [ wTourUtils.dragNDrop(snippets[0], 'top'), wTourUtils.clickOnText(snippets[0], 'h1', 'left'), wTourUtils.goBackToBlocks(), - wTourUtils.dragNDrop(snippets[1], 'left'), - wTourUtils.dragNDrop(snippets[2], 'bottom'), wTourUtils.clickOnSnippet(snippets[2], 'top'), - wTourUtils.changeBackgroundColor('top'), - wTourUtils.selectColorPalette(), + wTourUtils.changePaddingSize('top'), wTourUtils.goBackToBlocks(), - wTourUtils.dragNDrop(snippets[3], 'top'), - wTourUtils.dragNDrop(snippets[4], 'top'), ]); -}); diff --git a/theme_avantgarde/static/src/scss/primary_variables.scss b/theme_avantgarde/static/src/scss/primary_variables.scss index 48c1e1822..7ccacb426 100644 --- a/theme_avantgarde/static/src/scss/primary_variables.scss +++ b/theme_avantgarde/static/src/scss/primary_variables.scss @@ -88,8 +88,8 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, // Fonts //------------------------------------------------------------------------------ -$o-theme-h1-font-size-multiplier: (48.83 / 16); -$o-theme-h2-font-size-multiplier: (39.06 / 16); +$o-theme-h1-font-size-multiplier: 3; +$o-theme-h2-font-size-multiplier: 2.5; $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); @@ -156,6 +156,18 @@ $o-theme-font-configs: ( 'family': ('Vollkorn', serif), 'url': 'Vollkorn:300,300i,400,400i,700,700i', ), + 'Libre Baskerville': ( + 'family': ('Libre Baskerville', serif), + 'url': 'Libre+Baskerville:300,300i,400,400i,700,700i', + ), + 'Atkinson Hyperlegible': ( + 'family': ('Atkinson Hyperlegible', serif), + 'url': 'Atkinson+Hyperlegible:300,300i,400,400i,700,700i', + ), + 'Syne': ( + 'family': ('Syne', serif), + 'url': 'Syne:300,300i,400,400i,700,700i', + ), ); //------------------------------------------------------------------------------ @@ -164,25 +176,23 @@ $o-theme-font-configs: ( $o-website-values-palettes: ( ( - 'color-palettes-name': 'avantgarde-1', + 'color-palettes-name': 'avantgarde-3', + 'layout': 'full', - 'font-size-base': (14 / 16) * 1rem, - 'font': 'Heebo', - 'headings-font': 'Playfair Display', - 'navbar-font': 'Playfair Display', - 'buttons-font': 'Playfair Display', + 'font-size-base': 1rem, + 'font': 'Syne', + 'headings-font': 'Syne', + 'navbar-font': 'Syne', + 'buttons-font': 'Syne', - 'layout': 'boxed', - 'header-template': 'magazine', - 'hamburger-type': 'off-canvas', - 'menu-box-shadow': false, + 'header-template': 'hamburger', + 'hamburger-type': 'default', + 'hamburger-position': 'right', - 'footer-template': 'centered', + 'footer-template': 'descriptive', - 'btn-ripple': true, - 'btn-padding-y-lg': .6rem, - 'btn-padding-x-lg': 2.2rem, - 'link-underline': 'always', + 'btn-primary-outline': true, + 'link-underline': 'never', ), ); @@ -220,5 +230,5 @@ $o-color-palettes-compatibility-indexes: ( // Shapes //------------------------------------------------------------------------------ -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/01', (2: 2)); -$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/01_001', (2: 2)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/18', (1: 3)); +$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/14_001', (3: 4, 4: rgba(0, 0, 0, 0))); diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml index 199b5b136..15b8bddab 100644 --- a/theme_avantgarde/views/customizations.xml +++ b/theme_avantgarde/views/customizations.xml @@ -1,60 +1,152 @@ - - - -