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

1 files changed, 13 insertions, 3 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e58093e1a..02fd34c51 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -813,9 +813,13 @@ form.bs-docs-example {
   opacity: .75;
 }
 .bs-docs-sidenav.affix {
-  top: 30px;
+  top: 40px;
+}
+.bs-docs-sidenav.affix-bottom {
+  position: absolute;
+  top: auto;
+  bottom: 270px;
 }
-
 
 
 
@@ -868,12 +872,15 @@ form.bs-docs-example {
   }
   /* Widen masthead and social buttons to fill body padding */
   .jumbotron {
-    margin-top:   -20px; /* Offset bottom margin on .navbar */
+    margin-top: -20px; /* Offset bottom margin on .navbar */
   }
   /* Adjust sidenav width */
   .bs-docs-sidenav {
     width: 166px;
   }
+  .bs-docs-sidenav.affix {
+    top: 0px;
+  }
 }
 
 /* Tablet
@@ -929,6 +936,9 @@ form.bs-docs-example {
   .footer p {
     margin-bottom: 9px;
   }
+  .bs-docs-sidenav.affix {
+    top: 0;
+  }
 }
 
 /* Landscape phones