From: Prateek Goel <prateekgoel@users.noreply.github.com>
Date: Mon, 9 Oct 2017 22:32:48 +0000 (+0100)
Subject: Ensure active button styles are not applied to disabled buttons
X-Git-Tag: v4.0.0-beta.2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de3973b5e74058e37fd15fecc4cb7b9fd3409def;p=thirdparty%2Fbootstrap.git

Ensure active button styles are not applied to disabled buttons
---

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index d69c159983..72fc5f3406 100644
--- 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 44ce4f72e2..7ce8fef5f3 100644
--- 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;