From: Mark Otto <otto@github.com>
Date: Thu, 20 Dec 2012 21:47:36 +0000 (-0800)
Subject: Merge branch '2.3.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~836^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5e04c0799b64421f413321c29455e93187ad35a;p=thirdparty%2Fbootstrap.git

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
---

a5e04c0799b64421f413321c29455e93187ad35a
diff --cc docs/assets/css/bootstrap.css
index de8369d708,785d989c15..07f737734d
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -2352,11 -2936,11 +2352,11 @@@ table th[class*="span"] 
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
  }
  
- .dropdown-menu .active > a,
- .dropdown-menu .active > a:hover {
+ .dropdown-menu > .active > a,
+ .dropdown-menu > .active > a:hover {
    color: #ffffff;
    text-decoration: none;
 -  background-color: #0081c2;
 +  background-color: #0077b3;
    background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
    background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
diff --cc less/dropdowns.less
index 93fb5e11ca,a0d4b1fd0c..312d632ced
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -86,12 -95,12 +86,12 @@@
  
  // Active state
  // ------------
- .dropdown-menu .active > a,
- .dropdown-menu .active > a:hover {
+ .dropdown-menu > .active > a,
+ .dropdown-menu > .active > a:hover {
 -  color: @dropdownLinkColorActive;
 +  color: @dropdown-link-color-active;
    text-decoration: none;
    outline: 0;
 -  #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
 +  #gradient > .vertical(@dropdown-link-background-active, darken(@dropdown-link-background-active, 5%));
  }
  
  // Disabled state