aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-12-21 14:31:54 -0800
committerMark Otto <[email protected]>2016-12-22 13:48:07 -0800
commit73da266009e844a9f2bf13cfb0749d6748feddab (patch)
treee4723482aece3d208a2dd7a28606a91c82cb73e9
parent135bd0283dbe51a32d9297d6302197a322fd250d (diff)
downloadbootstrap-73da266009e844a9f2bf13cfb0749d6748feddab.tar.xz
bootstrap-73da266009e844a9f2bf13cfb0749d6748feddab.zip
move flex to navbar container only; otherwise it affects things negatively elsewhere
-rw-r--r--scss/_navbar.scss2
-rw-r--r--scss/mixins/_grid.scss1
2 files changed, 1 insertions, 2 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 1756eaca1..a0d394d3a 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 b06035020..23b11dbed 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;