Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

9 files changed, 52 insertions, 51 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2ef413906..6fa20cf4d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -538,6 +538,7 @@ hr.soften {
   padding: 19px 24px;
   margin-bottom: 27px;
   font-size: 30px;
+  line-height: 1;
   text-align: center;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 000000000..a92b1913a
--- /dev/null
+++ b/docs/assets/img/glyphicons-halflings-sprite-white.png
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
index 2d783eefe..b4e0acfbc 100644
--- a/docs/assets/img/glyphicons-halflings-sprite.png
+++ b/docs/assets/img/glyphicons-halflings-sprite.png
diff --git a/docs/base-css.html b/docs/base-css.html
index 239b963c4..a30e0c1f3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1482,7 +1482,7 @@
       <p>Or, use them in navigation.</p>
       <div class="well" style="padding: 8px 0;">
         <ul class="nav list">
-          <li class="active"><a href="#"><i class="icon home"></i> Home</a></li>
+          <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li>
           <li><a href="#"><i class="icon book"></i> Library</a></li>
           <li><a href="#"><i class="icon pencil"></i> Applications</a></li>
         </ul>
diff --git a/docs/index.html b/docs/index.html
index d7a870e8d..e60e9d711 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -114,28 +114,6 @@
         <hr class="soften">
 
         <div class="marketing">
-          <h1>Built with Bootstrap.</h1>
-          <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
-          <ul class="thumbnails example-sites">
-            <li class="span4">
-              <a class="thumbnail" href="http://kippt.com/" target="_blank">
-                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
-                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
-                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
-              </a>
-            </li>
-          </ul>
-
-        <hr class="soften">
-
           <h1>Designed for everyone, everywhere.</h1>
           <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
           <div class="row">
@@ -212,7 +190,29 @@
             </div>
           </div><!--/row-->
 
-        <hr class="soften">
+          <hr class="soften">
+
+          <h1>Built with Bootstrap.</h1>
+          <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
+          <ul class="thumbnails example-sites">
+            <li class="span4">
+              <a class="thumbnail" href="http://kippt.com/" target="_blank">
+                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
+                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
+                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
+              </a>
+            </li>
+          </ul>
+
+          <hr class="soften">
 
           <!-- Quickstart options
           ================================================== -->
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 11f3b4486..df6ea9f00 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -357,7 +357,7 @@
     <div class="span5">
       <p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p>
       <ol>
-        <li>Use the compiled responsive version, bootstrap-reponsive.css</li>
+        <li>Use the compiled responsive version, bootstrap-responsive.css</li>
         <li>Add @import "responsive.less" and recompile Bootstrap</li>
         <li>Modify and recompile responsive.less as a separate</li>
       </ol>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 6f928dfa3..c3d10eb08 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1417,7 +1417,7 @@
       <p>{{_i}}Or, use them in navigation.{{/i}}</p>
       <div class="well" style="padding: 8px 0;">
         <ul class="nav list">
-          <li class="active"><a href="#"><i class="icon home"></i> {{_i}}Home{{/i}}</a></li>
+          <li class="active"><a href="#"><i class="icon white home"></i> {{_i}}Home{{/i}}</a></li>
           <li><a href="#"><i class="icon book"></i> {{_i}}Library{{/i}}</a></li>
           <li><a href="#"><i class="icon pencil"></i> {{_i}}Applications{{/i}}</a></li>
         </ul>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index b045cc579..9a5421bd3 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -49,28 +49,6 @@
         <hr class="soften">
 
         <div class="marketing">
-          <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
-          <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
-          <ul class="thumbnails example-sites">
-            <li class="span4">
-              <a class="thumbnail" href="http://kippt.com/" target="_blank">
-                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
-                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
-              </a>
-            </li>
-            <li class="span4">
-              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
-                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
-              </a>
-            </li>
-          </ul>
-
-        <hr class="soften">
-
           <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
           <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
           <div class="row">
@@ -147,7 +125,29 @@
             </div>
           </div><!--/row-->
 
-        <hr class="soften">
+          <hr class="soften">
+
+          <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
+          <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
+          <ul class="thumbnails example-sites">
+            <li class="span4">
+              <a class="thumbnail" href="http://kippt.com/" target="_blank">
+                <img src="assets/img/example-sites/kippt.png" alt="Kippt">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
+                <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
+              </a>
+            </li>
+            <li class="span4">
+              <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
+                <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
+              </a>
+            </li>
+          </ul>
+
+          <hr class="soften">
 
           <!-- Quickstart options
           ================================================== -->
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index bc924e3ef..7781e86f6 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -292,7 +292,7 @@
     <div class="span5">
       <p>{{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}</p>
       <ol>
-        <li>{{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}</li>
+        <li>{{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}</li>
         <li>{{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}</li>
         <li>{{_i}}Modify and recompile responsive.less as a separate{{/i}}</li>
       </ol>
@@ -314,4 +314,4 @@
 </pre>
     </div>
   </div>
-</section>
\ No newline at end of file
+</section>