From d0882c580de1fc2d5c52b684671b554bb8941ddf Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 6 Sep 2011 21:54:00 -0700
Subject: first pass at enabling active states in dropdowns in topbar and
 fixing the bug of having an active class on parent dropdown

---
 bootstrap-1.2.0.css | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'bootstrap-1.2.0.css')

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 4055d4ca9..6856537f8 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Sep  4 14:02:46 PDT 2011
+ * Date: Tue Sep  6 21:46:15 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1192,7 +1192,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #bfbfbf;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
-.topbar a:hover, .topbar ul .active a {
+.topbar a:hover, .topbar ul .active > a {
   background-color: #333;
   background-color: rgba(255, 255, 255, 0.05);
   color: #ffffff;
@@ -1310,7 +1310,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #fff;
   text-decoration: none;
 }
-.topbar div > ul .active a, .nav .active a {
+.topbar div > ul .active > a, .nav .active > a {
   background-color: #222;
   background-color: rgba(0, 0, 0, 0.5);
 }
@@ -1386,6 +1386,12 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
   color: #fff;
 }
+.topbar div > ul .menu-dropdown .active a,
+.nav .menu-dropdown .active a,
+.topbar div > ul .dropdown-menu .active a,
+.nav .dropdown-menu .active a {
+  color: #fff;
+}
 .topbar div > ul .menu-dropdown .divider,
 .nav .menu-dropdown .divider,
 .topbar div > ul .dropdown-menu .divider,
@@ -1559,6 +1565,9 @@ a.menu:after, .dropdown-toggle:after {
   margin-top: 15px;
   margin-left: 5px;
 }
+.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle {
+  border-color: #999;
+}
 .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
   border-top-color: #555;
 }
-- 
cgit v1.2.3