diff options
| author | qsm-odoo <qsm@odoo.com> | 2019-06-14 09:44:31 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-06-14 09:51:05 +0000 |
| commit | 62b89ea4674b7003cb07d5da45ffcbeeab3536f7 (patch) | |
| tree | 88e1068056f1394b7695d66b029814ec87d5a7da /addons/website/static/src | |
| parent | 989590e9b1fb8a7617ffd86d6e502fddb9790ed4 (diff) | |
[FIX] website: allow different compatibility grays
Commit https://github.com/odoo/odoo/commit/4f9a0cb4fcdfa9fee66c042593f4d411dd0e192f
introduced a way for users to enable a compatibility template to provide
support for some old BS3 classes.
Some of these classes are the bg-gray-* classes. The problem is that
enabling the compatibility file forces them to the new BS4 gray values
while the user may have done a custo to generate them automatically
from other gray values. This commit allows to keep the compatibility
file enabled, without overriding compatibility grays the user may have
provided on its own.
closes odoo/odoo#34134
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/scss/compatibility/bs3_for_12_0.scss | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss b/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss index 4f93429aa58..7a7995f518f 100644 --- a/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss +++ b/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss @@ -9,10 +9,12 @@ $-compat-gray-map: ( 'gray': '700', 'gray-light': '600', 'gray-lighter': '200', -); +) !default; @each $old, $new in $-compat-gray-map { - @include bg-variant(".bg-#{$old}", gray($new)); - @include text-emphasis-variant(".text-#{$old}", gray($new)); + @if not map-has-key($grays, $old) { + @include bg-variant(".bg-#{$old}", gray($new)); + @include text-emphasis-variant(".text-#{$old}", gray($new)); + } } // Restore media ? |