From: Mark Otto <markotto@twitter.com>
Date: Fri, 17 Aug 2012 18:22:45 +0000 (-0700)
Subject: fixes #4416 in a different way: scope active state of navbar links to just the immedi... 
X-Git-Tag: v2.1.0~2^2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ded21ebc91ee155b8196155fc9598a51be8fb55e;p=thirdparty%2Fbootstrap.git

fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index efc2e5915a..27b4f6e6c8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4220,9 +4220,9 @@ input[type="submit"].btn.btn-mini {
   background-color: transparent;
 }
 
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover,
-.navbar .nav .active > a:focus {
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
   color: #555555;
   text-decoration: none;
   background-color: #e5e5e5;
diff --git a/less/navbar.less b/less/navbar.less
index fc8f782dbd..f97afa6979 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -225,9 +225,9 @@
 }
 
 // Active nav items
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover,
-.navbar .nav .active > a:focus {
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
   color: @navbarLinkColorActive;
   text-decoration: none;
   background-color: @navbarLinkBackgroundActive;