aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-01 22:13:26 -0800
committerMark Otto <[email protected]>2012-02-01 22:13:26 -0800
commitc1f0da7cce2b7c3258d17f5e81faac25e231bbf8 (patch)
tree05458a678d754354721f9bc95d14a35d54a368f5 /docs
parentf34ddb5c3f214b75de36aec2b1631844166bb8cc (diff)
parentcc8a8df125dafb0d90babcef05819e15225f2234 (diff)
downloadbootstrap-c1f0da7cce2b7c3258d17f5e81faac25e231bbf8.tar.xz
bootstrap-c1f0da7cce2b7c3258d17f5e81faac25e231bbf8.zip
Merge branch 'master' of github.com:twitter/bootstrap
Diffstat (limited to 'docs')
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/examples/starter-template.html2
-rw-r--r--docs/templates/pages/base-css.mustache2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index 5aa0257c7..a198064f8 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -600,7 +600,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<div class="row">
<div class="span4">
<p>Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.table-striped</code> class.</p>
- <p class="muted"><strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
+ <p class="muted"><strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
&lt;table class="table table-striped"&gt;
diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html
index 55808cc6a..c8b2a09cf 100644
--- a/docs/examples/starter-template.html
+++ b/docs/examples/starter-template.html
@@ -13,12 +13,12 @@
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
}
</style>
+ <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4c8e9ba08..634809715 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -524,7 +524,7 @@
<div class="row">
<div class="span4">
<p>{{_i}}Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.table-striped</code> class.{{/i}}</p>
- <p class="muted">{{_i}}<strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.{{/i}}</p>
+ <p class="muted">{{_i}}<strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.{{/i}}</p>
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
&lt;table class="table table-striped"&gt;