aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-12-28 16:51:40 -0800
committerMark Otto <[email protected]>2016-12-28 19:07:33 -0800
commit40e85012ebfb7c31eb03cc15b268d606d5883db1 (patch)
treeae2b084355eaadc10c131d4ea2aaec8a43a78c1e
parentb132d02f9981b99a4abd2cacbb55cb66c9237528 (diff)
downloadbootstrap-40e85012ebfb7c31eb03cc15b268d606d5883db1.tar.xz
bootstrap-40e85012ebfb7c31eb03cc15b268d606d5883db1.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;
}