]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
utilize new dropdown variables
authorMark Otto <markotto@twitter.com>
Mon, 5 Mar 2012 08:32:02 +0000 (00:32 -0800)
committerMark Otto <markotto@twitter.com>
Mon, 5 Mar 2012 08:32:02 +0000 (00:32 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/dropdowns.less
less/variables.less

index 97f1c45550a1618b3053b494b10661794c25f689..b9db7814eba1dfe217370a563665c127dd24df0e 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index d305692bf26fe490c17f35e1e82304c7701e8a4b..96daabe21819056c9a09fd8ca955de936df4179c 100644 (file)
@@ -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;
index 12ce7c2e507d1d044f6c739565c7fb0683788fbe..1e58ebf79787d747fa20d03d7963b79ed13f49e3 100644 (file)
@@ -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
index 5bcddfb33b78abeeb965946e1b0548008465af76..c283ff052f069dc506f132add933f3e6fd986cfe 100644 (file)
@@ -74,6 +74,7 @@
 @inputDisabledBackground:       @grayLighter;
 
 // Dropdowns
+@dropdownBackground:            @white;
 @dropdownLinkColor:             @grayDark;
 @dropdownLinkColorHover:        @white;
 @dropdownLinkBackgroundHover:   @grayDark;