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

1 files changed, 22 insertions, 12 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index fa487e001..ff7d48ae4 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -891,6 +891,7 @@ form.bs-docs-example {
   min-height: 1px;
 }
 .bs-docs-sidenav {
+  width: 218px;
   margin-top: 40px;
   padding: 0;
   margin-right: 10px;
@@ -935,24 +936,39 @@ form.bs-docs-example {
   background-image: url(../img/glyphicons-halflings-white.png);
   opacity: .75;
 }
-
 .bs-docs-sidenav.affix {
   top: 40px;
 }
 
-@media (max-width: 979px) {
-
-  .bs-docs-sidenav.affix {
-    top: 0px;
+@media (min-width: 1200px) {
+  .bs-docs-sidenav {
+    width: 258px;
   }
+}
 
+@media (max-width: 979px) {
   .bs-docs-sidenav {
+    top: 0px;
     margin-top: 30px;
     margin-right: 0;
   }
+}
 
+@media (min-width: 768px) and (max-width: 979px) {
+  .bs-docs-sidenav {
+    width: 166px;
+  }
 }
 
+@media (max-width: 767px) {
+  .bs-docs-sidenav {
+    width: auto;
+  }
+  .bs-docs-sidenav.affix {
+    position: relative;
+    width: auto;
+  }
+}
 
 @media (min-width: 979px) {
   .masthead,
@@ -983,10 +999,4 @@ form.bs-docs-example {
   .subhead + .bs-docs-canvas {
     top: 250px;
   }
-}
-
-@media (max-width: 767px) {
-  .bs-docs-sidenav.affix {
-    position: relative;
-  }
-}
+}
\ No newline at end of file