diff options
| author | Mark Otto <[email protected]> | 2016-01-07 00:29:34 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-01-07 00:29:34 -0800 |
| commit | af13a97d51f366e72c018281f111cec20ea066d6 (patch) | |
| tree | bf55598088d4a153828927b56edfe09da4e5022b | |
| parent | 7fdd52145923c71fffaf43541a321b92a75a5698 (diff) | |
| parent | 2502f84dde1195f8dc6c3019af929b098232b6d0 (diff) | |
| download | bootstrap-af13a97d51f366e72c018281f111cec20ea066d6.tar.xz bootstrap-af13a97d51f366e72c018281f111cec20ea066d6.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
| -rw-r--r-- | scss/mixins/_grid.scss | 1 |
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); } |