diff options
| author | Chris Rebert <[email protected]> | 2015-12-12 00:32:28 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-12-12 00:32:28 -0800 |
| commit | 34fe668af2dadd7a4a42e89d9c51d3f3b4bd0190 (patch) | |
| tree | 0d53d8e4ca35833da1fb0eaf131399f762bc1a03 /scss | |
| parent | 1a0f8db796cf5258668fbffb3af41923c1460ec7 (diff) | |
| parent | 1861b05b5ff3828a3f9276f19c4d5a58c6a12885 (diff) | |
| download | bootstrap-34fe668af2dadd7a4a42e89d9c51d3f3b4bd0190.tar.xz bootstrap-34fe668af2dadd7a4a42e89d9c51d3f3b4bd0190.zip | |
Merge pull request #18472 from twbs/x-y-vars
Rename 2 navbar variables to comply with updated naming convention
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_navbar.scss | 6 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss index ffe133b9f..5d894364c 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 44cc3cb1b..f02d4a16b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -365,8 +365,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; |