Reopen #9835, Closes #9832 - Hollow button disabled consistency fix

diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index c5054c74a49271a89896c0239718ace10338b7ab..b3bb7c275b3ffc1fe6be7bbd356de96e6a396420 100644 (file)
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -177,6 +177,11 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
   &:hover, &:focus {
     border-color: $color-hover;
     color: $color-hover;
+    &.disabled,
+    &[disabled] {
+      border: $border-width solid $color;
+      color: $color;
+    }
   }
 }
 
@@ -303,12 +308,31 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
       }
     }
 
+    // Disabled style
+    &.disabled,
+    &[disabled] {
+      @include button-disabled;
+
+      @each $name, $color in $button-palette {
+        &.#{$name} {
+          @include button-disabled($color, auto);
+        }
+      }
+    }
+
     // Hollow style
     @if $button-fill != hollow {
       &.hollow {
         @include button-hollow;
         @include button-hollow-style;
 
+        &.disabled,
+        &[disabled] {
+          &, &:hover, &:focus {
+            background-color: transparent;
+          }
+        }
+
         @each $name, $color in $button-palette {
           &.#{$name} {
             @include button-hollow-style($color);
@@ -331,18 +355,6 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
       }
     }
 
-    // Disabled style
-    &.disabled,
-    &[disabled] {
-      @include button-disabled;
-
-      @each $name, $color in $button-palette {
-        &.#{$name} {
-          @include button-disabled($color, auto);
-        }
-      }
-    }
-
     // Dropdown arrow
     &.dropdown {
       @include button-dropdown;