diff options
| author | qsm-odoo <qsm@odoo.com> | 2020-05-04 15:10:22 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-05-05 11:23:07 +0000 |
| commit | a8c54b40cd7db9b417764a17624bd1362ae38d63 (patch) | |
| tree | 7bbf853fc0bde943a36c57dd1b77b5bafd2512d3 /addons/web_editor/static/src/scss/web_editor.variables.scss | |
| parent | afcb7349083c669dbda18b9b1955eabbe14ea675 (diff) | |
[FIX] web_editor: add access to all grays in bootstrap_overridden files
Before this commit, and in 13.0, you had access to gray colors in
bootstrap_overridden.scss files through the `palette-gray` function but
only if the gray was explicitely defined in the theme palette. This was
fine as only those were used at that time. Now, some themes want to use
the default BS gray values in those files to customize other variables.
The solution is to "force" all grays in the selected gray palette, using
the BS values by default.
closes odoo/odoo#50640
X-original-commit: fcb62edf3118d2d615296f293e6694b0e533bc99
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web_editor/static/src/scss/web_editor.variables.scss')
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.variables.scss | 19 |
1 files changed, 17 insertions, 2 deletions
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 97951f635cd..c178844b095 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -313,9 +313,24 @@ $o-theme-color-palettes: ( $o-theme-color-palette-number: 1 !default; // Greyscale transparent colours + +// Note: BS values are forced by default in every palette as the values can +// be used in bootstrap_overridden.scss files through the palette-gray function. +// Also, all of the gray colors generates bg- classes in Odoo so black and white +// are added for the same reason. + $o-base-gray-color-palette: ( - 'white': #FFFFFF, // Those two will enforce the creation of bg-white - 'black': #000000, // and bg-black classes. + 'white': #FFFFFF, + '100': #F8F9FA, + '200': #E9ECEF, + '300': #DEE2E6, + '400': #CED4DA, + '500': #ADB5BD, + '600': #6C757D, + '700': #495057, + '800': #343A40, + '900': #212529, + 'black': #000000, ) !default; $o-transparent-grays: ( 'black-15': rgba(black, 0.15), |