aboutsummaryrefslogtreecommitdiff
path: root/docs/base-css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-11-29 23:48:27 -0800
committerMark Otto <[email protected]>2011-11-29 23:48:27 -0800
commit90c190d4efedd4080c574b34bffdf54cd5b9ed88 (patch)
tree41bad1a33e6263f40700108b416f34504eb442d6 /docs/base-css.html
parent0c8d2e37e76db3d3b47ca9eb5340def031b9196b (diff)
downloadbootstrap-90c190d4efedd4080c574b34bffdf54cd5b9ed88.tar.xz
bootstrap-90c190d4efedd4080c574b34bffdf54cd5b9ed88.zip
updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks
Diffstat (limited to 'docs/base-css.html')
-rw-r--r--docs/base-css.html9
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index 7626d1668..cc1b4903c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -632,6 +632,7 @@
&lt;/table&gt;</pre>
<h3>3. Bordered table</h3>
<p>Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.</p>
+ <p><span class="label">Note</span> Bordered tables do not work well with <code>rowspan</code> due to somewhat hacky CSS applied to the tables. Sorry about that!</p>
<table class="bordered-table">
<thead>
<tr>
@@ -648,7 +649,13 @@
<td>English</td>
</tr>
<tr>
- <td colspan="2">2 Joe</td>
+ <td>2</td>
+ <td>Joe</td>
+ <td>Sixpack</td>
+ <td>English</td>
+ </tr>
+ </tr>
+ <td>Joe</td>
<td>Sixpack</td>
<td>English</td>
</tr>