]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
move flex to navbar container only; otherwise it affects things negatively elsewhere
authorMark Otto <markdotto@gmail.com>
Wed, 21 Dec 2016 22:31:54 +0000 (14:31 -0800)
committerMark Otto <markd.otto@gmail.com>
Thu, 22 Dec 2016 21:48:07 +0000 (13:48 -0800)
scss/_navbar.scss
scss/mixins/_grid.scss

index 1756eaca1253ea908649db33938b346e8fc392bb..a0d394d3aee2dd0d2f388d52e6f05890772e7ad3 100644 (file)
@@ -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;
   }
index b060350206499ff72809d11a25513671396d79e2..23b11dbed7cb9120c89dcf5e605519ace72ed48c 100644 (file)
@@ -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;