diff options
| author | Andrea Ulliana <aul@odoo.com> | 2019-06-26 12:28:13 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-07-30 09:59:28 +0000 |
| commit | 7deceae18c209c67f6cfbbe3f7704798bb02a42e (patch) | |
| tree | 625139a2d2a20e9cf4ee0768c92dc172bbde892b /addons/website/static/src/scss/website.scss | |
| parent | 15bae2920cf6cf9e8f399ecc0374da04654ef66f (diff) | |
[IMP] website, *: use "auto" widget for font customization
* theme_bootswatch, theme_default, website_theme_install
This commit makes use of the new 'auto' widget for font selection:
instead of enabling a template which will enable a scss file which sets
a font variable to a specific value... we directly allow to do a scss
custo which sets that value.
The code in charge of resetting font customizations on theme switching
is also moved and refactored here in website (instead of being specific
to each theme).
Part of https://github.com/odoo/odoo/pull/33442
task-1974659
Co-authored-by: qsm-odoo <qsm@odoo.com>
Diffstat (limited to 'addons/website/static/src/scss/website.scss')
| -rw-r--r-- | addons/website/static/src/scss/website.scss | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 5fb20b332c8..c63c246acec 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -4,10 +4,10 @@ $-seen: (); $-font-numbers: ( - $o-theme-font-number, - $o-theme-headings-font-number, - $o-theme-buttons-font-number, - $o-theme-navbar-font-number + o-website-value('font-number'), + o-website-value('headings-font-number'), + o-website-value('navbar-font-number'), + o-website-value('buttons-font-number'), ); @each $-number in $-font-numbers { @if index($-seen, $-number) == null { @@ -75,8 +75,8 @@ $-font-numbers: ( } .navbar { - @if ($o-theme-navbar-font-number != $o-theme-font-number) { - font-family: nth($o-theme-fonts, $o-theme-navbar-font-number); + @if ($o-theme-navbar-font != $o-theme-font) { + font-family: $o-theme-navbar-font; } .nav-item { @@ -154,8 +154,8 @@ h6 { color: color('h6'); } .btn { - @if ($o-theme-buttons-font-number != $o-theme-font-number) { - font-family: nth($o-theme-fonts, $o-theme-buttons-font-number); + @if ($o-theme-buttons-font != $o-theme-font) { + font-family: $o-theme-buttons-font; } } |
