more tweaks to layouts and some docs styles

1 files changed, 46 insertions, 21 deletions

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index ffc55c3b9..5a91d67a6 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -74,23 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
-
-<div class="row">
-  <div class="span3">
-    <div class="bs-docs-contents well">
-      <h3>Contents</h3>
-      <ol>
-        <li><a href="#global">Global styles</a></li>
-        <li><a href="#gridSystem">Grid system</a></li>
-        <li><a href="#fluidGridSystem">Fluid grid system</a></li>
-        <li><a href="#gridCustomization">Customizing</a></li>
-        <li><a href="#layouts">Layouts</a></li>
-        <li><a href="#responsive">Responsive design</a></li>
-      </ol>
-    </div>
-  </div>
-  <div class="span9">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->
@@ -98,7 +82,6 @@
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
 
-
 <!--   <div class="subnav">
     <ul class="nav nav-pills">
       <li><a href="#global">Global styles</a></li>
@@ -112,6 +95,50 @@
  --></header>
 
 
+<section class="bs-docs-contents">
+  <h3>Contents</h3>
+  <ol>
+    <li>
+      <a href="#global">Global styles</a>
+      <ul>
+        <li><a href="#global-1">Requires HTML5 doctype</a></li>
+        <li><a href="#global-2">Typography and links</a></li>
+        <li><a href="#global-3">Reset via Normalize</a></li>
+      </ul>
+    </li>
+    <li>
+      <a href="#gridSystem">Grid system</a>
+      <ul>
+        <li><a href="#gridSystem-1">Offsetting columns</a></li>
+        <li><a href="#gridSystem-2">Nesting columns</a></li>
+      </ul>
+    </li>
+    <li>
+      <a href="#fluidGridSystem">Fluid grid system</a>
+      <ul>
+        <li><a href="#fluidGridSystem-1">Nesting fluid columns</a></li>
+      </ul>
+    </li>
+    <li>
+      <a href="#gridCustomization">Grid Customization</a>
+    </li>
+    <li>
+      <a href="#layouts">Layouts</a>
+      <ul>
+        <li><a href="#layouts-1">Fixed layout</a></li>
+        <li><a href="#layouts-1">Fluid layout</a></li>
+      </ul>
+    </li>
+    <li>
+      <a href="#responsive">Responsive design</a>
+      <ul>
+        <li><a href="#responsive-1">Responsive utility classes</a></li>
+        <li><a href="#responsive-2">Responsive tests</a></li>
+      </ul>
+    </li>
+  </ol>
+</section>
+
 
 
 <!-- Global Bootstrap settings
@@ -609,16 +636,14 @@
 
 </section>
 
-  </div>
-</div>
 
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>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>.</p>
         <p>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>.</p>
         <p>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>.</p>
+        <p><a href="#">Back to top</a></p>
       </footer>
 
     </div><!-- /container -->