2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch 'shama-master' into 2.0.1-wip

This commit is contained in:
Mark Otto
2012-02-02 09:38:21 -08:00
10 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -454,7 +454,7 @@
<td>
<code>.table-bordered</code>
</td>
<td>{{_i}}Rounds corners and adds outter border{{/i}}</td>
<td>{{_i}}Rounds corners and adds outer border{{/i}}</td>
</tr>
<tr>
<td>{{_i}}Zebra-stripe{{/i}}</td>
@@ -1370,7 +1370,7 @@
</div>
</div>
<div class="alert alert-info">
{{_i}}<strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code>. In the docs, we show a light red background color on hover to hightlight the icon's size.{{/i}}
{{_i}}<strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code>. In the docs, we show a light red background color on hover to highlight the icon's size.{{/i}}
</div>
<br>