From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 24 Jul 2012 07:21:40 +0000 (-0700)
Subject: slightly fix side bar
X-Git-Tag: v2.1.0~2^2~141^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ea7c472358e2d77f76193ed3c1bafd641dd74ae;p=thirdparty%2Fbootstrap.git

slightly fix side bar
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5d9860248f..df389af9cc 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;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0f78130deb..4f55f268a6 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -886,6 +886,7 @@ form.bs-docs-example {
   min-height: 1px;
 }
 .bs-docs-sidenav {
+  width: 218px;
   margin-top: 40px;
   padding: 0;
   margin-right: 10px;
@@ -930,28 +931,36 @@ 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;
   }
-
 }
diff --git a/docs/assets/js/bootstrap-affix.js b/docs/assets/js/bootstrap-affix.js
index 33207b0fbd..a1cd10933f 100644
--- a/docs/assets/js/bootstrap-affix.js
+++ b/docs/assets/js/bootstrap-affix.js
@@ -50,7 +50,6 @@
 
     if (typeof offset != 'object') offset = { x: offset, y: offset }
 
-
     affix = (offset.x == null || (position.left - scrollLeft <= offset.x))
          && (offset.y == null || (position.top  - scrollTop  <= offset.y))
 
@@ -82,7 +81,6 @@
   }
 
 
-
  /* AFFIX DATA-API
   * ============== */
 
diff --git a/docs/javascript.html b/docs/javascript.html
index bc17456eae..e0d5495184 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -85,7 +85,7 @@
   ================================================== -->
   <div class="row">
     <div class="span3 bs-docs-sidebar">
-      <ul class="span3 nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
+      <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
         <li><a href="#overview">Overview <i class="icon-chevron-right"></i></a></li>
         <li><a href="#transitions">Transitions <i class="icon-chevron-right"></i></a></li>
         <li><a href="#modals">Modal <i class="icon-chevron-right"></i></a></li>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c5afdfb068..906fbc4c6c 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -14,7 +14,7 @@
   ================================================== -->
   <div class="row">
     <div class="span3 bs-docs-sidebar">
-      <ul class="span3 nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-max-979="40" data-offset="80">
+      <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
         <li><a href="#overview">{{_i}}Overview{{/i}} <i class="icon-chevron-right"></i></a></li>
         <li><a href="#transitions">{{_i}}Transitions{{/i}} <i class="icon-chevron-right"></i></a></li>
         <li><a href="#modals">{{_i}}Modal{{/i}} <i class="icon-chevron-right"></i></a></li>