aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-12-28 16:51:40 -0800
committerMark Otto <[email protected]>2016-12-28 16:51:40 -0800
commita9efef6c4ab15b307ee1c840524860f2f9e8110c (patch)
treeeb7ee8f8117a98c75581610664796ddd353949f7
parent24a45deb96d584c15b5e5073e32604a146453c8f (diff)
downloadbootstrap-a9efef6c4ab15b307ee1c840524860f2f9e8110c.tar.xz
bootstrap-a9efef6c4ab15b307ee1c840524860f2f9e8110c.zip
reflect nav changes here in the responsive views
- since we're column to start, need to set row. - note that flex-direction cannot be inherited, so we have to set it twice. - apply the horizontal padding again to .nav-link. - remove the .nav-item styles (un-needed). - remove previous .nav-link styles as they were un-nested and potentially problematic in old placement should someone mix more navs in here.
-rw-r--r--scss/_navbar.scss20
1 files changed, 10 insertions, 10 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 12fe8c1b4..c9af116dc 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -265,10 +265,19 @@
}
@include media-breakpoint-up($next) {
- display: flex;
+ flex-direction: row;
flex-wrap: nowrap;
align-items: center;
+ .navbar-nav {
+ flex-direction: row;
+
+ .nav-link {
+ padding-right: .5rem;
+ padding-left: .5rem;
+ }
+ }
+
// For nesting containers, have to redeclare for alignment purposes
> .container {
display: flex;
@@ -283,15 +292,6 @@
}
// scss-lint:enable ImportantRule
- .nav-item {
- display: inline-block;
- }
-
- .nav-link {
- padding-right: .5rem;
- padding-left: .5rem;
- }
-
.navbar-toggler {
display: none;
}