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

Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache

2 files changed, 20 insertions, 0 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 73ec0bf83..df389af9c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -67,6 +67,7 @@ sub {
 }
 
 img {
+  height: auto;
   max-width: 100%;
   vertical-align: middle;
   border: 0;
@@ -5501,3 +5502,7 @@ a.badge:hover {
 .invisible {
   visibility: hidden;
 }
+
+.affix {
+  position: fixed;
+}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 95495456c..657bcd8a9 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -893,6 +893,7 @@ form.bs-docs-example {
   margin-right: 10px;
   background-color: #fff;
   border: 1px solid #e5e5e5;
+  margin-left: 0;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
           border-radius: 6px;
@@ -932,8 +933,16 @@ form.bs-docs-example {
   opacity: .75;
 }
 
+.bs-docs-sidenav.affix {
+  top: 40px;
+}
+
 @media (max-width: 979px) {
 
+  .bs-docs-sidenav.affix {
+    top: 0px;
+  }
+
   .bs-docs-sidenav {
     margin-top: 30px;
     margin-right: 0;
@@ -972,3 +981,9 @@ form.bs-docs-example {
     top: 240px;
   }
 }
+
+@media (max-width: 767px) {
+  .bs-docs-sidenav.affix {
+    position: relative;
+  }
+}