From: ChrissiQ Date: Tue, 23 Sep 2014 22:38:49 +0000 (-0600) Subject: Update _top-bar.scss X-Git-Tag: v5.4.5~7^2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5858%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Update _top-bar.scss $topbar-link-dropdown-padding was overriding without the !default, making the variable as available in the settings file useless. This is important to fix mostly because it breaks rem-based layouts (throws an error: "Incompatible uinits: 'px' and 'rem'" no matter what you do), but also because it is counterintuitive that if this is set in the settings file, it gets ignored. --- diff --git a/scss/foundation/components/_top-bar.scss b/scss/foundation/components/_top-bar.scss index f4aae7291..4af003986 100644 --- a/scss/foundation/components/_top-bar.scss +++ b/scss/foundation/components/_top-bar.scss @@ -49,7 +49,7 @@ $topbar-link-font-family: $body-font-family !default; $topbar-link-text-transform: none !default; $topbar-link-padding: $topbar-height / 3 !default; $topbar-back-link-size: rem-calc(18) !default; -$topbar-link-dropdown-padding: 20px; +$topbar-link-dropdown-padding: 20px !default; $topbar-button-font-size: 0.75rem !default; $topbar-button-top: 7px !default;