]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
update docs to streamline the tables section, remove redundant css for tables to...
authorMark Otto <mark.otto@twitter.com>
Thu, 20 Oct 2011 06:11:22 +0000 (23:11 -0700)
committerMark Otto <mark.otto@twitter.com>
Thu, 20 Oct 2011 06:11:22 +0000 (23:11 -0700)
bootstrap.css
bootstrap.min.css
docs/index.html
lib/tables.less

index 0966119d330eba848c68c78f0868b6ccf5245bf9..274a81671abb08287ea3d1830f320b78fe083091 100644 (file)
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Oct 19 22:26:03 PDT 2011
+ * Date: Wed Oct 19 23:10:57 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1087,14 +1087,13 @@ table th {
   padding-top: 9px;
   font-weight: bold;
   vertical-align: middle;
-  border-bottom: 1px solid #ddd;
 }
 table td {
   vertical-align: top;
   border-top: 1px solid #ddd;
 }
 table tbody th {
-  border-bottom: 0;
+  border-top: 1px solid #ddd;
   vertical-align: top;
 }
 .bordered-table {
@@ -1110,12 +1109,6 @@ table tbody th {
 .bordered-table th + th, .bordered-table td + td, .bordered-table th + td {
   border-left: 1px solid #ddd;
 }
-.bordered-table tr td {
-  border-top: 1px solid #ddd;
-}
-.bordered-table tr:first-child td {
-  border-top: 0;
-}
 .bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child {
   -webkit-border-radius: 4px 0 0 0;
   -moz-border-radius: 4px 0 0 0;
index c799ce43385d1bc711c563ede6d9c23ed3181d46..1e8376c5a249c98a15c2fe276232b375413f6fbf 100644 (file)
@@ -185,12 +185,10 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
 .form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
 .form-stacked .actions{margin-left:-20px;padding-left:20px;}
 table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;}
-table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;}
+table th{padding-top:9px;font-weight:bold;vertical-align:middle;}
 table td{vertical-align:top;border-top:1px solid #ddd;}
-table tbody th{border-bottom:0;vertical-align:top;}
+table tbody th{border-top:1px solid #ddd;vertical-align:top;}
 .bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;}
-.bordered-table tr td{border-top:1px solid #ddd;}
-.bordered-table tr:first-child td{border-top:0;}
 .bordered-table thead tr:first-child th:first-child,.bordered-table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
 .bordered-table thead tr:first-child th:last-child,.bordered-table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
 .bordered-table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
index c4d8653a2a936227acf5d583daa5fed376699859..82eb43e0ffae2ee9ed39b28c9244b78300d38a5f 100644 (file)
         </thead>
         <tbody>
           <tr>
-            <td>1</td>
+            <th>1</th>
             <td>Some</td>
             <td>One</td>
             <td>English</td>
           </tr>
           <tr>
-            <td>2</td>
+            <th>2</th>
             <td>Joe</td>
             <td>Sixpack</td>
             <td>English</td>
           </tr>
           <tr>
-            <td>3</td>
+            <th>3</th>
             <td>Stu</td>
             <td>Dent</td>
             <td>Code</td>
               span 2 columns
             </td>
           </tr>
-          <tr>
-            <td colspan="4">
-              <table>
-                <thead>
-                  <tr>
-                    <th>1</th>
-                    <th>2</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td>1</td>
-                    <td>2</td>
-                  </tr>
-                </tbody>
-              </table>
-            </td>
-          </tr>
         </tbody>
       </table>
       <p><strong>Note:</strong> Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.</p>
index 085eef49af5500fee4841d2b9ae1e747188881f5..f4281e1b0aef5388a52aa487ca5bd5c64edc322d 100644 (file)
@@ -22,7 +22,6 @@ table {
     padding-top: 9px;
     font-weight: bold;
     vertical-align: middle;
-    border-bottom: 1px solid #ddd;
   }
   td {
     vertical-align: top;
@@ -30,7 +29,7 @@ table {
   }
   // When scoped to row, fix th in tbody
   tbody th {
-    border-bottom: 0;
+    border-top: 1px solid #ddd;
     vertical-align: top;
   }
 }
@@ -49,12 +48,6 @@ table {
   th + td {
     border-left: 1px solid #ddd;
   }
-  tr td {
-    border-top: 1px solid #ddd;
-  }
-  tr:first-child td {
-    border-top: 0;
-  }
   thead tr:first-child th:first-child,
   tbody tr:first-child td:first-child {
     .border-radius(4px 0 0 0);