diff --git a/addons/website/models/theme_models.py b/addons/website/models/theme_models.py index ef0f169a131..0e2568bceb5 100644 --- a/addons/website/models/theme_models.py +++ b/addons/website/models/theme_models.py @@ -222,7 +222,6 @@ class Theme(models.AbstractModel): 'website.template_header_hamburger', 'website.template_header_vertical', 'website.template_header_sidebar', - 'website.template_header_contact', 'website.template_header_boxed', 'website.template_header_image', 'website.template_header_hamburger_full', @@ -231,6 +230,7 @@ class Theme(models.AbstractModel): 'website.template_header_search', 'website.template_header_sales_one', 'website.template_header_sales_two', + 'website.template_header_sales_three', # Default one, keep it last 'website.template_header_default', ] diff --git a/addons/website/static/src/img/snippets_options/header_template_contact.svg b/addons/website/static/src/img/snippets_options/header_template_contact.svg deleted file mode 100644 index 3af85000d01..00000000000 --- a/addons/website/static/src/img/snippets_options/header_template_contact.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/website/static/src/img/snippets_options/header_template_sales_three.svg b/addons/website/static/src/img/snippets_options/header_template_sales_three.svg new file mode 100644 index 00000000000..214beba8b3e --- /dev/null +++ b/addons/website/static/src/img/snippets_options/header_template_sales_three.svg @@ -0,0 +1 @@ + diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss index 12d088616b9..d8cf687df80 100644 --- a/addons/website/static/src/scss/primary_variables.scss +++ b/addons/website/static/src/scss/primary_variables.scss @@ -12,6 +12,8 @@ $o-base-color-palette: map-merge($o-base-color-palette, ( 'header-sales_one-custom': null, 'header-sales_two': 5, 'header-sales_two-custom': null, + 'header-sales_three': 2, + 'header-sales_three-custom': null, 'footer': 5, // o_cc5 'footer-custom': null, 'copyright': null, diff --git a/addons/website/static/src/scss/secondary_variables.scss b/addons/website/static/src/scss/secondary_variables.scss index 8bed19d7918..ba6bd705900 100644 --- a/addons/website/static/src/scss/secondary_variables.scss +++ b/addons/website/static/src/scss/secondary_variables.scss @@ -147,6 +147,7 @@ $-actual-user-color-palette: map-merge($-palette-default, $o-user-color-palette) 'menu': 'menu-custom', 'header-sales_one': 'header-sales_one-custom', 'header-sales_two': 'header-sales_two-custom', + 'header-sales_three': 'header-sales_three-custom', 'footer': 'footer-custom', 'copyright': 'copyright-custom' ) { diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 2f78a49be59..2a2e9a70b0c 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -55,7 +55,7 @@ $-seen-urls: (); // 3) The values in the $colors map are also printed by Bootstrap. However, // we have color variables which can contain a reference to a color // combination and that is the info we want in that case. - @each $key in ('menu', 'header-sales_one', 'header-sales_two', 'footer', 'copyright') { + @each $key in ('menu', 'header-sales_one', 'header-sales_two', 'header-sales_three', 'footer', 'copyright') { $-value: map-get($o-color-palette, $key); @if type-of($-value) == 'number' { @include print-variable($key, $-value); @@ -1221,6 +1221,12 @@ header { @include o-apply-colors('header-sales_two-custom'); @include o-add-gradient('menu-secondary-gradient'); } +} @else if o-website-value('header-template') == 'sales_three' { + #wrapwrap .o_header_sales_three_top { + @include o-apply-colors('header-sales_three'); + @include o-apply-colors('header-sales_three-custom'); + @include o-add-gradient('menu-secondary-gradient'); + } } .o_grid_header_3_cols { diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index 3fd03834be1..1b2de8ff25d 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -776,16 +776,16 @@ data-customize-website-views="website.template_header_sales_two" data-customize-website-variable="'sales_two'" data-img="/website/static/src/img/snippets_options/header_template_sales_two.svg"/> + - + diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 46c2ad7af82..072adfdbd46 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -1071,6 +1071,89 @@ + + + - - - - + + - - + + - -