diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 3731713e82..631c904e79 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -86,9 +86,6 @@ width: auto; margin: 0; } - .btn-navbar { - display: block; - } } @media (min-width: 768px) and (max-width: 940px) { .container { @@ -258,6 +255,13 @@ padding-left: 10px; padding-right: 10px; } + .btn-navbar { + display: block; + } + .nav-collapse { + overflow: hidden; + height: 0; + } } /* @media (min-width: 1210px) { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e538be2a40..e928bb6d1e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2356,7 +2356,6 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 3px; } .navbar .brand:hover { - color: #ffffff; text-decoration: none; } .navbar .brand { diff --git a/docs/base-css.html b/docs/base-css.html index aa0ac664fc..c68391261c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/components.html b/docs/components.html index f584d90bd2..a2fac7360b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/download.html b/docs/download.html index 22feac3440..5bcce7cedc 100644 --- a/docs/download.html +++ b/docs/download.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/examples.html b/docs/examples.html index a43b5bec74..70a1a54dda 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/index.html b/docs/index.html index bb63674a89..89f5accd68 100644 --- a/docs/index.html +++ b/docs/index.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/javascript.html b/docs/javascript.html index adc73d462e..eb4a175c33 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/less.html b/docs/less.html index 165852a3f5..497a9dfe31 100644 --- a/docs/less.html +++ b/docs/less.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2b797ded79..14da044bba 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 673673dff4..7c0ab655be 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/docs/upgrading.html b/docs/upgrading.html index f1f2a4303f..c0778d9d07 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -26,42 +26,44 @@ - - + +
- + Bootstrap - +
+ +
diff --git a/less/accordion.less b/less/accordion.less index d5c00238c6..1ebd5b1a1a 100644 --- a/less/accordion.less +++ b/less/accordion.less @@ -1,5 +1,5 @@ -// COLLAPSE -// -------- +// ACCORDION +// --------- // Parent container diff --git a/less/navbar.less b/less/navbar.less index a72c0d74eb..379cbb56d9 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -43,7 +43,6 @@ .navbar { // Hover and active states .brand:hover { - color: @white; text-decoration: none; } // Website or project name @@ -286,4 +285,4 @@ left: auto; right: 13px; } -} +} \ No newline at end of file diff --git a/less/responsive.less b/less/responsive.less index cc3b2882f6..6c3102c14f 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -126,12 +126,6 @@ width: auto; margin: 0; } - - // Navbar button - .btn-navbar { - display: block; - } - } @@ -292,6 +286,15 @@ padding-left: 10px; padding-right: 10px; } + // Navbar button + .btn-navbar { + display: block; + } + + .nav-collapse { + overflow: hidden; + height: 0; + } }