From 2e51041710ebbab6711eab347e16a213cb9f4326 Mon Sep 17 00:00:00 2001 From: William Kelso Date: Thu, 22 May 2025 16:24:12 -0400 Subject: [PATCH 1/4] add basic styles for destructive buttons --- lib/Styles/Granite/_classes.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Styles/Granite/_classes.scss b/lib/Styles/Granite/_classes.scss index eaf129810..119ed690e 100644 --- a/lib/Styles/Granite/_classes.scss +++ b/lib/Styles/Granite/_classes.scss @@ -48,3 +48,7 @@ paper { font-family: monospace; } +.destructive { + background-color: $STRAWBERRY_300; + text-shadow: none; +} From f6bb826efaf0801771de6e847be73f7a8e72d5fd Mon Sep 17 00:00:00 2001 From: William Kelso Date: Fri, 23 May 2025 14:27:07 -0400 Subject: [PATCH 2/4] use error color and add actvie --- lib/Styles/Granite/_classes.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Styles/Granite/_classes.scss b/lib/Styles/Granite/_classes.scss index 119ed690e..38b7149a2 100644 --- a/lib/Styles/Granite/_classes.scss +++ b/lib/Styles/Granite/_classes.scss @@ -48,7 +48,12 @@ paper { font-family: monospace; } -.destructive { - background-color: $STRAWBERRY_300; +button.text-button.destructive { + background-color: $error_color; + color: bg-color(0); text-shadow: none; + + &:active { + background-color: mix($error_color, $BLACK_900, 90%); + } } From 052d7c247a4c44675631021b48c7d7bac009323b Mon Sep 17 00:00:00 2001 From: William Kelso Date: Mon, 30 Jun 2025 13:58:48 -0400 Subject: [PATCH 3/4] move to buttons file --- lib/Styles/Granite/Button.scss | 11 ++++++++++- lib/Styles/Granite/_classes.scss | 10 ---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/Styles/Granite/Button.scss b/lib/Styles/Granite/Button.scss index b126ea4f4..ab4d5ee3d 100644 --- a/lib/Styles/Granite/Button.scss +++ b/lib/Styles/Granite/Button.scss @@ -1,5 +1,15 @@ button { + &.text-button.destructive { + background-color: $error_color; + color: bg-color(0); + text-shadow: none; + + &:active { + background-color: mix($error_color, $BLACK_900, 90%); + } + } + .linked &, .linked &.image-button, .linked &.image-button.toggle { @@ -70,5 +80,4 @@ button { shadow(2); } } - } diff --git a/lib/Styles/Granite/_classes.scss b/lib/Styles/Granite/_classes.scss index 38b7149a2..970eb84ad 100644 --- a/lib/Styles/Granite/_classes.scss +++ b/lib/Styles/Granite/_classes.scss @@ -47,13 +47,3 @@ paper { .monospace { font-family: monospace; } - -button.text-button.destructive { - background-color: $error_color; - color: bg-color(0); - text-shadow: none; - - &:active { - background-color: mix($error_color, $BLACK_900, 90%); - } -} From c20f637ca54e534dbcadca942d24ceebded246c8 Mon Sep 17 00:00:00 2001 From: William Kelso Date: Tue, 1 Jul 2025 15:51:08 -0400 Subject: [PATCH 4/4] Change fg to white --- lib/Styles/Granite/Button.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Styles/Granite/Button.scss b/lib/Styles/Granite/Button.scss index ab4d5ee3d..2f69c8c23 100644 --- a/lib/Styles/Granite/Button.scss +++ b/lib/Styles/Granite/Button.scss @@ -2,7 +2,7 @@ button { &.text-button.destructive { background-color: $error_color; - color: bg-color(0); + color: white; text-shadow: none; &:active {