aboutsummaryrefslogtreecommitdiff
path: root/docs/base-css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-02 09:38:21 -0800
committerMark Otto <[email protected]>2012-02-02 09:38:21 -0800
commitab4345332da37fc64171088879d7518b59c400a3 (patch)
tree8c90fbaabbb329ec741cd3758fbb45ae288965f8 /docs/base-css.html
parentbd0e95200390d773b4440d0b7e4cc46091300bbd (diff)
parent99f395bcd7ad18ec1ef63b88516e98b294b5bc12 (diff)
downloadbootstrap-ab4345332da37fc64171088879d7518b59c400a3.tar.xz
bootstrap-ab4345332da37fc64171088879d7518b59c400a3.zip
Merge branch 'shama-master' into 2.0.1-wip
Diffstat (limited to 'docs/base-css.html')
-rw-r--r--docs/base-css.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index ac297c645..8c504d814 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -530,7 +530,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<td>
<code>.table-bordered</code>
</td>
- <td>Rounds corners and adds outter border</td>
+ <td>Rounds corners and adds outer border</td>
</tr>
<tr>
<td>Zebra-stripe</td>
@@ -1446,7 +1446,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</div>
</div>
<div class="alert alert-info">
- <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.
+ <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.
</div>
<br>