diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot index 25d38d57921..e73bf58cd06 100644 --- a/addons/website/i18n/website.pot +++ b/addons/website/i18n/website.pot @@ -1445,6 +1445,11 @@ msgid "" "changes, are you sure you want to proceed?" msgstr "" +#. module: website +#: model_terms:ir.ui.view,arch_db:website.snippet_options +msgid "Changing this color will regenerate the default theme color scheme" +msgstr "" + #. module: website #: model_terms:ir.ui.view,arch_db:website.s_chart_options msgid "Chart" diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js index ce161d7a6d1..01ee9ce0f38 100644 --- a/addons/website/static/src/js/editor/snippets.options.js +++ b/addons/website/static/src/js/editor/snippets.options.js @@ -636,8 +636,9 @@ options.registry.Theme = options.Class.extend({ // used as 'primary' and 'secondary' BS values (to customize standard BS // used in Odoo). However, some themes are still going against that // system and do not link alpha-primary and beta-secondary at all. - this._alphaEqualsPrimary = (this._getCSSColorFromName('primary') === this._getCSSColorFromName('alpha')); - this._betaEqualsSecondary = (this._getCSSColorFromName('secondary') === this._getCSSColorFromName('beta')); + const style = window.getComputedStyle(document.documentElement); + this._alphaEqualsPrimary = style.getPropertyValue('--is-alpha-primary').trim() == 'true'; + this._betaIsSecondary = style.getPropertyValue('--is-beta-secondary').trim() == 'true'; return this._super(...arguments); }, diff --git a/addons/website/static/src/scss/secondary_variables.scss b/addons/website/static/src/scss/secondary_variables.scss index 7eb722f34e8..1bd4e34b73c 100644 --- a/addons/website/static/src/scss/secondary_variables.scss +++ b/addons/website/static/src/scss/secondary_variables.scss @@ -16,7 +16,14 @@ $o-color-palettes: append($o-color-palettes, $-actual-user-color-palette); // Theme color palette // ------------------- +// Proper themes have to enforce primary = alpha and secondary = beta. +// Exceptions to this rule are made for compatibility reasons +$-palette-default: nth($o-theme-color-palettes, $o-theme-color-palette-number); + // Generate default theme color scheme if alpha is set +$-is-alpha-primary: not map-has-key($-palette-default, 'primary'); +$-is-beta-secondary: not map-has-key($-palette-default, 'secondary'); + $-alpha: map-get($o-user-theme-color-palette, 'alpha'); @if ($-alpha) { $o-user-theme-color-palette: map-merge(( @@ -30,7 +37,6 @@ $-alpha: map-get($o-user-theme-color-palette, 'alpha'); // By default, all user theme color palette values are null. Each null value is // automatically replaced with corresponsing colors in chosen default theme // color palette. -$-palette-default: nth($o-theme-color-palettes, $o-theme-color-palette-number); $-actual-user-theme-color-palette: map-merge($-palette-default, o-map-omit($o-user-theme-color-palette)); $o-theme-color-palettes: append($o-theme-color-palettes, $-actual-user-theme-color-palette); diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 6d3020cc991..eb0a3be0423 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -25,6 +25,10 @@ $-font-numbers: ( // customized by themes, the user or anything else (so there is no file to // parse to get them). Those will be printed here as CSS variables. + // 0) does this theme enforce primary = alpha or secondary = beta + --is-alpha-primary: #{$-is-alpha-primary}; + --is-beta-secondary: #{$-is-beta-secondary}; + // 1) Handle default values --header-font-size: #{$font-size-base}; diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index 2c02a2d1c50..ba5e3be73d7 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -633,11 +633,13 @@ - + - +