fix up docs to use default container, fix responsive home changes

2 files changed, 69 insertions, 121 deletions

diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 763669b1c8..7f223ae68c 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -45,7 +45,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="bs-docs-container">
+        <div class="container">
           <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -78,7 +78,7 @@
       </div>
     </div>
 
-    <div class="bs-docs-container">
+    <div class="container">
 
 {{>body}}
 
@@ -90,6 +90,11 @@
         <p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p>
         <p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
         <p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
+        <ul class="footer-links">
+          <li><a href="http://blog.getbootstrap.com">{{_i}}Read the blog{{/i}}</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Submit issues{{/i}}</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li>
+        </ul>
       </footer>
 
     </div>{{! /container }}
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 2ca3ed887c..2990ed4f1b 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -1,21 +1,21 @@
 </div>
 
-<div class="jumbo">
-  <div class="bs-docs-container">
+<div class="jumbotron masthead">
+  <div class="container">
     <h1>Bootstrap</h1>
     <p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
-    <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large">{{_i}}Download Bootstrap{{/i}}</a></p>
-    <ul class="jumbo-links">
-      <li><a href="#">Customize</a></li>
-      <li><a href="#">GitHub project</a></li>
+    <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a></p>
+    <ul class="masthead-links">
+      <li><a href="./download.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);"{{/production}}>Customize</a></li>
+      <li><a href="http://github.com/twitter/bootstrap" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"{{/production}}>GitHub project</a></li>
       <li>Version 2.1.0</li>
     </ul>
   </div>
 </div>
 
-<div class="jumbo-buttons">
-  <div class="bs-docs-container">
-    <ul class="quick-links">
+<div class="bs-docs-social">
+  <div class="container">
+    <ul class="bs-docs-social-buttons">
       <li>
         <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="112px" height="20px"></iframe>
       </li>
@@ -32,115 +32,58 @@
   </div>
 </div>
 
