_tables.scss in bootstrap-sass-rails-2.0.2.0

- old
+ new

@@ -9,10 +9,11 @@
 
 table {
   max-width: 100%;
   border-collapse: collapse;
   border-spacing: 0;
+  background-color: $tableBackground;
 }
 
 // BASELINE STYLES
 // ---------------
 
@@ -24,27 +25,29 @@
   td {
     padding: 8px;
     line-height: $baseLineHeight;
     text-align: left;
     vertical-align: top;
-    border-top: 1px solid #ddd;
+    border-top: 1px solid $tableBorder;
   }
   th {
     font-weight: bold;
   }
   // Bottom align for column headings
   thead th {
     vertical-align: bottom;
   }
   // Remove top border from thead by default
-  thead:first-child tr th,
-  thead:first-child tr td {
+  colgroup + thead tr:first-child th,
+  colgroup + thead tr:first-child td,
+  thead:first-child tr:first-child th,
+  thead:first-child tr:first-child td {
     border-top: 0;
   }
   // Account for multiple tbody instances
   tbody + tbody {
-    border-top: 2px solid #ddd;
+    border-top: 2px solid $tableBorder;
   }
 }
 
 
 
@@ -61,19 +64,18 @@
 
 // BORDERED VERSION
 // ----------------
 
 .table-bordered {
-  border: 1px solid #ddd;
+  border: 1px solid $tableBorder;
+  border-left: 0;
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapsed; // IE7 can't round corners anyway
   @include border-radius(4px);
-  th + th,
-  td + td,
-  th + td,
-  td + th {
-    border-left: 1px solid #ddd;
+  th,
+  td {
+    border-left: 1px solid $tableBorder;
   }
   // Prevent a double border
   thead:first-child tr:first-child th,
   tbody:first-child tr:first-child th,
   tbody:first-child tr:first-child td {
@@ -106,11 +108,11 @@
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 .table-striped {
   tbody {
     tr:nth-child(odd) td,
     tr:nth-child(odd) th {
-      background-color: #f9f9f9;
+      background-color: $tableBackgroundAccent;
     }
   }
 }
 
 
@@ -118,24 +120,19 @@
 // ------------
 // Placed here since it has to come after the potential zebra striping
 .table {
   tbody tr:hover td,
   tbody tr:hover th {
-    background-color: #f5f5f5;
+    background-color: $tableBackgroundHover;
   }
 }
 
 
 // TABLE CELL SIZING
 // -----------------
 
 // Change the columns
-@mixin tableColumns($columnSpan: 1) {
-  float: none;
-  width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16;
-  margin-left: 0;
-}
 table {
   .span1     { @include tableColumns(1); }
   .span2     { @include tableColumns(2); }
   .span3     { @include tableColumns(3); }
   .span4     { @include tableColumns(4); }
@@ -145,6 +142,18 @@
   .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); }
 }