Ensure active button styles are not applied to disabled buttons

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index d69c159983286542445003f0e30843b438e24898..72fc5f34062afa63631ed04d61d3740cfb2e37d4 100644 (file)
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -32,8 +32,8 @@
     @include box-shadow(none);
   }
 
-  &:active,
-  &.active {
+  &:not([disabled]):not(.disabled):active,
+  &:not([disabled]):not(.disabled).active {
     background-image: none;
     @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
   }

diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 44ce4f72e264b97535cf10163e822959e2294d62..7ce8fef5f3ad3c5b44527d6a36ac14b10732f306 100644 (file)
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -32,8 +32,8 @@
     border-color: $border;
   }
 
-  &:active,
-  &.active,
+  &:not([disabled]):not(.disabled):active,
+  &:not([disabled]):not(.disabled).active,
   .show > &.dropdown-toggle {
     background-color: $active-background;
     background-image: none; // Remove the gradient for the pressed/active state
@@ -65,8 +65,8 @@
     background-color: transparent;
   }
 
-  &:active,
-  &.active,
+  &:not([disabled]):not(.disabled):active,
+  &:not([disabled]):not(.disabled).active,
   .show > &.dropdown-toggle {
     color: $color-hover;
     background-color: $color;