-  <div class="bs-docs-container">
-
-
-<!-- Masthead
-================================================== -->
-<header class="jumbotron masthead" style="display: none;">
-  <div class="inner">
-    <h1>{{_i}}Twitter Bootstrap{{/i}}</h1>
-    <p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p>
-    <p class="download-info">
-      <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'GitHub Project', 'View project on GitHub']);"{{/production}}>{{_i}}View project on GitHub{{/i}}</a>
-      <a href="assets/bootstrap.zip" class="btn btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.0']);"{{/production}}>{{_i}}Download Bootstrap <small>(v2.1.0)</small>{{/i}}</a>
-    </p>
-  </div>
-
-  <div class="bs-links">
-    <ul class="quick-links">
-      <li><a href="./upgrading.html">{{_i}}Upgrading from 1.4{{/i}}</a></li>
-      <li><a href="https://github.com/twitter/bootstrap/zipball/master">{{_i}}Download with docs{{/i}}</a></li>
-      <li><a href="http://blog.getbootstrap.com">{{_i}}Read the blog{{/i}}</a></li>
-      <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Submit issues{{/i}}</a></li>
-      <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li>
-    </ul>
-    <ul class="quick-links">
-      <li>
-        <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="112px" height="20px"></iframe>
-      </li>
-      <li>
-        <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
-      </li>
-      <li class="follow-btn">
-        <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">{{_i}}Follow @twbootstrap{{/i}}</a>
-      </li>
-      <li class="tweet-btn">
-        <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
-      </li>
-    </ul>
-  </div>
-</header>
-
-<div class="marketing">
-
-  <h1>{{_i}}Introducing Bootstrap.{{/i}}</h1>
-  <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
-
-  <div class="row-fluid">
-    <div class="span4">
-      <img src="assets/img/bs-docs-twitter-github.png">
-      <h2>{{_i}}By nerds, for nerds.{{/i}}</h2>
-      <p>{{_i}}Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.{{/i}}</p>
-    </div>
-    <div class="span4">
-      <img src="assets/img/bs-docs-responsive-illustrations.png">
-      <h2>{{_i}}Made for everyone.{{/i}}</h2>
-      <p>{{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via <a href="./scaffolding.html#responsive">responsive CSS</a> as well.{{/i}}</p>
-    </div>
-    <div class="span4">
-      <img src="assets/img/bs-docs-bootstrap-features.png">
-      <h2>{{_i}}Packed with features.{{/i}}</h2>
-      <p>{{_i}}Utilize the 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">javascript plugins</a>, typography, form controls, and even a <a href="./download.html">web-based Customizer</a> to make Bootstrap your own.{{/i}}</p>
+<div class="container">
+
+  <div class="marketing">
+
+    <h1>{{_i}}Introducing Bootstrap.{{/i}}</h1>
+    <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
+
+    <div class="row-fluid">
+      <div class="span4">
+        <img src="assets/img/bs-docs-twitter-github.png">
+        <h2>{{_i}}By nerds, for nerds.{{/i}}</h2>
+        <p>{{_i}}Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.{{/i}}</p>
+      </div>
+      <div class="span4">
+        <img src="assets/img/bs-docs-responsive-illustrations.png">
+        <h2>{{_i}}Made for everyone.{{/i}}</h2>
+        <p>{{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via <a href="./scaffolding.html#responsive">responsive CSS</a> as well.{{/i}}</p>
+      </div>
+      <div class="span4">
+        <img src="assets/img/bs-docs-bootstrap-features.png">
+        <h2>{{_i}}Packed with features.{{/i}}</h2>
+        <p>{{_i}}Utilize the 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">javascript plugins</a>, typography, form controls, and even a <a href="./download.html">web-based Customizer</a> to make Bootstrap your own.{{/i}}</p>
+      </div>
     </div>
-  </div>
-
-<!--       <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
-      <h2>{{_i}}Living, coded examples{{/i}}</h2>
-      <p>{{_i}}Bootstrap was designed first and foremost as a way to document not only the code of our components, but the visual and interaction design through live examples.{{/i}}</p>
-
-      <img class="bs-icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
-      <h2>{{_i}}Growing library{{/i}}</h2>
-      <p>{{_i}}Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.{{/i}}</p>
-
-      <img class="bs-icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
-      <h2>{{_i}}Custom jQuery plugins{{/i}}</h2>
-      <p>{{_i}}Easy-to-use, proper, and extensible interactions for many of our components with custom-built jQuery plugins to quickly bring any project to life.{{/i}}</p>
-
-      <img class="bs-icon" src="assets/img/less-small.png">
-      <h2>{{_i}}Built on LESS{{/i}}</h2>
-      <p>{{_i}}Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.{{/i}}</p>
-    </div>
-  </div>
--->
-
-  <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>
-  <div class="row-fluid">
-    <ul class="thumbnails example-sites">
-      <li class="span3">
-        <a class="thumbnail" href="http://soundready.fm/" target="_blank">
-          <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
-        </a>
-      </li>
-      <li class="span3">
-        <a class="thumbnail" href="http://kippt.com/" target="_blank">
-          <img src="assets/img/example-sites/kippt.png" alt="Kippt">
-        </a>
-      </li>
-      <li class="span3">
-        <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
-          <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
-        </a>
-      </li>
-      <li class="span3">
-        <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
-          <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
-        </a>
-      </li>
-    </ul>
-   </div>
 
-</div><!-- /.marketing -->
+    <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>
+    <div class="row-fluid">
+      <ul class="thumbnails example-sites">
+        <li class="span3">
+          <a class="thumbnail" href="http://soundready.fm/" target="_blank">
+            <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
+          </a>
+        </li>
+        <li class="span3">
+          <a class="thumbnail" href="http://kippt.com/" target="_blank">
+            <img src="assets/img/example-sites/kippt.png" alt="Kippt">
+          </a>
+        </li>
+        <li class="span3">
+          <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
+            <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
+          </a>
+        </li>
+        <li class="span3">
+          <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
+            <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
+          </a>
+        </li>
+      </ul>
+     </div>
+
+  </div><!-- /.marketing -->