diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-08-06 10:15:09 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-08-10 15:43:07 +0200 |
| commit | 42b47a7104c4ee012569caa0d4f2b96c57982f70 (patch) | |
| tree | 1581a32802a22670cf8f0b6dadf3c21d8fcba096 /addons/web_editor/static/src/scss | |
| parent | 85c8466cf994ec70b8828b64805f4573ea1367e3 (diff) | |
[REF] web_editor, *: improve transparent grays definition
* website
Diffstat (limited to 'addons/web_editor/static/src/scss')
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss | 17 | ||||
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.variables.scss | 15 |
2 files changed, 13 insertions, 19 deletions
diff --git a/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss b/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss index b7ad30b1bc4..edd79516154 100644 --- a/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss +++ b/addons/web_editor/static/src/scss/web_editor.common.bootstrap.scss @@ -13,16 +13,7 @@ $theme-colors: map-merge(( // white-50 but does not allow overridding that with variables). Also add black // and white ones too as they were also not added by BS4... $grays: () !default; -$grays: map-merge(( - 'black-25': $color-black-25, - 'black-50': $color-black-50, - 'black-75': $color-black-75, - 'white-25': $color-white-25, - 'white-50': $color-white-50, - 'white-75': $color-white-75, - - // Note: those two needs to be redefined before bootstrap, otherwise they - // do not exist yet - 'black': $black, - 'white': $white, -), $grays); +$grays: map-merge(map-merge($o-transparent-grays, ( + black: $black, // Note: those two needs to be redefined before bootstrap, + white: $white, // otherwise they do not exist yet +)), $grays); diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss index 203b27fc886..51c1c4de4d1 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -227,12 +227,15 @@ $color-delta: #0D6759 !default; $color-epsilon: #0B2E59 !default; // Greyscale transparent colours -$color-black-25: rgba(black, 0.25) !default; -$color-black-50: rgba(black, 0.5) !default; -$color-black-75: rgba(black, 0.75) !default; -$color-white-25: rgba(white, 0.25) !default; -$color-white-50: rgba(white, 0.5) !default; -$color-white-75: rgba(white, 0.75) !default; +$o-transparent-grays: ( + black-25: rgba(black, 0.25), + black-50: rgba(black, 0.5), + black-75: rgba(black, 0.75), + white-25: rgba(white, 0.25), + white-50: rgba(white, 0.5), + white-75: rgba(white, 0.75), +) !default; + // Translations $o-we-content-to-translate-color: rgb(255, 255, 90) !default; |