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

3 files changed, 29 insertions, 19 deletions

diff --git a/less/buttons.less b/less/buttons.less
index d35b7f901..14de3529c 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -39,7 +39,8 @@
   }
 
   &.disabled,
-  &[disabled] {
+  &[disabled],
+  fieldset[disabled] & {
     cursor: default;
     .opacity(65);
     .box-shadow(none);
@@ -138,7 +139,8 @@ input[type="button"] {
 // Make a button look and behave like a link
 .btn-link,
 .btn-link:active,
-.btn-link[disabled] {
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
   background-color: transparent;
   background-image: none;
   .box-shadow(none);
@@ -154,7 +156,12 @@ input[type="button"] {
   text-decoration: underline;
   background-color: transparent;
 }
-.btn-link[disabled]:hover {
-  color: @grayDark;
-  text-decoration: none;
+.btn-link {
+  &[disabled],
+  fieldset[disabled] & {
+    &:hover {
+      color: @grayDark;
+      text-decoration: none;
+    }
+  }
 }
diff --git a/less/forms.less b/less/forms.less
index 3c44278cc..8fa985415 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -331,21 +331,24 @@ textarea[class*="span"],
 // --------------
 
 // Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: @input-background-disabled;
+input,
+select,
+textarea {
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    background-color: @input-background-disabled;
+  }
 }
 // Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
+input[type="radio"],
+input[type="checkbox"] {
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    background-color: transparent;
+  }
 }
 
 
diff --git a/less/mixins.less b/less/mixins.less
index bdd8cf1e0..ebfce5f91 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -415,8 +415,8 @@
   &:active,
   &.active {
     color: @text-color;
-    background-position: 0 -15px;
     background-color: @background-end;
+    background-position: 0 -15px;
   }
   &:active,
   &.active {