From: Mark Otto <markdotto@gmail.com>
Date: Thu, 29 Dec 2016 00:51:40 +0000 (-0800)
Subject: reflect nav changes here in the responsive views
X-Git-Tag: v4.0.0-alpha.6~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40e85012ebfb7c31eb03cc15b268d606d5883db1;p=thirdparty%2Fbootstrap.git

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.
---

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 12fe8c1b40..c9af116dc5 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;
         }