1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 05:58:25 +01:00

restore .col-*-12 classes for now

This commit is contained in:
Mark Otto 2013-06-03 21:51:35 -07:00
parent 286955167a
commit 45c5b4e45c
2 changed files with 19 additions and 2 deletions

View File

@ -786,6 +786,7 @@ pre code {
.col-9,
.col-10,
.col-11,
.col-12,
.col-lg-1,
.col-lg-2,
.col-lg-3,
@ -796,7 +797,8 @@ pre code {
.col-lg-8,
.col-lg-9,
.col-lg-10,
.col-lg-11 {
.col-lg-11,
.col-lg-12 {
position: relative;
float: left;
width: 100%;
@ -849,6 +851,10 @@ pre code {
width: 91.66666666666666%;
}
.col-12 {
width: 100%;
}
@media (min-width: 768px) {
.col-md-1 {
width: 8.333333333333332%;
@ -883,6 +889,9 @@ pre code {
.col-md-11 {
width: 91.66666666666666%;
}
.col-md-12 {
width: 100%;
}
.col-offset-1 {
margin-left: 8.333333333333332%;
}
@ -1018,6 +1027,9 @@ pre code {
.col-lg-11 {
width: 91.66666666666666%;
}
.col-lg-12 {
width: 100%;
}
}
@media screen and (min-width: 768px) {

View File

@ -25,6 +25,7 @@
.col-9,
.col-10,
.col-11,
.col-12,
.col-lg-1,
.col-lg-2,
.col-lg-3,
@ -35,7 +36,8 @@
.col-lg-8,
.col-lg-9,
.col-lg-10,
.col-lg-11 {
.col-lg-11,
.col-lg-12 {
position: relative;
// Float and set width: 100%; for easy stacking on mobile devices
float: left;
@ -61,6 +63,7 @@
.col-9 { width: percentage((9 / @grid-columns)); }
.col-10 { width: percentage((10/ @grid-columns)); }
.col-11 { width: percentage((11/ @grid-columns)); }
.col-12 { width: 100%; }
// Medium columns (tablets and up)
@media (min-width: @screen-tablet) {
@ -75,6 +78,7 @@
.col-md-9 { width: percentage((9 / @grid-columns)); }
.col-md-10 { width: percentage((10/ @grid-columns)); }
.col-md-11 { width: percentage((11/ @grid-columns)); }
.col-md-12 { width: 100%; }
// Offsets
.col-offset-1 { margin-left: percentage((1 / @grid-columns)); }
@ -128,6 +132,7 @@
.col-lg-9 { width: percentage((9 / @grid-columns)); }
.col-lg-10 { width: percentage((10/ @grid-columns)); }
.col-lg-11 { width: percentage((11/ @grid-columns)); }
.col-lg-12 { width: 100%; }
}
// Responsive: Tablets and up