diff options
| author | Mark Otto <[email protected]> | 2012-06-19 19:17:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-19 19:17:42 -0700 |
| commit | 9df832b4bb81d80fd02b4fe6cc9ea826b0b0454e (patch) | |
| tree | 4b4bd45b27b02c922a602e60dd5c5df8487a90ff | |
| parent | 40298ddbf1c26e2c9b7f67a39eeb35734417cc7e (diff) | |
| download | bootstrap-9df832b4bb81d80fd02b4fe6cc9ea826b0b0454e.tar.xz bootstrap-9df832b4bb81d80fd02b4fe6cc9ea826b0b0454e.zip | |
add separate vars for dropdown link hover and active states
| -rw-r--r-- | docs/assets/css/bootstrap.css | 7 | ||||
| -rw-r--r-- | docs/less.html | 8 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 8 | ||||
| -rw-r--r-- | less/dropdowns.less | 11 | ||||
| -rw-r--r-- | 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 d957e861a..1726c41cb 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 7b6183b6e..68f3a83b7 100644 --- a/docs/less.html +++ b/docs/less.html @@ -595,7 +595,15 @@ <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 be8adb766..ccd829963 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -518,7 +518,15 @@ <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 648a9f246..bd2dab772 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 b931d3d2a..ee7350ec2 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 |