From: Dylan Seago <dylanseago@users.noreply.github.com>
Date: Thu, 19 Oct 2017 02:51:45 +0000 (-0400)
Subject: Rename navbar height variables to reflect their value (#24161)
X-Git-Tag: v4.0.0-beta.2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62ced0e0b397b9480fea349f4803012a0d1f3a2;p=thirdparty%2Fbootstrap.git

Rename navbar height variables to reflect their value (#24161)
---

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2301d8d79c..3d78f0b8ae 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -530,9 +530,9 @@ $navbar-padding-x:                  $spacer !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:                   $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;
+$nav-link-height:                   ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;
+$navbar-brand-height:               $navbar-brand-font-size * $line-height-base !default;
+$navbar-brand-padding-y:            ($nav-link-height - $navbar-brand-height) / 2 !default;
 
 $navbar-toggler-padding-y:          .25rem !default;
 $navbar-toggler-padding-x:          .75rem !default;