vendor/assets/stylesheets/twitter/bootstrap/rtl/_tables.scss in bootstrap-sass-rails-rtl-2.0.4.12 vs vendor/assets/stylesheets/twitter/bootstrap/rtl/_tables.scss in bootstrap-sass-rails-rtl-2.2.2.0

- old
+ new

@@ -1,9 +1,9 @@ +/* Partial: twitter/bootstrap/_tables.scss */ // -// Tables.less -// Tables for, you guessed it, tabular data -// ---------------------------------------- +// Tables +// -------------------------------------------------- // BASE TABLES // ----------------- @@ -47,10 +47,15 @@ } // Account for multiple tbody instances tbody + tbody { border-top: 2px solid $tableBorder; } + + // Nesting + .table { + background-color: $bodyBackground; + } } // CONDENSED TABLE W/ HALF PADDING @@ -68,13 +73,13 @@ // ---------------- .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-right: 0; - @include border-radius(4px); + @include border-radius($baseBorderRadius); th, td { border-right: 1px solid $tableBorder; } // Prevent a double border @@ -88,88 +93,158 @@ tbody:first-child tr:first-child th, 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 { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + thead:first-child tr:first-child > th:first-child, + tbody:first-child tr:first-child > td:first-child { + @include border-top-left-radius($baseBorderRadius); } - thead:first-child tr:first-child th:last-child, - tbody:first-child tr:first-child td:last-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 { + @include border-top-right-radius($baseBorderRadius); } - // 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-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; + // For first th or td in the last row in the last thead or tbody + thead:last-child tr:last-child > th:first-child, + tbody:last-child tr:last-child > td:first-child, + tfoot:last-child tr:last-child > td:first-child { + @include border-bottom-left-radius($baseBorderRadius); } - thead:last-child tr:last-child th:last-child, - tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; + thead:last-child tr:last-child > th:last-child, + tbody:last-child tr:last-child > td:last-child, + tfoot:last-child tr:last-child > td:last-child { + @include border-bottom-right-radius($baseBorderRadius); } + + // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot + tfoot + tbody:last-child tr:last-child td:first-child { + @include border-bottom-left-radius(0); + } + tfoot + tbody:last-child tr:last-child td:last-child { + @include border-bottom-right-radius(0); + } + + + // 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 { + @include border-top-left-radius($baseBorderRadius); + } + 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 { + @include border-top-right-radius($baseBorderRadius); + } + } + + // ZEBRA-STRIPING // -------------- // Default zebra-stripe styles (alternating gray and transparent backgrounds) .table-striped { tbody { - tr:nth-child(odd) td, - tr:nth-child(odd) th { + > tr:nth-child(odd) > td, + > tr:nth-child(odd) > th { background-color: $tableBackgroundAccent; } } } // 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 -table { - .span1 { @include tableColumns(1); } - .span2 { @include tableColumns(2); } - .span3 { @include tableColumns(3); } - .span4 { @include tableColumns(4); } - .span5 { @include tableColumns(5); } - .span6 { @include tableColumns(6); } - .span7 { @include tableColumns(7); } - .span8 { @include tableColumns(8); } - .span9 { @include tableColumns(9); } - .span10 { @include tableColumns(10); } - .span11 { @include tableColumns(11); } - .span12 { @include tableColumns(12); } - .span13 { @include tableColumns(13); } - .span14 { @include tableColumns(14); } - .span15 { @include tableColumns(15); } - .span16 { @include tableColumns(16); } - .span17 { @include tableColumns(17); } - .span18 { @include tableColumns(18); } - .span19 { @include tableColumns(19); } - .span20 { @include tableColumns(20); } - .span21 { @include tableColumns(21); } - .span22 { @include tableColumns(22); } - .span23 { @include tableColumns(23); } - .span24 { @include tableColumns(24); } +// Reset default grid behavior +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { + display: table-cell; + float: none; // undo default grid column styles + margin-right: 0; // undo default grid column styles +} + +// Change the column widths to account for td/th padding +.table td, +.table th { + &.span1 { @include tableColumns(1); } + &.span2 { @include tableColumns(2); } + &.span3 { @include tableColumns(3); } + &.span4 { @include tableColumns(4); } + &.span5 { @include tableColumns(5); } + &.span6 { @include tableColumns(6); } + &.span7 { @include tableColumns(7); } + &.span8 { @include tableColumns(8); } + &.span9 { @include tableColumns(9); } + &.span10 { @include tableColumns(10); } + &.span11 { @include tableColumns(11); } + &.span12 { @include tableColumns(12); } + &.span13 { @include tableColumns(13); } + &.span14 { @include tableColumns(14); } + &.span15 { @include tableColumns(15); } + &.span16 { @include tableColumns(16); } + &.span17 { @include tableColumns(17); } + &.span18 { @include tableColumns(18); } + &.span19 { @include tableColumns(19); } + &.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; + } + &.error td { + background-color: $errorBackground; + } + &.warning td { + background-color: $warningBackground; + } + &.info td { + background-color: $infoBackground; + } +} + +// Hover states for .table-hover +.table-hover tbody tr { + &.success:hover td { + background-color: darken($successBackground, 5%); + } + &.error:hover td { + background-color: darken($errorBackground, 5%); + } + &.warning:hover td { + background-color: darken($warningBackground, 5%); + } + &.info:hover td { + background-color: darken($infoBackground, 5%); + } }