diff options
| author | jerome hanke (jhk) <jhk@odoo.com> | 2020-02-20 09:53:48 +0000 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2020-04-20 12:07:24 +0000 |
| commit | fcc07467a28724ef16cc554d6c17625cd5ea80d7 (patch) | |
| tree | bfb03445ca0d0719926ce929be2bbde9d474d0ad /addons/website/static/src/js/editor | |
| parent | 4faf329defed8bf915d132e81cda1189c31423ae (diff) | |
[FIX] website: theme color palette based on primary or alpha
Steps to reproduce:
- install website
- install the theme "clean"
- go to website > customize > customize theme
- select the first "extra color" (alpha) and change it
Previous behavior:
All extra color that have not been set previously have changed
automatically without notice
Current behavior:
the theme is either showing primary/secondary colors or only "extra" colors
Good themes are supposed to enforce primary = alpha and secondary = beta
All extra color that have not been set previously change automatically but
an information tooltip shows up when you hover alpha to avoid confusion
opw-2180611
Forward-Port-Of: #46099
closes #49730
closes odoo/odoo#49789
X-original-commit: c9aada53b1e6b24da4e1fe9ac4d44db3ff8cacda
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Diffstat (limited to 'addons/website/static/src/js/editor')
| -rw-r--r-- | addons/website/static/src/js/editor/snippets.options.js | 5 |
1 files changed, 3 insertions, 2 deletions
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); }, |