0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

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

This commit is contained in:
Mark Otto 2016-01-07 00:29:34 -08:00
commit af13a97d51

View File

@ -46,6 +46,7 @@
@mixin make-col-span($size, $columns: $grid-columns) { @mixin make-col-span($size, $columns: $grid-columns) {
@if $enable-flex { @if $enable-flex {
flex: 0 0 percentage($size / $columns); flex: 0 0 percentage($size / $columns);
max-width: percentage($size / $columns);
} @else { } @else {
width: percentage($size / $columns); width: percentage($size / $columns);
} }