diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-09-19 11:53:31 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-09-19 14:09:12 +0200 |
| commit | c12b472dba5cf293075be2dc0d58eb77940b111f (patch) | |
| tree | c0cbd857c84607f56ebce8ef24d15f0f3b8024a3 /addons/web_editor/static/src/scss/bootstrap_overridden.scss | |
| parent | 2ca2b8948534f7c891a6bb826ef2566dd7a0b839 (diff) | |
[FIX] website, *: review navbar color system
* web_editor, website_slides
Current system is styling all navbars with the user color. This was not
the expected behavior but it is in fact quite nice, so we decided to
keep it. There was however a problem: choosing the menu text color only
applied to the main navbar (as it was an xpath toggling the navbar-dark
class).
This commit solves the problem by forcing navbar-light to behave as
navbar-dark automatically if the menu background is dark, and this
without any JS or extra CSS rules. This allows to get rid of the menu
text color option.
This commit also reviews the light and dark colors which are used when
website is not installed.
Diffstat (limited to 'addons/web_editor/static/src/scss/bootstrap_overridden.scss')
| -rw-r--r-- | addons/web_editor/static/src/scss/bootstrap_overridden.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web_editor/static/src/scss/bootstrap_overridden.scss b/addons/web_editor/static/src/scss/bootstrap_overridden.scss index 6eee3def5f4..eb3f346595f 100644 --- a/addons/web_editor/static/src/scss/bootstrap_overridden.scss +++ b/addons/web_editor/static/src/scss/bootstrap_overridden.scss @@ -18,9 +18,9 @@ $-palette: map-merge(( // BS light and dark colors are not used for any BS component, just // for color utilities. By default, we set them to a very light and - // very dark version of a desaturate version of the primary color - 'light': lighten(desaturate($-main-color, 40%), min(70%, max(0%, 97% - $-main-color-lightness))), // Does not increase over 97% lightness - 'dark': darken(desaturate($-main-color, 40%), min(70%, max(0%, $-main-color-lightness - 10%))), // Does not lower under 10% lightness + // 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($-palette)); @if $-is-backend { $-palette: map-remove($-palette, 'primary', 'secondary', 'success', 'info', 'warning', 'danger', 'light', 'dark'); |