aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-30 23:31:40 -0700
committerMark Otto <[email protected]>2017-05-30 23:31:40 -0700
commit2fd192968dadc0f8d1d22a6f48c208aacd79e71f (patch)
treed029a8d11816751496292de096438004b0d82627 /scss
parentf8d1dc4d04fa341c2900de9a2ea01f3ecd8753b2 (diff)
parentccd86bdc967d8714f718c55bd13db967f2e849d2 (diff)
downloadbootstrap-2fd192968dadc0f8d1d22a6f48c208aacd79e71f.tar.xz
bootstrap-2fd192968dadc0f8d1d22a6f48c208aacd79e71f.zip
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'scss')
-rw-r--r--scss/mixins/_grid-framework.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index 5459a86f4..ba341a6ec 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -37,6 +37,7 @@
.col#{$infix}-auto {
flex: 0 0 auto;
width: auto;
+ max-width: none; // Reset earlier grid tiers
}
@for $i from 1 through $columns {