From: Pierre-Denis Vanduynslager Date: Sat, 14 Jan 2017 06:59:20 +0000 (-0500) Subject: Allow to customize navbar-brand font-size X-Git-Tag: v4.0.0-beta~147^2~104 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17cb5bb674fd2f6c47619726aeea29437bcd6a0a;p=thirdparty%2Fbootstrap.git Allow to customize navbar-brand font-size --- diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 9a50b4e9a5..2c5cbe2ee1 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -49,7 +49,7 @@ padding-top: $navbar-brand-padding-y; padding-bottom: $navbar-brand-padding-y; margin-right: $navbar-padding-x; - font-size: $font-size-lg; + font-size: $navbar-brand-font-size; line-height: inherit; white-space: nowrap; diff --git a/scss/_variables.scss b/scss/_variables.scss index b0c8859a5f..0fa4f334b0 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -601,8 +601,9 @@ $nav-pills-active-link-bg: $component-active-bg !default; $navbar-padding-x: $spacer !default; $navbar-padding-y: ($spacer / 2) !default; +$navbar-brand-font-size: $font-size-lg !default; // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link -$nav-link-height: $font-size-lg * $line-height-base !default; +$nav-link-height: $navbar-brand-font-size * $line-height-base !default; $navbar-brand-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default; $navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default;