diff options
| author | Mark Otto <[email protected]> | 2013-04-30 13:03:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-30 13:03:10 -0700 |
| commit | 0f17f9b7f7fe15bb4ce6301caa2600bfd30e63d7 (patch) | |
| tree | 2825b00fb2a24335e3a62a40add293228c5898f4 | |
| parent | e67d3818ed962a69cb970fa9255647a087c643c9 (diff) | |
| download | bootstrap-0f17f9b7f7fe15bb4ce6301caa2600bfd30e63d7.tar.xz bootstrap-0f17f9b7f7fe15bb4ce6301caa2600bfd30e63d7.zip | |
Fixes #7744: update grid mixin to use latest grid styles
| -rw-r--r-- | less/mixins.less | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/less/mixins.less b/less/mixins.less index eb8775975..2323d1203 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -411,15 +411,20 @@ } // Generate the columns .make-column(@columns) { - @media (min-width: @grid-float-breakpoint) { - // Calculate width based on number of columns available - width: percentage((@columns / @grid-columns)); - } + position: relative; + // Float and set width: 100%; for easy stacking on mobile devices + float: left; + width: 100%; // Prevent columns from collapsing when empty min-height: 1px; // Inner gutter via padding padding-left: (@grid-gutter-width / 2); padding-right: (@grid-gutter-width / 2); + + // Calculate width based on number of columns available + @media (min-width: @grid-float-breakpoint) { + width: percentage((@columns / @grid-columns)); + } } // Generate the column offsets .make-column-offset(@columns) { @@ -437,16 +442,7 @@ right: percentage((@columns / @grid-columns)); } } -// Small, mobile-first columns -.make-small-column(@columns) { - position: relative; - float: left; - // Prevent columns from collapsing when empty - min-height: 1px; - // Set inner padding as gutters instead of margin - padding-left: (@grid-gutter-width / 2); - padding-right: (@grid-gutter-width / 2); -} + |