From: Mark Otto Date: Thu, 7 Jan 2016 08:30:49 +0000 (-0800) Subject: Add a comment to follow-up on #17756 X-Git-Tag: v4.0.0-alpha.3~393 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfae3d46e43f52389b7e53f1172b95390276dfcb;p=thirdparty%2Fbootstrap.git Add a comment to follow-up on #17756 --- diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index e48e3db5db..468bb39f28 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -46,6 +46,9 @@ @mixin make-col-span($size, $columns: $grid-columns) { @if $enable-flex { flex: 0 0 percentage($size / $columns); + // Add a `max-width` to ensure content within each column does not blow out + // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari + // do not appear to require this. max-width: percentage($size / $columns); } @else { width: percentage($size / $columns);