aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-01-07 00:29:23 -0800
committerMark Otto <[email protected]>2016-01-07 00:29:23 -0800
commit2502f84dde1195f8dc6c3019af929b098232b6d0 (patch)
treedd6b838123ea54b7b9c259080d36600e55111b69
parented612b2b41c6c29c271083405b4dd4479a45fb49 (diff)
parente598307a423c10aadac8f49e64bf43837a776306 (diff)
downloadbootstrap-2502f84dde1195f8dc6c3019af929b098232b6d0.tar.xz
bootstrap-2502f84dde1195f8dc6c3019af929b098232b6d0.zip
Merge pull request #17756 from zalog/patch-11
Flexbox grid column wrapping bug
-rw-r--r--scss/mixins/_grid.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 94b829583..e48e3db5d 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -46,6 +46,7 @@
@mixin make-col-span($size, $columns: $grid-columns) {
@if $enable-flex {
flex: 0 0 percentage($size / $columns);
+ max-width: percentage($size / $columns);
} @else {
width: percentage($size / $columns);
}