diff options
| author | Mark Otto <[email protected]> | 2012-03-05 00:32:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-05 00:32:02 -0800 |
| commit | a95c15a5307bd5c0028eaad51a4ceddc5498e436 (patch) | |
| tree | 20ef2428cc8dd3bce906e92e8df69f87e865f965 | |
| parent | d3e922f0c8dc309bc609ebd75fd7e90134c1eaca (diff) | |
| download | bootstrap-a95c15a5307bd5c0028eaad51a4ceddc5498e436.tar.xz bootstrap-a95c15a5307bd5c0028eaad51a4ceddc5498e436.zip | |
utilize new dropdown variables
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 54818 -> 9620 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/dropdowns.less | 8 | ||||
| -rw-r--r-- | less/variables.less | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 97f1c4555..b9db7814e 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d305692bf..96daabe21 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1712,13 +1712,13 @@ table .span24 { clear: both; font-weight: normal; line-height: 18px; - color: #555555; + color: #333333; white-space: nowrap; } .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; - background-color: #0088cc; + background-color: #333333; } .dropdown.open { *z-index: 1000; diff --git a/less/dropdowns.less b/less/dropdowns.less index 12ce7c2e5..1e58ebf79 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -54,7 +54,7 @@ padding: 4px 0; margin: 0; // override default ul list-style: none; - background-color: @white; + background-color: @dropdownBackground; border-color: #ccc; border-color: rgba(0,0,0,.2); border-style: solid; @@ -85,7 +85,7 @@ clear: both; font-weight: normal; line-height: @baseLineHeight; - color: @gray; + color: @dropdownLinkColor; white-space: nowrap; } } @@ -95,9 +95,9 @@ .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: @white; + color: @dropdownLinkColorHover; text-decoration: none; - background-color: @linkColor; + background-color: @dropdownLinkBackgroundHover; } // Open state for the dropdown diff --git a/less/variables.less b/less/variables.less index 5bcddfb33..c283ff052 100644 --- a/less/variables.less +++ b/less/variables.less @@ -74,6 +74,7 @@ @inputDisabledBackground: @grayLighter; // Dropdowns +@dropdownBackground: @white; @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; @dropdownLinkBackgroundHover: @grayDark; |