From e106166fc6a50516cda457163198eed6dd4619de Mon Sep 17 00:00:00 2001
From: Diego Smania <diego.smania@gmail.com>
Date: Sat, 15 May 2021 16:01:08 -0300
Subject: [PATCH 1/3] [build/scss]: Fix disabled style for some buttons.

---
 build/scss/_buttons.scss            | 7 +++++++
 build/scss/mixins/_backgrounds.scss | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build/scss/_buttons.scss b/build/scss/_buttons.scss
index 4bb2b7e51..22136d945 100644
--- a/build/scss/_buttons.scss
+++ b/build/scss/_buttons.scss
@@ -53,6 +53,13 @@
     background-color: darken($button-default-background-color, 5%);
     color: darken($button-default-color, 10%);
   }
+
+  &.disabled,
+  &:disabled {
+    color: $button-default-color;
+    background-color: $button-default-background-color;
+    border-color: $button-default-border-color;
+  }
 }
 
 // Application buttons
diff --git a/build/scss/mixins/_backgrounds.scss b/build/scss/mixins/_backgrounds.scss
index 2a5fd4a47..7cbc93d24 100644
--- a/build/scss/mixins/_backgrounds.scss
+++ b/build/scss/mixins/_backgrounds.scss
@@ -37,8 +37,6 @@
     color: color-yiq($color);
 
     &.btn {
-      &.disabled,
-      &:disabled,
       &:not(:disabled):not(.disabled):active,
       &:not(:disabled):not(.disabled).active,
       .show > &.dropdown-toggle {
@@ -59,6 +57,13 @@
         border-color: darken($color, 12.5%);
         color: color-yiq(darken($color, 10%));
       }
+
+      &:disabled,
+      &.disabled {
+        background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important;
+        background-image: none !important;
+        color: color-yiq($color);
+      }
     }
   }
 }

From 2aa1da0db371af74925b029b5d05096c1eae0710 Mon Sep 17 00:00:00 2001
From: Diego Smania <diego.smania@gmail.com>
Date: Sun, 16 May 2021 12:23:38 -0300
Subject: [PATCH 2/3] Add some fixes

---
 build/scss/_buttons.scss            | 1 -
 build/scss/mixins/_backgrounds.scss | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/scss/_buttons.scss b/build/scss/_buttons.scss
index 22136d945..049f78b7a 100644
--- a/build/scss/_buttons.scss
+++ b/build/scss/_buttons.scss
@@ -58,7 +58,6 @@
   &:disabled {
     color: $button-default-color;
     background-color: $button-default-background-color;
-    border-color: $button-default-border-color;
   }
 }
 
diff --git a/build/scss/mixins/_backgrounds.scss b/build/scss/mixins/_backgrounds.scss
index 7cbc93d24..a60bd31d1 100644
--- a/build/scss/mixins/_backgrounds.scss
+++ b/build/scss/mixins/_backgrounds.scss
@@ -60,9 +60,8 @@
 
       &:disabled,
       &.disabled {
-        background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important;
         background-image: none !important;
-        color: color-yiq($color);
+        border-color: $color;
       }
     }
   }

From e15678486756c24320a1305cc1247374cfe9fdb3 Mon Sep 17 00:00:00 2001
From: Diego Smania <diego.smania@gmail.com>
Date: Sat, 12 Jun 2021 12:13:59 -0300
Subject: [PATCH 3/3] [Gradient Buttons]: Fix to keep font color on hover
 event.

---
 build/scss/mixins/_backgrounds.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/scss/mixins/_backgrounds.scss b/build/scss/mixins/_backgrounds.scss
index a60bd31d1..bf30734a6 100644
--- a/build/scss/mixins/_backgrounds.scss
+++ b/build/scss/mixins/_backgrounds.scss
@@ -62,6 +62,7 @@
       &.disabled {
         background-image: none !important;
         border-color: $color;
+        color: color-yiq($color);
       }
     }
   }