Skip to content

Commit 5736ba5

Browse files
committed
fix prettyify and update the table styles to include a condensed flavor
1 parent 41ada30 commit 5736ba5

File tree

5 files changed

+52
-5
lines changed

5 files changed

+52
-5
lines changed

bootstrap.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9-
* Date: Thu Oct 20 09:12:21 PDT 2011
9+
* Date: Wed Oct 26 21:19:44 PDT 2011
1010
*/
1111
/* Reset.less
1212
* 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 {
10941094
border-top: 1px solid #ddd;
10951095
vertical-align: top;
10961096
}
1097+
.condensed-table th, .condensed-table td {
1098+
padding: 5px 5px 4px;
1099+
}
10971100
.bordered-table {
10981101
border: 1px solid #ddd;
10991102
border-collapse: separate;

bootstrap.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/google-code-prettify/prettify.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
}
1717

1818
/* Specify class=linenums on a pre to get line numbering */
19-
.linenums {
19+
ol.linenums {
2020
margin: 0 0 0 40px;
2121
}
2222
/* IE indents via margin-left */
23-
.linenums li {
24-
margin-left: -5px;
23+
ol.linenums li {
2524
padding: 0 5px;
2625
color: rgba(0,0,0,.15);
2726
line-height: 20px;

docs/index.html

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,39 @@ <h3>Example: Default table styles</h3>
865865
&lt;table&gt;
866866
...
867867
&lt;/table&gt;</pre>
868+
<h3>Example: Condensed table</h3>
869+
<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>
870+
<table class="condensed-table">
871+
<thead>
872+
<tr>
873+
<th>#</th>
874+
<th>First Name</th>
875+
<th>Last Name</th>
876+
<th>Language</th>
877+
</tr>
878+
</thead>
879+
<tbody>
880+
<tr>
881+
<th>1</th>
882+
<td>Some</td>
883+
<td>One</td>
884+
<td>English</td>
885+
</tr>
886+
<tr>
887+
<th>2</th>
888+
<td>Joe</td>
889+
<td>Sixpack</td>
890+
<td>English</td>
891+
</tr>
892+
<tr>
893+
<th>3</th>
894+
<td>Stu</td>
895+
<td>Dent</td>
896+
<td>Code</td>
897+
</tr>
898+
</tbody>
899+
</table>
900+
868901
<h3>Example: Bordered table</h3>
869902
<p>Make your tables look just a wee bit sleeker by rounding their corners and adding borders on all sides.</p>
870903
<table class="bordered-table">

lib/tables.less

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ table {
1313
padding: 0;
1414
font-size: @basefont;
1515
border-collapse: collapse;
16-
th, td {
16+
th,
17+
td {
1718
padding: 10px 10px 9px;
1819
line-height: @baseline;
1920
text-align: left;
@@ -35,6 +36,16 @@ table {
3536
}
3637

3738

39+
// CONDENSED VERSION
40+
// -----------------
41+
.condensed-table {
42+
th,
43+
td {
44+
padding: 5px 5px 4px;
45+
}
46+
}
47+
48+
3849
// BORDERED VERSION
3950
// ----------------
4051

0 commit comments

Comments
 (0)