fix prettyify and update the table styles to include a condensed flavor

diff --git a/bootstrap.css b/bootstrap.css
index ebb216c05561a4668037094076c18e7acbed4c7f..478ef0eb82dd23b586a5d6a5be11c12f44c42e3f 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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: Thu Oct 20 09:12:21 PDT 2011
+ * Date: Wed Oct 26 21:19:44 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).
@@ -1094,6 +1094,9 @@ table tbody th {
   border-top: 1px solid #ddd;
   vertical-align: top;
 }
+.condensed-table th, .condensed-table td {
+  padding: 5px 5px 4px;
+}
 .bordered-table {
   border: 1px solid #ddd;
   border-collapse: separate;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index f736833f1a71e03c848c3f6c44361f7cae2b3a80..b4c3cd585fe09c25dce8ba6b0262261ee3ec5483 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -188,6 +188,7 @@ table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:col
 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-top:1px solid #ddd;vertical-align:top;}
+.condensed-table th,.condensed-table td{padding:5px 5px 4px;}
 .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 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;}

diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index d82028f3d542c41a227c9e096ad462a7dce27ef3..f9fd622a1cd864c8c2683f034cfe1ac13ab4ac42 100644 (file)
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -16,12 +16,11 @@
 }
 
 /* Specify class=linenums on a pre to get line numbering */
-.linenums {
+ol.linenums {
   margin: 0 0 0 40px;
 }
 /* IE indents via margin-left */
-.linenums li {
-  margin-left: -5px;
+ol.linenums li {
   padding: 0 5px;
   color: rgba(0,0,0,.15);
   line-height: 20px;

diff --git a/docs/index.html b/docs/index.html
index 8c0979375300d3d158d26a3fc537aafbd371d4c2..e271cd3125bf9963beaf0e19475f5f756ab5bdaa 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -865,6 +865,39 @@
 <table>
   ...
 &lt;/table&gt;</pre>
+      <h3>Example: Condensed table</h3>
+      <p>For tables that require more data in tighter spaces, use the condensed flavor that cuts padding in half. It can also be used in conjunction with borders and zebra-stripes, just like the default table styles.</p>
+      <table class="condensed-table">
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Language</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th>1</th>
+            <td>Some</td>
+            <td>One</td>
+            <td>English</td>
+          </tr>
+          <tr>
+            <th>2</th>
+            <td>Joe</td>
+            <td>Sixpack</td>
+            <td>English</td>
+          </tr>
+          <tr>
+            <th>3</th>
+            <td>Stu</td>
+            <td>Dent</td>
+            <td>Code</td>
+          </tr>
+        </tbody>
+      </table>
+
       <h3>Example: Bordered table</h3>
       <p>Make your tables look just a wee bit sleeker by rounding their corners and adding borders on all sides.</p>
       <table class="bordered-table">

diff --git a/lib/tables.less b/lib/tables.less
index f4281e1b0aef5388a52aa487ca5bd5c64edc322d..6145c9483c4e450329c7761705fa85d6c08c5524 100644 (file)
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -13,7 +13,8 @@ table {
   padding: 0;
   font-size: @basefont;
   border-collapse: collapse;
-  th, td {
+  th,
+  td {
     padding: 10px 10px 9px;
     line-height: @baseline;
     text-align: left;
@@ -35,6 +36,16 @@ table {
 }
 
 
+// CONDENSED VERSION
+// -----------------
+.condensed-table {
+  th,
+  td {
+    padding: 5px 5px 4px;
+  }
+}
+
+
 // BORDERED VERSION
 // ----------------