From: Mark Otto <otto@github.com>
Date: Thu, 20 Dec 2012 07:18:02 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3... 
X-Git-Tag: v3.0.0-rc1~836^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09dde5c84ab890404703c95f704978f5cf88fa2b;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/mixins.less
---

09dde5c84ab890404703c95f704978f5cf88fa2b
diff --cc docs/assets/css/bootstrap.css
index e8c2b1fc20,06384d3649..83fec25aeb
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -2583,8 -2818,10 +2588,9 @@@ button.close 
  }
  
  .btn.disabled,
- .btn[disabled] {
+ .btn[disabled],
+ fieldset[disabled] .btn {
    cursor: default;
 -  background-image: none;
    opacity: 0.65;
    filter: alpha(opacity=65);
    -webkit-box-shadow: none;
diff --cc less/buttons.less
index d35b7f9011,4af87c5798..14de3529ca
--- a/less/buttons.less
+++ b/less/buttons.less
@@@ -27,20 -38,20 +27,21 @@@
      .tab-focus();
    }
  
 -  // Active state
 -  &.active,
 -  &:active {
 -    background-image: none;
 +  &:hover {
 +    text-decoration: none;
 +  }
 +
 +  &:active,
 +  &.active {
      outline: 0;
 -    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
 +    background-image: none;
 +    .box-shadow(~"inset 0 3px 5px rgba(0,0,0,.15), 0 1px 0 rgba(255,255,255,.1)");
    }
  
 -  // Disabled state
    &.disabled,
-   &[disabled] {
+   &[disabled],
+   fieldset[disabled] & {
      cursor: default;
 -    background-image: none;
      .opacity(65);
      .box-shadow(none);
    }
diff --cc less/mixins.less
index bdd8cf1e04,5e323cc3ea..ebfce5f912
--- a/less/mixins.less
+++ b/less/mixins.less
@@@ -405,22 -407,24 +405,22 @@@
  
  // Button backgrounds
  // ------------------
 -.buttonBackground(@startColor, @endColor, @text-color: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
 +.buttonBackground(@background-start, @background-end, @text-color: #fff, @text-shadow: 0 -1px 0 rgba(0,0,0,.25)) {
    color: @text-color;
 -  text-shadow: @textShadow;
 -  #gradient > .vertical(@startColor, @endColor);
 -  border-color: @endColor @endColor darken(@endColor, 15%);
 -  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
 -  .reset-filter();
 -
 -  // in these cases the gradient won't cover the background, so we override
 -  &:hover, &:active, &.active, &.disabled, &[disabled], fieldset[disabled] & {
 +  text-shadow: @text-shadow;
 +  #gradient > .vertical(@background-start, @background-end);
 +  border-color: darken(@background-end, 5%);
 +
 +  &:hover,
 +  &:active,
 +  &.active {
      color: @text-color;
-     background-position: 0 -15px;
 -    background-color: @endColor;
 +    background-color: @background-end;
++    background-position: 0 -15px;
    }
 -
 -  // IE8 can't handle box-shadow to show active, so we darken a bit ourselves
    &:active,
    &.active {
 -    background-color: darken(@endColor, 10%) e("\9");
 +    background-image: none;
    }
  }