From e2f8e1645a60ffaff9e48402222c409603e5f14f Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Mon, 10 Feb 2020 13:54:38 -0800 Subject: [PATCH 1/3] fix(button): update icon only ghost button colors --- packages/components/src/components/button/_button.scss | 7 +++++++ packages/react/src/components/Button/Button-story.js | 1 + 2 files changed, 8 insertions(+) diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss index b13a0867d8f3..0dfac8e3d979 100644 --- a/packages/components/src/components/button/_button.scss +++ b/packages/components/src/components/button/_button.scss @@ -206,6 +206,13 @@ } } + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only + .#{$prefix}--btn__icon + path, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only .#{$prefix}--btn__icon { + fill: $icon-01; + } + .#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary { padding-left: rem(15px); padding-right: rem(15px); diff --git a/packages/react/src/components/Button/Button-story.js b/packages/react/src/components/Button/Button-story.js index 8260f1bf0896..bc35f1b3d6da 100644 --- a/packages/react/src/components/Button/Button-story.js +++ b/packages/react/src/components/Button/Button-story.js @@ -71,6 +71,7 @@ const props = { 'Primary button (primary)': 'primary', 'Secondary button (secondary)': 'secondary', 'Tertiary button (tertiary)': 'tertiary', + 'Ghost button (ghost)': 'ghost', }, 'primary' ), From f8e77ad896a8f3f1078b0be977269a10d0f3af3c Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Tue, 11 Feb 2020 08:27:45 -0800 Subject: [PATCH 2/3] fix(ghost-button): update disabled state behavior --- .../src/components/button/_button.scss | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss index 0dfac8e3d979..9c8bdbaa1d5d 100644 --- a/packages/components/src/components/button/_button.scss +++ b/packages/components/src/components/button/_button.scss @@ -213,6 +213,25 @@ fill: $icon-01; } + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--btn__icon + path, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--btn__icon { + fill: $disabled-02; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] { + background: $disabled-01; + cursor: not-allowed; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--assistive-text, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled]::before { + display: none; + } + .#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary { padding-left: rem(15px); padding-right: rem(15px); From 44e9e5fc57ba10cca06e3ff635b3289b8ba6b766 Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Tue, 11 Feb 2020 15:48:21 -0800 Subject: [PATCH 3/3] fix(button): remove background when disabled --- packages/components/src/components/button/_button.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss index 9c8bdbaa1d5d..ffa7957e0d9d 100644 --- a/packages/components/src/components/button/_button.scss +++ b/packages/components/src/components/button/_button.scss @@ -222,7 +222,6 @@ } .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] { - background: $disabled-01; cursor: not-allowed; }