Permalink
Browse files

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

  • Loading branch information...
1 parent 41ada30 commit 5736ba549c89b3885550fb52c92d1eb61a5660c9 @mdo mdo committed Oct 27, 2011
Showing with 52 additions and 5 deletions.
  1. +4 −1 bootstrap.css
  2. +1 −0 bootstrap.min.css
  3. +2 −3 docs/assets/js/google-code-prettify/prettify.css
  4. +33 −0 docs/index.html
  5. +12 −1 lib/tables.less
View
@@ -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;
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -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;
View
@@ -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">
View
@@ -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
// ----------------

0 comments on commit 5736ba5

Please sign in to comment.