aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-03-25 13:33:36 -0700
committerJacob Thornton <[email protected]>2012-03-25 13:33:36 -0700
commita62810918f8a27b5755258521422eb912a1edfd8 (patch)
tree085cda38b04a9793165b01c704eb2a0f168b7c70 /docs
parenta5552a1d700a1caa2d87ea4bbccc59205b6e72f9 (diff)
downloadbootstrap-a62810918f8a27b5755258521422eb912a1edfd8.tar.xz
bootstrap-a62810918f8a27b5755258521422eb912a1edfd8.zip
fix responsive navbar
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin56381 -> 56390 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css3
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/components.html2
-rw-r--r--docs/css-tests.html2
-rw-r--r--docs/download.html2
-rw-r--r--docs/examples.html2
-rw-r--r--docs/index.html2
-rw-r--r--docs/javascript.html2
-rw-r--r--docs/less.html2
-rw-r--r--docs/scaffolding.html2
-rw-r--r--docs/templates/layout.mustache2
-rw-r--r--docs/upgrading.html2
14 files changed, 14 insertions, 13 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fbf2c7506..9de6e49c6 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 1ad16d6fd..c374fb8e5 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -667,7 +667,8 @@
.btn-navbar {
display: block;
}
- .nav-collapse {
+ .nav-collapse,
+ .nav-collapse.collapse {
overflow: hidden;
height: 0;
}
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c1d995e30..50fb64dfc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini {
margin-bottom: 18px;
}
.navbar-inner {
- height: 40px;
+ min-height: 40px;
padding-left: 20px;
padding-right: 20px;
background-color: #2c2c2c;
diff --git a/docs/base-css.html b/docs/base-css.html
index 6ccc216d1..1cb10a806 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/components.html b/docs/components.html
index 71134045a..13d1598c0 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/css-tests.html b/docs/css-tests.html
index 0db105796..c2a932b36 100644
--- a/docs/css-tests.html
+++ b/docs/css-tests.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/download.html b/docs/download.html
index e4097ea4e..c0e3b9cf0 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/examples.html b/docs/examples.html
index dffb46fd9..7872a39e8 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/index.html b/docs/index.html
index f7bbfc2b5..1f526fcdb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="active">
<a href="./index.html">Overview</a>
diff --git a/docs/javascript.html b/docs/javascript.html
index 4904eba16..3cba210a1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/less.html b/docs/less.html
index 8b02f1961..89e06cf91 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 017fd493e..e2715a2c3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index d3c06e096..4fdaadb3b 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="{{index}}">
<a href="./index.html">{{_i}}Overview{{/i}}</a>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 05930c25e..2a27b00e6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
- <div class="nav-collapse">
+ <div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>