aboutsummaryrefslogtreecommitdiff
path: root/docs/templates/pages/base-css.mustache
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/templates/pages/base-css.mustache
parentbd0e95200390d773b4440d0b7e4cc46091300bbd (diff)
parent99f395bcd7ad18ec1ef63b88516e98b294b5bc12 (diff)
downloadbootstrap-ab4345332da37fc64171088879d7518b59c400a3.tar.xz
bootstrap-ab4345332da37fc64171088879d7518b59c400a3.zip
Merge branch 'shama-master' into 2.0.1-wip
Diffstat (limited to 'docs/templates/pages/base-css.mustache')
-rw-r--r--docs/templates/pages/base-css.mustache4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 420b00226..27c9a96fd 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -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>