From: Chris Rebert <code@chrisrebert.com>
Date: Tue, 8 Dec 2015 09:30:23 +0000 (-0800)
Subject: Rename 2 navbar variables to comply with updated naming convention
X-Git-Tag: v4.0.0-alpha.3~498^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1861b05b5ff3828a3f9276f19c4d5a58c6a12885;p=thirdparty%2Fbootstrap.git

Rename 2 navbar variables to comply with updated naming convention

$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]
---

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index ffe133b9f0..5d894364c4 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -5,7 +5,7 @@
 
 .navbar {
   position: relative;
-  padding: $navbar-padding-vertical $navbar-padding-horizontal;
+  padding: $navbar-padding-y $navbar-padding-x;
   @include clearfix;
 
   @include media-breakpoint-up(sm) {
@@ -89,8 +89,8 @@
   width: 1px;
   padding-top: .425rem;
   padding-bottom: .425rem;
-  margin-right: $navbar-padding-horizontal;
-  margin-left:  $navbar-padding-horizontal;
+  margin-right: $navbar-padding-x;
+  margin-left:  $navbar-padding-x;
   overflow: hidden;
 
   &::before {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index c63af84904..cb644c364b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -347,8 +347,8 @@ $zindex-modal:             1050 !default;
 // Navbar
 
 $navbar-border-radius:              $border-radius !default;
-$navbar-padding-horizontal:         $spacer !default;
-$navbar-padding-vertical:           ($spacer / 2) !default;
+$navbar-padding-x:                  $spacer !default;
+$navbar-padding-y:                  ($spacer / 2) !default;
 
 $navbar-dark-color:                 rgba(255,255,255,.5) !default;
 $navbar-dark-hover-color:           rgba(255,255,255,.75) !default;