summaryrefslogtreecommitdiff
path: root/addons/website/static
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2020-10-06 13:46:39 +0000
committerqsm-odoo <qsm@odoo.com>2020-10-06 16:35:29 +0000
commit31bfb5075063070d24a607ed47da6bdd8207aa5a (patch)
tree98184de8fe09cef84794563272f1e8d2e3e8652e /addons/website/static
parent7c658f4cbd832a3ede58701ec37103a0787fa818 (diff)
[FIX] website: properly set button font family for navbar buttons
Since 13.0, the website menu can contain text and buttons through mega menus, which created inconsistencies on the way the "navbar font" configuration works. Indeed, when setting the "button font", navbar buttons were updated too... except if that "button font" was equal to the "text font", in that case those buttons used the "navbar font", so not logical at all. This commit solves the problem by only using the navbar font to style bootstrap nav links, which is the common content of mega menu snippets anyway but this has a side-effect: text-in-navbar font may change from navbar font to text font which is acceptable as the 14.0 was released very recently. Sorry for the inconvenience if any, but it felt important to fix the problem that way for the new static content of header templates. closes odoo/odoo#59314 X-original-commit: 9282f72c5f4366df93eef97052b572fc82edf161 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/website/static')
-rw-r--r--addons/website/static/src/scss/website.scss8
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index fdca7940ecb..0cd58d44009 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -177,9 +177,6 @@ $-seen-urls: ();
}
.navbar {
- @if ($o-theme-navbar-font != $o-theme-font) {
- font-family: $o-theme-navbar-font;
- }
.navbar-collapse {
min-width: 0; // Allows it to shrink during loading
@@ -202,6 +199,11 @@ $-seen-urls: ();
}
}
}
+.navbar-brand, .navbar-text, .navbar .nav-link {
+ @if $o-theme-navbar-font != $o-theme-font {
+ font-family: $o-theme-navbar-font;
+ }
+}
.navbar-light {
// Style only navbar-light which Odoo is only supposed to use in standard