From fbbcde385684f5b4afc5b91317ebbacb0d31b8f2 Mon Sep 17 00:00:00 2001 From: Brian Andrews Date: Fri, 15 Mar 2019 20:17:17 -0600 Subject: [PATCH 1/2] Fix button isDefault isBusy hover --- packages/components/src/button/style.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss index 0f49a9625519b..45340a919fd45 100644 --- a/packages/components/src/button/style.scss +++ b/packages/components/src/button/style.scss @@ -60,6 +60,15 @@ text-shadow: 0 1px 0 #fff; transform: none; } + + &.is-busy, + &.is-busy:disabled, + &.is-busy[aria-disabled="true"] { + animation: components-button__busy-animation 2500ms infinite linear; + background-size: 100px 100%; + background-image: repeating-linear-gradient(-45deg, $light-gray-500, $white 11px, $white 10px, $light-gray-500 20px); + opacity: 1; + } } &.is-primary { From fc3367cbacc6ef5e9098743f213bc917f0d1b1df Mon Sep 17 00:00:00 2001 From: Brian Andrews Date: Wed, 3 Apr 2019 09:57:22 -0600 Subject: [PATCH 2/2] Use existing code to prevent duplication --- packages/components/src/button/style.scss | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss index 45340a919fd45..b424745cb0556 100644 --- a/packages/components/src/button/style.scss +++ b/packages/components/src/button/style.scss @@ -60,15 +60,6 @@ text-shadow: 0 1px 0 #fff; transform: none; } - - &.is-busy, - &.is-busy:disabled, - &.is-busy[aria-disabled="true"] { - animation: components-button__busy-animation 2500ms infinite linear; - background-size: 100px 100%; - background-image: repeating-linear-gradient(-45deg, $light-gray-500, $white 11px, $white 10px, $light-gray-500 20px); - opacity: 1; - } } &.is-primary { @@ -184,7 +175,10 @@ @include button-style__focus-active; } - &.is-busy { + &.is-busy, + &.is-default.is-busy, + &.is-default.is-busy:disabled, + &.is-default.is-busy[aria-disabled="true"] { animation: components-button__busy-animation 2500ms infinite linear; background-size: 100px 100%; background-image: repeating-linear-gradient(-45deg, $light-gray-500, $white 11px, $white 10px, $light-gray-500 20px);