Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

af13a97d · Mark Otto · 7fdd5214 · 2502f84d · af13a97d
Commit af13a97d authored 9 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 0 deletions
+1 -0
--- 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);
  }