From 9df832b4bb81d80fd02b4fe6cc9ea826b0b0454e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 19 Jun 2012 19:17:42 -0700
Subject: [PATCH] add separate vars for dropdown link hover and active states

---
 docs/assets/css/bootstrap.css      |  7 ++++++-
 docs/less.html                     |  8 ++++++++
 docs/templates/pages/less.mustache |  8 ++++++++
 less/dropdowns.less                | 11 +++++++++--
 less/variables.less                | 11 ++++++++---
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d957e861a3..1726c41cb3 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2457,7 +2457,12 @@ table .span24 {
 }
 
 .dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
+.dropdown-menu li > a:focus {
+  color: #333333;
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: #ffffff;
diff --git a/docs/less.html b/docs/less.html
index 7b6183b6e7..68f3a83b76 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -594,8 +594,16 @@
         <td><code>@dropdownLinkColorHover</code></td>
         <td><code>@white</code></td>
       </tr>
+      <tr>
+        <td><code>@dropdownLinkColorActive</code></td>
+        <td><code>@linkColor</code></td>
+      </tr>
       <tr>
         <td><code>@dropdownLinkBackgroundHover</code></td>
+        <td><code>@grayLighter</code></td>
+      </tr>
+      <tr>
+        <td><code>@dropdownLinkBackgroundActive</code></td>
         <td><code>@linkColor</code></td>
       </tr>
       <tr>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index be8adb7661..ccd829963c 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -517,8 +517,16 @@
         <td><code>@dropdownLinkColorHover</code></td>
         <td><code>@white</code></td>
       </tr>
+      <tr>
+        <td><code>@dropdownLinkColorActive</code></td>
+        <td><code>@linkColor</code></td>
+      </tr>
       <tr>
         <td><code>@dropdownLinkBackgroundHover</code></td>
+        <td><code>@grayLighter</code></td>
+      </tr>
+      <tr>
+        <td><code>@dropdownLinkBackgroundActive</code></td>
         <td><code>@linkColor</code></td>
       </tr>
       <tr>
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 648a9f2462..bd2dab772d 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -94,12 +94,19 @@
 // Hover state
 // -----------
 .dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
+.dropdown-menu li > a:focus {
+  text-decoration: none;
+  color: @dropdownLinkColorActive;
+  background-color: @dropdownLinkBackgroundHover;
+}
+
+// Active state
+// ------------
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: @dropdownLinkColorHover;
   text-decoration: none;
-  background-color: @dropdownLinkBackgroundHover;
+  background-color: @dropdownLinkBackgroundActive;
   outline: 0;
 }
 
diff --git a/less/variables.less b/less/variables.less
index b931d3d2a2..ee7350ec23 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -104,12 +104,17 @@
 // -------------------------
 @dropdownBackground:            @white;
 @dropdownBorder:                rgba(0,0,0,.2);
-@dropdownLinkColor:             @grayDark;
-@dropdownLinkColorHover:        @white;
-@dropdownLinkBackgroundHover:   @linkColor;
 @dropdownDividerTop:            #e5e5e5;
 @dropdownDividerBottom:         @white;
 
+@dropdownLinkColor:             @grayDark;
+
+@dropdownLinkColorHover:        @white;
+@dropdownLinkBackgroundHover:   @grayLighter;
+
+@dropdownLinkColorActive:       @dropdownLinkColor;
+@dropdownLinkBackgroundActive:  @linkColor;
+
 
 
 // COMPONENT VARIABLES