aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-01-07 00:30:49 -0800
committerMark Otto <[email protected]>2016-01-07 00:30:49 -0800
commitdfae3d46e43f52389b7e53f1172b95390276dfcb (patch)
tree02517d1e4de1a5d6c8b1f4938c744f9916a1bbef
parentaf13a97d51f366e72c018281f111cec20ea066d6 (diff)
downloadbootstrap-dfae3d46e43f52389b7e53f1172b95390276dfcb.tar.xz
bootstrap-dfae3d46e43f52389b7e53f1172b95390276dfcb.zip
Add a comment to follow-up on #17756
-rw-r--r--scss/mixins/_grid.scss3
1 files changed, 3 insertions, 0 deletions
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index e48e3db5d..468bb39f2 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);