From 7fe64165f031baff400654e81ed9e936f440a8c7 Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Wed, 5 Oct 2022 23:47:00 -0700 Subject: [PATCH 1/5] feat(ButtonBase): clockface 4 colors --- src/Components/Button/Button.scss | 4 ++-- src/Styles/variables.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Button/Button.scss b/src/Components/Button/Button.scss index 12a9298a5..db2ee89d6 100644 --- a/src/Components/Button/Button.scss +++ b/src/Components/Button/Button.scss @@ -222,7 +222,7 @@ .cf-button-primary, .cf-button-success { - @include buttonColorModifier($c-pool, $c-pulsar, $cf-white, $cf-white); + @include buttonColorModifier($cf-turquoise, $cf-turquoise, $cf-grey-1, $cf-grey-1); } .cf-button-tertiary { @@ -237,7 +237,7 @@ .cf-button-warning, .cf-button-danger { - @include buttonColorModifier($c-ruby, $c-topaz, $cf-white, $cf-white); + @include buttonColorModifier($cf-carnation, $cf-carnation, $cf-grey-1, $cf-grey-1); } .cf-button-colorless { diff --git a/src/Styles/variables.scss b/src/Styles/variables.scss index 990840a39..43bf4dd78 100644 --- a/src/Styles/variables.scss +++ b/src/Styles/variables.scss @@ -289,7 +289,7 @@ $cf-form-lg-font: #{var(--step-1)}; ----------------------------------------------------------------------------- */ -$cf-button-default-bg: $cf-grey-25; +$cf-button-default-bg: $cf-grey-3; /* Empty State From a3bf60965835d341426ef0ef1f3cf0ba12352bdb Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Wed, 5 Oct 2022 23:52:21 -0700 Subject: [PATCH 2/5] fix: dismiss button styles --- src/Components/Button/Composed/DismissButton.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Button/Composed/DismissButton.scss b/src/Components/Button/Composed/DismissButton.scss index 6bba74b62..707c20934 100644 --- a/src/Components/Button/Composed/DismissButton.scss +++ b/src/Components/Button/Composed/DismissButton.scss @@ -27,7 +27,7 @@ button.cf-dismiss-button { display: block; width: $cf-space-xs; height: $cf-border; - background-color: $g20-white; + background-color: $cf-grey-1; border-radius: $cf-border * 1.5 * 0.5; top: 50%; left: 50%; From cf7deeb9df94c812713ce79c55c483871fa3dbfb Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Wed, 5 Oct 2022 23:58:27 -0700 Subject: [PATCH 3/5] feat: focus shadow --- src/Styles/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Styles/variables.scss b/src/Styles/variables.scss index 43bf4dd78..f493922d9 100644 --- a/src/Styles/variables.scss +++ b/src/Styles/variables.scss @@ -630,7 +630,7 @@ $cf-scrollbar-offset: 3px; @mixin panel-shadow { box-shadow: 0 1px 4px 1px rgba($g0-obsidian, 0.2); } -@mixin focus-shadow($color: $c-pool) { +@mixin focus-shadow($color: $cf-turquoise) { box-shadow: inset 0 0 0 $cf-border rgba($color, 0.75), 0px 0px ($cf-border * 2) $color; } From 7e7a29ff847e274d11abb428147713e75dfdf52e Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Thu, 6 Oct 2022 00:10:06 -0700 Subject: [PATCH 4/5] fix: focus glow for danger button --- src/Components/Button/Button.scss | 4 ++++ src/Styles/variables.scss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/Button/Button.scss b/src/Components/Button/Button.scss index db2ee89d6..6a5d64f28 100644 --- a/src/Components/Button/Button.scss +++ b/src/Components/Button/Button.scss @@ -238,6 +238,10 @@ .cf-button-warning, .cf-button-danger { @include buttonColorModifier($cf-carnation, $cf-carnation, $cf-grey-1, $cf-grey-1); + + &:focus{ + @include focus-shadow($cf-carnation) + } } .cf-button-colorless { diff --git a/src/Styles/variables.scss b/src/Styles/variables.scss index f493922d9..7bea2a951 100644 --- a/src/Styles/variables.scss +++ b/src/Styles/variables.scss @@ -634,7 +634,7 @@ $cf-scrollbar-offset: 3px; box-shadow: inset 0 0 0 $cf-border rgba($color, 0.75), 0px 0px ($cf-border * 2) $color; } -@mixin focus-glow($color: $c-pool) { +@mixin focus-glow($color: $cf-turquoise) { box-shadow: 0px 0px ($cf-border * 2) $color; } From 3ec71f61e369aa339d7d5d4006eed8ac89bd5a7c Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Thu, 6 Oct 2022 00:17:10 -0700 Subject: [PATCH 5/5] fix: link button colors --- src/Components/Button/Composed/LinkButton.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Components/Button/Composed/LinkButton.scss b/src/Components/Button/Composed/LinkButton.scss index e24872d25..326b8cce1 100644 --- a/src/Components/Button/Composed/LinkButton.scss +++ b/src/Components/Button/Composed/LinkButton.scss @@ -12,4 +12,9 @@ a:active { &.cf-button { color: $cf-white; } + &.cf-button-success, + &.cf-button-danger, + &.cf-button-primary { + color: $cf-grey-1; + } }