rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes

Browse Source
This commit is contained in:
Mark Otto 2013-08-12 16:02:27 -07:00
parent fb8ae7e514
commit c558c035d7
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/css/bootstrap.css vendored
View File

@ -844,8 +844,7 @@ pre code {
.col-xs-8, .col-xs-8,
.col-xs-9, .col-xs-9,
.col-xs-10, .col-xs-10,
.col-xs-11, .col-xs-11 {
.col-xs-12 {
float: left; float: left;
} }
@ -911,8 +910,7 @@ pre code {
.col-sm-8, .col-sm-8,
.col-sm-9, .col-sm-9,
.col-sm-10, .col-sm-10,
.col-sm-11, .col-sm-11 {
.col-sm-12 {
float: left; float: left;
} }
.col-sm-1 { .col-sm-1 {
@ -1066,8 +1064,7 @@ pre code {
.col-md-8, .col-md-8,
.col-md-9, .col-md-9,
.col-md-10, .col-md-10,
.col-md-11, .col-md-11 {
.col-md-12 {
float: left; float: left;
} }
.col-md-1 { .col-md-1 {
@ -1221,8 +1218,7 @@ pre code {
.col-lg-8, .col-lg-8,
.col-lg-9, .col-lg-9,
.col-lg-10, .col-lg-10,
.col-lg-11, .col-lg-11 {
.col-lg-12 {
float: left; float: left;
} }
.col-lg-1 { .col-lg-1 {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

26
less/grid.less
View File

@ -74,7 +74,10 @@
// Extra small grid // Extra small grid
// //
// Grid classes for extra small devices like smartphones. No offset, push, or // Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target // pull classes are present here due to the size of the target.
//
// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since
// it's full-width.
.col-xs-1, .col-xs-1,
.col-xs-2, .col-xs-2,
@ -86,8 +89,7 @@
.col-xs-8, .col-xs-8,
.col-xs-9, .col-xs-9,
.col-xs-10, .col-xs-10,
.col-xs-11, .col-xs-11 {
.col-xs-12 {
float: left; float: left;
} }
.col-xs-1 { width: percentage((1 / @grid-columns)); } .col-xs-1 { width: percentage((1 / @grid-columns)); }
@ -108,6 +110,9 @@
// //
// Columns, offsets, pushes, and pulls for the small device range, from phones // Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets. // to tablets.
//
// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
// it's full-width.
@media (min-width: @screen-tablet) { @media (min-width: @screen-tablet) {
.container { .container {
@ -124,8 +129,7 @@
.col-sm-8, .col-sm-8,
.col-sm-9, .col-sm-9,
.col-sm-10, .col-sm-10,
.col-sm-11, .col-sm-11 {
.col-sm-12 {
float: left; float: left;
} }
.col-sm-1 { width: percentage((1 / @grid-columns)); } .col-sm-1 { width: percentage((1 / @grid-columns)); }
@ -184,6 +188,9 @@
// Medium grid // Medium grid
// //
// Columns, offsets, pushes, and pulls for the desktop device range. // Columns, offsets, pushes, and pulls for the desktop device range.
//
// Note that `.col-md-12` doesn't get floated on purpose—there's no need since
// it's full-width.
@media (min-width: @screen-desktop) { @media (min-width: @screen-desktop) {
.container { .container {
@ -199,8 +206,7 @@
.col-md-8, .col-md-8,
.col-md-9, .col-md-9,
.col-md-10, .col-md-10,
.col-md-11, .col-md-11 {
.col-md-12 {
float: left; float: left;
} }
.col-md-1 { width: percentage((1 / @grid-columns)); } .col-md-1 { width: percentage((1 / @grid-columns)); }
@ -259,6 +265,9 @@
// Large grid // Large grid
// //
// Columns, offsets, pushes, and pulls for the large desktop device range. // Columns, offsets, pushes, and pulls for the large desktop device range.
//
// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
// it's full-width.
@media (min-width: @screen-large-desktop) { @media (min-width: @screen-large-desktop) {
.container { .container {
@ -275,8 +284,7 @@
.col-lg-8, .col-lg-8,
.col-lg-9, .col-lg-9,
.col-lg-10, .col-lg-10,
.col-lg-11, .col-lg-11 {
.col-lg-12 {
float: left; float: left;
} }
.col-lg-1 { width: percentage((1 / @grid-columns)); } .col-lg-1 { width: percentage((1 / @grid-columns)); }