aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-07-24 00:21:40 -0700
committerJacob Thornton <[email protected]>2012-07-24 00:21:40 -0700
commit4ea7c472358e2d77f76193ed3c1bafd641dd74ae (patch)
treedc0aee87a8a7b044090a33a865f4332e3107045f /docs
parente25bcb93fca98797629e689f11dba5f20432714a (diff)
downloadbootstrap-4ea7c472358e2d77f76193ed3c1bafd641dd74ae.tar.xz
bootstrap-4ea7c472358e2d77f76193ed3c1bafd641dd74ae.zip
slightly fix side bar
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css1
-rw-r--r--docs/assets/css/docs.css23
-rw-r--r--docs/assets/js/bootstrap-affix.js2
-rw-r--r--docs/javascript.html2
-rw-r--r--docs/templates/pages/javascript.mustache2
5 files changed, 19 insertions, 11 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5d9860248..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;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0f78130de..4f55f268a 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 33207b0fb..a1cd10933 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 bc17456ea..e0d549518 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 c5afdfb06..906fbc4c6 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>