]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
IE8 compatible fix for disabled button hover 6639/head
authorVickash Mahabir <vickashmahabir@gmail.com>
Sat, 19 Jan 2013 23:32:55 +0000 (19:32 -0400)
committerVickash Mahabir <vickashmahabir@gmail.com>
Sat, 19 Jan 2013 23:32:55 +0000 (19:32 -0400)
docs/assets/css/bootstrap.css
less/buttons.less

index 5028c913ab0ff426ed0e7d3073a7fe5c1d6316c3..c1357a79c1012c1da471a84260df922ed5a5e5b5 100644 (file)
@@ -1661,91 +1661,151 @@ input[type="button"].btn-block {
   border-color: #a7a9aa;
 }
 
-fieldset:not([disabled]) .btn:not([disabled]):not(.disabled):hover,
-.btn:not([disabled]):not(.disabled):hover,
-fieldset:not([disabled]) .btn:not([disabled]):not(.disabled):focus,
-.btn:not([disabled]):not(.disabled):focus,
-fieldset:not([disabled]) .btn:not([disabled]):not(.disabled):active,
-.btn:not([disabled]):not(.disabled):active {
+.btn:hover,
+.btn:focus,
+.btn:active {
   background-color: #9a9c9d;
   border-color: #8d9091;
 }
 
+.btn.disabled:hover,
+.btn[disabled]:hover,
+fieldset[disabled] .btn:hover,
+.btn.disabled:focus,
+.btn[disabled]:focus,
+fieldset[disabled] .btn:focus,
+.btn.disabled:active,
+.btn[disabled]:active,
+fieldset[disabled] .btn:active {
+  background-color: #a7a9aa;
+  border-color: #a7a9aa;
+}
+
 .btn-primary {
   background-color: #428bca;
   border-color: #428bca;
 }
 
-fieldset:not([disabled]) .btn-primary:not([disabled]):not(.disabled):hover,
-.btn-primary:not([disabled]):not(.disabled):hover,
-fieldset:not([disabled]) .btn-primary:not([disabled]):not(.disabled):focus,
-.btn-primary:not([disabled]):not(.disabled):focus,
-fieldset:not([disabled]) .btn-primary:not([disabled]):not(.disabled):active,
-.btn-primary:not([disabled]):not(.disabled):active {
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active {
   background-color: #357ebd;
   border-color: #3071a9;
 }
 
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active {
+  background-color: #428bca;
+  border-color: #428bca;
+}
+
 .btn-warning {
   background-color: #f0ad4e;
   border-color: #f0ad4e;
 }
 
-fieldset:not([disabled]) .btn-warning:not([disabled]):not(.disabled):hover,
-.btn-warning:not([disabled]):not(.disabled):hover,
-fieldset:not([disabled]) .btn-warning:not([disabled]):not(.disabled):focus,
-.btn-warning:not([disabled]):not(.disabled):focus,
-fieldset:not([disabled]) .btn-warning:not([disabled]):not(.disabled):active,
-.btn-warning:not([disabled]):not(.disabled):active {
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active {
   background-color: #eea236;
   border-color: #ec971f;
 }
 
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active {
+  background-color: #f0ad4e;
+  border-color: #f0ad4e;
+}
+
 .btn-danger {
   background-color: #d9534f;
   border-color: #d9534f;
 }
 
-fieldset:not([disabled]) .btn-danger:not([disabled]):not(.disabled):hover,
-.btn-danger:not([disabled]):not(.disabled):hover,
-fieldset:not([disabled]) .btn-danger:not([disabled]):not(.disabled):focus,
-.btn-danger:not([disabled]):not(.disabled):focus,
-fieldset:not([disabled]) .btn-danger:not([disabled]):not(.disabled):active,
-.btn-danger:not([disabled]):not(.disabled):active {
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active {
   background-color: #d43f3a;
   border-color: #c9302c;
 }
 
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active {
+  background-color: #d9534f;
+  border-color: #d9534f;
+}
+
 .btn-success {
   background-color: #5cb85c;
   border-color: #5cb85c;
 }
 
-fieldset:not([disabled]) .btn-success:not([disabled]):not(.disabled):hover,
-.btn-success:not([disabled]):not(.disabled):hover,
-fieldset:not([disabled]) .btn-success:not([disabled]):not(.disabled):focus,
-.btn-success:not([disabled]):not(.disabled):focus,
-fieldset:not([disabled]) .btn-success:not([disabled]):not(.disabled):active,
-.btn-success:not([disabled]):not(.disabled):active {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active {
   background-color: #4cae4c;
   border-color: #449d44;
 }
 
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active {
+  background-color: #5cb85c;
+  border-color: #5cb85c;
+}
+
 .btn-info {
   background-color: #5bc0de;
   border-color: #5bc0de;
 }
 
-fieldset:not([disabled]) .btn-info:not([disabled]):not(.disabled):hover,
-.btn-info:not([disabled]):not(.disabled):hover,
-fieldset:not([disabled]) .btn-info:not([disabled]):not(.disabled):focus,
-.btn-info:not([disabled]):not(.disabled):focus,
-fieldset:not([disabled]) .btn-info:not([disabled]):not(.disabled):active,
-.btn-info:not([disabled]):not(.disabled):active {
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active {
   background-color: #46b8da;
   border-color: #31b0d5;
 }
 
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active {
+  background-color: #5bc0de;
+  border-color: #5bc0de;
+}
+
 .btn-link,
 .btn-link:active,
 .btn-link[disabled],
index 16ddbad2d5c2fae3ec554735a5341fb89fb6b5af..5f5955bc1663605d9713ca486288e4a67fa37b26 100644 (file)
@@ -111,13 +111,21 @@ input[type="button"] {
 
 // Mixin for darkening only enabled buttons for link states
 .darken-button-states (@background, @border) {
-  fieldset:not([disabled]) &:not([disabled]):not(.disabled),
-  &:not([disabled]):not(.disabled) {
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: darken(@background, 5%);
+        border-color: darken(@border, 10%);
+  }
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
     &:hover,
     &:focus,
     &:active {
-      background-color: darken(@background, 5%);
-          border-color: darken(@border, 10%);
+      background-color: @background;
+          border-color: @border
     }
   }
 }