Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-05-12 22:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #18472 from twbs/x-y-vars

Browse source 
Rename 2 navbar variables to comply with updated naming convention
This commit is contained in:
Chris Rebert 2015-12-12 00:32:28 -08:00
commit 34fe668af2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scss/_navbar.scss
View file

@ -5,7 +5,7 @@
.navbar { .navbar {
position: relative; position: relative;
padding: $navbar-padding-vertical $navbar-padding-horizontal; padding: $navbar-padding-y $navbar-padding-x;
@include clearfix; @include clearfix;
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
@ -89,8 +89,8 @@
width: 1px; width: 1px;
padding-top: .425rem; padding-top: .425rem;
padding-bottom: .425rem; padding-bottom: .425rem;
margin-right: $navbar-padding-horizontal; margin-right: $navbar-padding-x;
margin-left: $navbar-padding-horizontal; margin-left: $navbar-padding-x;
overflow: hidden; overflow: hidden;
&::before { &::before {

4
scss/_variables.scss
View file

@ -365,8 +365,8 @@ $zindex-modal: 1050 !default;
// Navbar // Navbar
$navbar-border-radius: $border-radius !default; $navbar-border-radius: $border-radius !default;
$navbar-padding-horizontal: $spacer !default; $navbar-padding-x: $spacer !default;
$navbar-padding-vertical: ($spacer / 2) !default; $navbar-padding-y: ($spacer / 2) !default;
$navbar-dark-color: rgba(255,255,255,.5) !default; $navbar-dark-color: rgba(255,255,255,.5) !default;
$navbar-dark-hover-color: rgba(255,255,255,.75) !default; $navbar-dark-hover-color: rgba(255,255,255,.75) !default;