vendor/assets/stylesheets/twitter/bootstrap/_tables.scss in bootstrap-sass-rails-2.0.4.3 vs vendor/assets/stylesheets/twitter/bootstrap/_tables.scss in bootstrap-sass-rails-2.1.0.0pre1

- old
+ new

@@ -1,9 +1,8 @@ // -// Tables.less -// Tables for, you guessed it, tabular data -// ---------------------------------------- +// Tables +// -------------------------------------------------- // BASE TABLES // ----------------- @@ -68,11 +67,11 @@ // ---------------- .table-bordered { border: 1px solid $tableBorder; border-collapse: separate; // Done so we can round those corners! - *border-collapse: collapsed; // IE7 can't round corners anyway + *border-collapse: collapse; // IE7 can't round corners anyway border-left: 0; @include border-radius(4px); th, td { border-left: 1px solid $tableBorder; @@ -89,37 +88,47 @@ tbody:first-child tr:first-child td { border-top: 0; } // For first th or td in the first row in the first thead or tbody thead:first-child tr:first-child th:first-child, - tbody:first-child tr:first-child td:first-child { + tbody:last-child tr:last-child td:first-child, + tfoot:last-child tr:last-child td:first-child { -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; } thead:first-child tr:first-child th:last-child, - tbody:first-child tr:first-child td:last-child { + tbody:last-child tr:last-child td:last-child, + tfoot:last-child tr:last-child td:last-child { -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-topright: 4px; } - // For first th or td in the first row in the first thead or tbody - thead:last-child tr:last-child th:first-child, - tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; + + // Special fixes to round the left border on the first td/th + caption + thead tr:first-child th:first-child, + caption + tbody tr:first-child td:first-child, + colgroup + thead tr:first-child th:first-child, + colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; } - thead:last-child tr:last-child th:last-child, - tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; + caption + thead tr:first-child th:last-child, + caption + tbody tr:first-child td:last-child, + colgroup + thead tr:first-child th:last-child, + colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-right-topleft: 4px; } + } + + // ZEBRA-STRIPING // -------------- // Default zebra-stripe styles (alternating gray and transparent backgrounds) .table-striped { @@ -133,22 +142,32 @@ // HOVER EFFECT // ------------ // Placed here since it has to come after the potential zebra striping -.table { - tbody tr:hover td, - tbody tr:hover th { - background-color: $tableBackgroundHover; +.table-hover { + tbody { + tr:hover td, + tr:hover th { + background-color: $tableBackgroundHover; + } } } // TABLE CELL SIZING // ----------------- -// Change the columns +// Reset default grid behavior +table [class*=span], +.row-fluid table [class*=span] { + display: table-cell; + float: none; // undo default grid column styles + margin-left: 0; // undo default grid column styles +} + +// Change the column widths to account for td/th padding table { .span1 { @include tableColumns(1); } .span2 { @include tableColumns(2); } .span3 { @include tableColumns(3); } .span4 { @include tableColumns(4); } @@ -170,6 +189,23 @@ .span20 { @include tableColumns(20); } .span21 { @include tableColumns(21); } .span22 { @include tableColumns(22); } .span23 { @include tableColumns(23); } .span24 { @include tableColumns(24); } +} + + +// TABLE BACKGROUNDS +// ----------------- +// Exact selectors below required to override .table-striped + +.table { + tbody tr.success td { + background-color: $successBackground; + } + tbody tr.error td { + background-color: $errorBackground; + } + tbody tr.info td { + background-color: $infoBackground; + } }