aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-12-16 22:17:09 -0800
committerChris Rebert <[email protected]>2015-12-16 22:17:09 -0800
commite6fdebb9c7efda70b9c1d9e3a716e28cd6b050cc (patch)
tree947e5deaa3aba5e69ab8e4b92b93831cd5d631ae
parent92338da1f38bc60b08cd44b1c491665d6e8c5e70 (diff)
parentde9ad37c5dbc26911b2c99fd54e5b0f106073286 (diff)
downloadbootstrap-e6fdebb9c7efda70b9c1d9e3a716e28cd6b050cc.tar.xz
bootstrap-e6fdebb9c7efda70b9c1d9e3a716e28cd6b050cc.zip
Merge pull request #18463 from twbs/nav-item-margin
Introduce $nav-item-margin variable /fyi @mdo
-rw-r--r--scss/_nav.scss6
-rw-r--r--scss/_variables.scss2
2 files changed, 5 insertions, 3 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss
index f7b83c68d..4efed45b6 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -57,7 +57,7 @@
margin-bottom: -1px;
+ .nav-item {
- margin-left: .2rem;
+ margin-left: $nav-item-margin;
}
}
@@ -102,7 +102,7 @@
float: left;
+ .nav-item {
- margin-left: .2rem;
+ margin-left: $nav-item-margin;
}
}
@@ -128,7 +128,7 @@
float: none;
+ .nav-item {
- margin-top: .2rem;
+ margin-top: $nav-item-margin;
margin-left: 0;
}
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 322baf412..20a57bfcb 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -381,6 +381,8 @@ $navbar-light-disabled-color: rgba(0,0,0,.15) !default;
// Navs
+$nav-item-margin: .2rem !default;
+
$nav-link-padding: .5em 1em !default;
$nav-link-hover-bg: $gray-lighter !default;