rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Fixes #8211: restore proper table grid class behavior

Browse Source 
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
This commit is contained in:
Mark Otto 2013-06-23 15:05:50 -07:00
parent 2a47037ab0
commit b76d98eee3
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
less/grid.less
View File

@ -2,7 +2,6 @@
// Grid system // Grid system
// -------------------------------------------------- // --------------------------------------------------
// Set the container width, and override it for fixed navbars in media queries // Set the container width, and override it for fixed navbars in media queries
.container { .container {
.container-fixed(); .container-fixed();
@ -51,9 +50,6 @@
.col-lg-11, .col-lg-11,
.col-lg-12 { .col-lg-12 {
position: relative; position: relative;
// Float and set width: 100%; for easy stacking on mobile devices
float: left;
width: 100%;
// Prevent columns from collapsing when empty // Prevent columns from collapsing when empty
min-height: 1px; min-height: 1px;
// Inner gutter via padding // Inner gutter via padding
@ -68,6 +64,20 @@
// //
// Tiny device columns (smartphones) // Tiny device columns (smartphones)
.col-1,
.col-2,
.col-3,
.col-4,
.col-5,
.col-6,
.col-7,
.col-8,
.col-9,
.col-10,
.col-11,
.col-12 {
float: left;
}
.col-1 { width: percentage((1 / @grid-columns)); } .col-1 { width: percentage((1 / @grid-columns)); }
.col-2 { width: percentage((2 / @grid-columns)); } .col-2 { width: percentage((2 / @grid-columns)); }
.col-3 { width: percentage((3 / @grid-columns)); } .col-3 { width: percentage((3 / @grid-columns)); }
@ -87,6 +97,20 @@
max-width: @container-tablet; max-width: @container-tablet;
} }
.col-sm-1,
.col-sm-2,
.col-sm-3,
.col-sm-4,
.col-sm-5,
.col-sm-6,
.col-sm-7,
.col-sm-8,
.col-sm-9,
.col-sm-10,
.col-sm-11,
.col-sm-12 {
float: left;
}
.col-sm-1 { width: percentage((1 / @grid-columns)); } .col-sm-1 { width: percentage((1 / @grid-columns)); }
.col-sm-2 { width: percentage((2 / @grid-columns)); } .col-sm-2 { width: percentage((2 / @grid-columns)); }
.col-sm-3 { width: percentage((3 / @grid-columns)); } .col-sm-3 { width: percentage((3 / @grid-columns)); }
@ -144,6 +168,20 @@
.container { .container {
max-width: @container-desktop; max-width: @container-desktop;
} }
.col-lg-1,
.col-lg-2,
.col-lg-3,
.col-lg-4,
.col-lg-5,
.col-lg-6,
.col-lg-7,
.col-lg-8,
.col-lg-9,
.col-lg-10,
.col-lg-11,
.col-lg-12 {
float: left;
}
.col-lg-1 { width: percentage((1 / @grid-columns)); } .col-lg-1 { width: percentage((1 / @grid-columns)); }
.col-lg-2 { width: percentage((2 / @grid-columns)); } .col-lg-2 { width: percentage((2 / @grid-columns)); }
.col-lg-3 { width: percentage((3 / @grid-columns)); } .col-lg-3 { width: percentage((3 / @grid-columns)); }

8
less/tables.less
View File

@ -184,16 +184,18 @@ th {
// ----------------- // -----------------
// Reset default table behavior // Reset default table behavior
table col[class*="col-span-"] { table col[class^="col-"] {
float: none; float: none;
display: table-column; display: table-column;
} }
table td[class*="col-span-"], table td[class^="col-"],
table th[class*="col-span-"] { table th[class^="col-"] {
float: none; float: none;
display: table-cell; display: table-cell;
} }
// TABLE BACKGROUNDS // TABLE BACKGROUNDS
// ----------------- // -----------------
// Exact selectors below required to override .table-striped // Exact selectors below required to override .table-striped