From: Mark Otto <otto@github.com>
Date: Wed, 1 Jan 2014 20:27:09 +0000 (-0800)
Subject: Merge branch 'master' into docs_derp
X-Git-Tag: v3.1.0~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70459c1454d2d4d1df87e59c9dfa359c92b310bb;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into docs_derp

Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
---

70459c1454d2d4d1df87e59c9dfa359c92b310bb
diff --cc docs/assets/css/docs.css
index d722e7e022,58e6fa64ad..e129838071
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@@ -115,26 -88,35 +115,31 @@@ body 
   */
  
  .bs-docs-nav {
 -  text-shadow: 0 -1px 0 rgba(0,0,0,.15);
 -  background-color: #563d7c;
 -  border-color: #463265;
 -  box-shadow: 0 1px 0 rgba(255,255,255,.1);
 -}
 -.bs-docs-nav .navbar-collapse {
 -  border-color: #463265;
 -}
 -.bs-docs-nav .navbar-brand {
 -  color: #fff;
 +  background-color: #fff;
 +  border-color: #e5e5e5;
 +  box-shadow: 0 0 10px rgba(0,0,0,.05);
  }
 +.bs-docs-nav .navbar-brand,
  .bs-docs-nav .navbar-nav > li > a {
 -  color: #cdbfe3;
 -}
 -.bs-docs-nav .navbar-nav > li > a:hover {
 -  color: #fff;
 +  color: #563d7c;
 +  font-weight: 500;
  }
 +.bs-docs-nav .navbar-nav > li > a:hover,
  .bs-docs-nav .navbar-nav > .active > a,
  .bs-docs-nav .navbar-nav > .active > a:hover {
 -  color: #fff;
 -  background-color: #463265;
 +  color: #463265;
 +  background-color: #f9f9f9;
 +}
 +.bs-docs-nav .navbar-toggle .icon-bar {
 +  background-color: #563d7c;
  }
- .bs-docs-nav .navbar-toggle:hover {
+ .bs-docs-nav .navbar-header .navbar-toggle {
 -  border-color: #563d7c;
++  border-color: #fff;
+ }
+ .bs-docs-nav .navbar-header .navbar-toggle:hover,
+ .bs-docs-nav .navbar-header .navbar-toggle:focus {
 -  background-color: #463265;
 -  border-color: #463265;
 +  background-color: #f9f9f9;
++  border-color: #f9f9f9;
  }