aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-02 15:33:42 -0700
committerMark Otto <[email protected]>2013-06-02 15:33:42 -0700
commit21441f129259b17c6112d923dc93d4fc4577e49b (patch)
tree77ef97bfb34b1557845978f7d9a7d652d76e798e /less
parent4e4e75d4acadb5283aec23ea4643058f0b48380e (diff)
downloadbootstrap-21441f129259b17c6112d923dc93d4fc4577e49b.tar.xz
bootstrap-21441f129259b17c6112d923dc93d4fc4577e49b.zip
Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up
Diffstat (limited to 'less')
-rw-r--r--less/grid.less30
1 files changed, 15 insertions, 15 deletions
diff --git a/less/grid.less b/less/grid.less
index 23aa069e3..82b7b60c8 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -75,21 +75,6 @@
.col-md-9 { width: (9 / @grid-columns); }
.col-md-10 { width: (10/ @grid-columns); }
.col-md-11 { width: (11/ @grid-columns); }
-}
-
-@media (min-width: @screen-desktop) {
- // Large columns (desktop and up)
- .col-lg-1 { width: percentage(1 / @grid-columns); }
- .col-lg-2 { width: percentage(2 / @grid-columns); }
- .col-lg-3 { width: percentage(3 / @grid-columns); }
- .col-lg-4 { width: percentage(4 / @grid-columns); }
- .col-lg-5 { width: percentage(5 / @grid-columns); }
- .col-lg-6 { width: percentage(6 / @grid-columns); }
- .col-lg-7 { width: percentage(7 / @grid-columns); }
- .col-lg-8 { width: percentage(8 / @grid-columns); }
- .col-lg-9 { width: percentage(9 / @grid-columns); }
- .col-lg-10 { width: percentage(10/ @grid-columns); }
- .col-lg-11 { width: percentage(11/ @grid-columns); }
// Offsets
.col-offset-1 { margin-left: percentage(1 / @grid-columns); }
@@ -130,6 +115,21 @@
.col-pull-11 { right: percentage(11/ @grid-columns); }
}
+@media (min-width: @screen-desktop) {
+ // Large columns (desktop and up)
+ .col-lg-1 { width: percentage(1 / @grid-columns); }
+ .col-lg-2 { width: percentage(2 / @grid-columns); }
+ .col-lg-3 { width: percentage(3 / @grid-columns); }
+ .col-lg-4 { width: percentage(4 / @grid-columns); }
+ .col-lg-5 { width: percentage(5 / @grid-columns); }
+ .col-lg-6 { width: percentage(6 / @grid-columns); }
+ .col-lg-7 { width: percentage(7 / @grid-columns); }
+ .col-lg-8 { width: percentage(8 / @grid-columns); }
+ .col-lg-9 { width: percentage(9 / @grid-columns); }
+ .col-lg-10 { width: percentage(10/ @grid-columns); }
+ .col-lg-11 { width: percentage(11/ @grid-columns); }
+}
+
// Responsive: Tablets and up
@media screen and (min-width: @screen-tablet) {
.container {