From 3599622b5bcdfd44f7df664428a749896fde319e Mon Sep 17 00:00:00 2001
From: Cal Moody <calvinmcm@gmail.com>
Date: Fri, 29 Dec 2023 06:32:40 -0500
Subject: [PATCH] Fix destructive actions in dropdowns not using error color in
light theme (#28484)
---
app/javascript/styles/mastodon-light/diff.scss | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3777fccbf..3a27c974a 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -300,10 +300,15 @@ html {
}
&__item {
+ color: $darker-text-color;
+
+ &--dangerous {
+ color: $error-value-color;
+ }
+
a,
button {
background: $white;
- color: $darker-text-color;
}
}
}
@@ -315,9 +320,9 @@ html {
.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
.privacy-dropdown__option:hover .privacy-dropdown__option__content,
.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item a:active,
-.dropdown-menu__item a:focus,
-.dropdown-menu__item a:hover,
+.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
+.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
+.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
.actions-modal ul li:not(:empty) a.active,
.actions-modal ul li:not(:empty) a.active button,
.actions-modal ul li:not(:empty) a:active,