diff --git a/addons/web_editor/static/src/scss/secondary_variables.scss b/addons/web_editor/static/src/scss/secondary_variables.scss index 33d5019ec82..421e6670aa5 100644 --- a/addons/web_editor/static/src/scss/secondary_variables.scss +++ b/addons/web_editor/static/src/scss/secondary_variables.scss @@ -20,7 +20,7 @@ $-combination-additions: (); $o-color-palette: map-get($o-color-palettes, $o-color-palette-name) or (); // Original color palette can contain override of the default combinations (so keep 'null' values for this merge) $o-color-palette: map-merge($-combination-additions, $o-color-palette); -$o-color-palette: map-merge($o-base-color-palette, o-map-omit($o-color-palette)); +$o-color-palette: map-merge($o-base-color-palette, $o-color-palette); $o-color-palette: o-map-force-nulls($o-color-palette); // Theme colors @@ -41,16 +41,16 @@ $o-theme-color-palette: map-merge(( // very dark version of a desaturate version of the main color 'light': lighten(desaturate($-main-color, 80%), min(70%, max(0%, 97% - $-main-color-lightness))), // Does not increase over 97% lightness 'dark': darken(desaturate($-main-color, 80%), min(70%, max(0%, $-main-color-lightness - 10%))), // Does not lower under 10% lightness -), o-map-omit($o-theme-color-palette)); -$o-theme-color-palette: map-merge($o-base-theme-color-palette, o-map-omit($o-theme-color-palette)); +), $o-theme-color-palette); +$o-theme-color-palette: map-merge($o-base-theme-color-palette, $o-theme-color-palette); $o-theme-color-palette: o-map-force-nulls($o-theme-color-palette); // Gray colors // Extend grays with transparent ones (for some reason, BS4 create black-50 and // white-50 but does not allow overridding that with variables). $o-gray-color-palette: map-get($o-gray-color-palettes, $o-gray-color-palette-name) or () !default; -$o-gray-color-palette: map-merge($o-transparent-grays, o-map-omit($o-gray-color-palette)); -$o-gray-color-palette: map-merge($o-base-gray-color-palette, o-map-omit($o-gray-color-palette)); +$o-gray-color-palette: map-merge($o-transparent-grays, $o-gray-color-palette); +$o-gray-color-palette: map-merge($o-base-gray-color-palette, $o-gray-color-palette); $o-gray-color-palette: o-map-force-nulls($o-gray-color-palette); $o-color-system-initialized: false; diff --git a/addons/website/static/src/scss/secondary_variables.scss b/addons/website/static/src/scss/secondary_variables.scss index c0db7f2e75b..14c27077550 100644 --- a/addons/website/static/src/scss/secondary_variables.scss +++ b/addons/website/static/src/scss/secondary_variables.scss @@ -54,7 +54,7 @@ $o-fonts-similar: ( // automatically replaced with corresponsing values in chosen default values // palette. $-website-values-default: o-safe-nth($o-website-values-palettes, $o-website-values-palette-number, ()); -$-website-values-default: map-merge($o-base-website-values-palette, o-map-omit($-website-values-default)); +$-website-values-default: map-merge($o-base-website-values-palette, $-website-values-default); $o-user-website-values: o-map-font-aliases($o-user-website-values); $-actual-user-website-values-palette: map-merge($-website-values-default, $o-user-website-values); // Default font selection + User font selection have been merged, now need to