diff --git a/bootstrap.css b/bootstrap.css index ebb216c05..478ef0eb8 100644 --- 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 f736833f1..b4c3cd585 100644 --- 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 d82028f3d..f9fd622a1 100644 --- 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 8c0979375..e271cd312 100644 --- a/docs/index.html +++ b/docs/index.html @@ -865,6 +865,39 @@ <table> ... </table> +

Example: Condensed table

+

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.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
+

Example: Bordered table

Make your tables look just a wee bit sleeker by rounding their corners and adding borders on all sides.

diff --git a/lib/tables.less b/lib/tables.less index f4281e1b0..6145c9483 100644 --- 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 // ----------------