]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Rename 2 navbar variables to comply with updated naming convention 18472/head
authorChris Rebert <code@chrisrebert.com>
Tue, 8 Dec 2015 09:30:23 +0000 (01:30 -0800)
committerChris Rebert <code@chrisrebert.com>
Tue, 8 Dec 2015 09:30:23 +0000 (01:30 -0800)
$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]

scss/_navbar.scss
scss/_variables.scss

index ffe133b9f06a363f99d7829ead88a2b594e371bd..5d894364c4bbe4209aa4338cf24a6e601e21956c 100644 (file)
@@ -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 {
index c63af849044fa0f3201c6883718643dba0c7877a..cb644c364bc608acbdbe9ef71986662c88f1545c 100644 (file)
@@ -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;