From: Mark Otto <markdotto@gmail.com>
Date: Wed, 21 Dec 2016 22:31:54 +0000 (-0800)
Subject: move flex to navbar container only; otherwise it affects things negatively elsewhere
X-Git-Tag: v4.0.0-alpha.6~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73da266009e844a9f2bf13cfb0749d6748feddab;p=thirdparty%2Fbootstrap.git

move flex to navbar container only; otherwise it affects things negatively elsewhere
---

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 1756eaca12..a0d394d3ae 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -9,13 +9,13 @@
 
   @include media-breakpoint-up(sm) {
     display: flex;
-    // flex: 0 0 auto;
     flex-wrap: nowrap;
     align-items: center;
   }
 
   // For nesting containers, have to redeclare for alignment purposes
   > .container {
+    display: flex;
     flex-wrap: nowrap;
     align-items: center;
   }
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index b060350206..23b11dbed7 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -3,7 +3,6 @@
 // Generate semantic grid columns with these mixins.
 
 @mixin make-container($gutters: $grid-gutter-widths) {
-  display: flex;
   margin-left: auto;
   margin-right: auto;