From: Mark Otto <markotto@twitter.com>
Date: Sat, 24 Mar 2012 03:56:48 +0000 (-0700)
Subject: Merge branch 'bartt-master' into 2.0.3-wip
X-Git-Tag: v2.0.3~5^2~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9f03d8976710b8aa10abd5f89c0a699758ff0a0;p=thirdparty%2Fbootstrap.git

Merge branch 'bartt-master' into 2.0.3-wip

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
---

f9f03d8976710b8aa10abd5f89c0a699758ff0a0
diff --cc docs/assets/bootstrap.zip
index cd93364e47,03259655f3..954f4d3e16
Binary files differ
diff --cc docs/assets/css/bootstrap.css
index 634ea7a53b,624f599ef0..b1417228ef
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -2382,32 -2376,21 +2382,32 @@@ input[type="submit"].btn.btn-mini 
    padding-left: 12px;
    padding-right: 12px;
  }
 -.btn-group.open {
 -  *z-index: 1000;
 -}
 -.btn-group.open .dropdown-menu {
 -  display: block;
 -  margin-top: 1px;
 -  -webkit-border-radius: 5px;
 -  -moz-border-radius: 5px;
 -  border-radius: 5px;
 -}
  .btn-group.open .dropdown-toggle {
    background-image: none;
-   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-   -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
 -  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
 -  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
 -  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
++  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
++  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
++  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
 +}
 +.btn-group.open .btn.dropdown-toggle {
 +  background-color: #e6e6e6;
 +}
 +.btn-group.open .btn-primary.dropdown-toggle {
 +  background-color: #0055cc;
 +}
 +.btn-group.open .btn-warning.dropdown-toggle {
 +  background-color: #f89406;
 +}
 +.btn-group.open .btn-danger.dropdown-toggle {
 +  background-color: #bd362f;
 +}
 +.btn-group.open .btn-success.dropdown-toggle {
 +  background-color: #51a351;
 +}
 +.btn-group.open .btn-info.dropdown-toggle {
 +  background-color: #2f96b4;
 +}
 +.btn-group.open .btn-inverse.dropdown-toggle {
 +  background-color: #222222;
  }
  .btn .caret {
    margin-top: 7px;
diff --cc less/button-groups.less
index d28e5bbad9,d4006f8a0b..81961123d3
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@@ -114,40 -115,24 +115,40 @@@
  }
  
  .btn-group.open {
 -  // IE7's z-index only goes to the nearest positioned ancestor, which would
 -  // make the menu appear below buttons that appeared later on the page
 -  *z-index: @zindexDropdown;
 -
 -  // Reposition menu on open and round all corners
 -  .dropdown-menu {
 -    display: block;
 -    margin-top: 1px;
 -    .border-radius(5px);
 -  }
  
 +  // The clickable button for toggling the menu
 +  // Remove the gradient and set the same inset shadow as the :active state
    .dropdown-toggle {
      background-image: none;
-     @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-     .box-shadow(@shadow);
 -    .box-shadow(inset 0 1px 6px rgba(0,0,0,.15),
++    .box-shadow(inset 0 2px 4px rgba(0,0,0,.15),
+                 0 1px 2px rgba(0,0,0,.05));
    }
 +
 +  // Keep the hover's background when dropdown is open
 +  .btn.dropdown-toggle {
 +    background-color: @btnBackgroundHighlight;
 +  }
 +  .btn-primary.dropdown-toggle {
 +    background-color: @btnPrimaryBackgroundHighlight;
 +  }
 +  .btn-warning.dropdown-toggle {
 +    background-color: @btnWarningBackgroundHighlight;
 +  }
 +  .btn-danger.dropdown-toggle {
 +    background-color: @btnDangerBackgroundHighlight;
 +  }
 +  .btn-success.dropdown-toggle {
 +    background-color: @btnSuccessBackgroundHighlight;
 +  }
 +  .btn-info.dropdown-toggle {
 +    background-color: @btnInfoBackgroundHighlight;
 +  }
 +  .btn-inverse.dropdown-toggle {
 +    background-color: @btnInverseBackgroundHighlight;
 +  }
  }
  
 +
  // Reposition the caret
  .btn .caret {
    margin-top: 7px;