mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

Move grid offsets to desktop only (fixes #8229)

Browse Source
This commit is contained in:
Mark Otto
2013-06-23 15:15:42 -07:00
parent 164e88781b
commit 573a197417
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+33 -33
View File
@@ -933,39 +933,6 @@ pre code {
.col-sm-12 { .col-sm-12 {
width: 100%; width: 100%;
} }
.col-offset-1 {
margin-left: 8.333333333333332%;
}
.col-offset-2 {
margin-left: 16.666666666666664%;
}
.col-offset-3 {
margin-left: 25%;
}
.col-offset-4 {
margin-left: 33.33333333333333%;
}
.col-offset-5 {
margin-left: 41.66666666666667%;
}
.col-offset-6 {
margin-left: 50%;
}
.col-offset-7 {
margin-left: 58.333333333333336%;
}
.col-offset-8 {
margin-left: 66.66666666666666%;
}
.col-offset-9 {
margin-left: 75%;
}
.col-offset-10 {
margin-left: 83.33333333333334%;
}
.col-offset-11 {
margin-left: 91.66666666666666%;
}
.col-push-1 { .col-push-1 {
left: 8.333333333333332%; left: 8.333333333333332%;
} }
@@ -1088,6 +1055,39 @@ pre code {
.col-lg-12 { .col-lg-12 {
width: 100%; width: 100%;
} }
.col-offset-1 {
margin-left: 8.333333333333332%;
}
.col-offset-2 {
margin-left: 16.666666666666664%;
}
.col-offset-3 {
margin-left: 25%;
}
.col-offset-4 {
margin-left: 33.33333333333333%;
}
.col-offset-5 {
margin-left: 41.66666666666667%;
}
.col-offset-6 {
margin-left: 50%;
}
.col-offset-7 {
margin-left: 58.333333333333336%;
}
.col-offset-8 {
margin-left: 66.66666666666666%;
}
.col-offset-9 {
margin-left: 75%;
}
.col-offset-10 {
margin-left: 83.33333333333334%;
}
.col-offset-11 {
margin-left: 91.66666666666666%;
}
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
less/grid.less
+13 -13
View File
@@ -124,19 +124,6 @@
.col-sm-11 { width: percentage((11/ @grid-columns)); } .col-sm-11 { width: percentage((11/ @grid-columns)); }
.col-sm-12 { width: 100%; } .col-sm-12 { width: 100%; }
// Offsets
.col-offset-1 { margin-left: percentage((1 / @grid-columns)); }
.col-offset-2 { margin-left: percentage((2 / @grid-columns)); }
.col-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-offset-4 { margin-left: percentage((4 / @grid-columns)); }
.col-offset-5 { margin-left: percentage((5 / @grid-columns)); }
.col-offset-6 { margin-left: percentage((6 / @grid-columns)); }
.col-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-offset-8 { margin-left: percentage((8 / @grid-columns)); }
.col-offset-9 { margin-left: percentage((9 / @grid-columns)); }
.col-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-offset-11 { margin-left: percentage((11/ @grid-columns)); }
// Push and pull columns for source order changes // Push and pull columns for source order changes
.col-push-1 { left: percentage((1 / @grid-columns)); } .col-push-1 { left: percentage((1 / @grid-columns)); }
.col-push-2 { left: percentage((2 / @grid-columns)); } .col-push-2 { left: percentage((2 / @grid-columns)); }
@@ -194,6 +181,19 @@
.col-lg-10 { width: percentage((10/ @grid-columns)); } .col-lg-10 { width: percentage((10/ @grid-columns)); }
.col-lg-11 { width: percentage((11/ @grid-columns)); } .col-lg-11 { width: percentage((11/ @grid-columns)); }
.col-lg-12 { width: 100%; } .col-lg-12 { width: 100%; }
// Offsets
.col-offset-1 { margin-left: percentage((1 / @grid-columns)); }
.col-offset-2 { margin-left: percentage((2 / @grid-columns)); }
.col-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-offset-4 { margin-left: percentage((4 / @grid-columns)); }
.col-offset-5 { margin-left: percentage((5 / @grid-columns)); }
.col-offset-6 { margin-left: percentage((6 / @grid-columns)); }
.col-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-offset-8 { margin-left: percentage((8 / @grid-columns)); }
.col-offset-9 { margin-left: percentage((9 / @grid-columns)); }
.col-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-offset-11 { margin-left: percentage((11/ @grid-columns)); }
} }
// Large desktops and up // Large desktops and up