From 498e88f059326c4a84d0bdac64cda6f7daa29ca2 Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Wed, 3 Dec 2025 16:43:26 +0100
Subject: [PATCH] Fix color contrast issues caused by new theme tokens (#37105)

---
 app/javascript/styles/mastodon-light/css_variables.scss | 1 +
 app/javascript/styles/mastodon/components.scss          | 4 ++--
 app/javascript/styles/mastodon/css_variables.scss       | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/css_variables.scss b/app/javascript/styles/mastodon-light/css_variables.scss
index 70745ec071..a96773f76c 100644
--- a/app/javascript/styles/mastodon-light/css_variables.scss
+++ b/app/javascript/styles/mastodon-light/css_variables.scss
@@ -39,6 +39,7 @@
     var(--color-text-brand)
   );
   --color-text-on-brand-base: var(--color-white);
+  --color-text-brand-on-inverted: var(--color-indigo-400);
   --color-text-error: var(--color-red-600);
   --color-text-on-error-base: var(--color-white);
   --color-text-warning: var(--color-yellow-600);
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 01de2c7d7a..ed2403b045 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10267,7 +10267,7 @@ noscript {
   background: transparent;
   text-transform: uppercase;
   cursor: pointer;
-  color: var(--color-text-brand);
+  color: var(--color-text-brand-on-inverted);
   font-weight: 700;
   border-radius: 4px;
   padding: 0 4px;
@@ -10751,7 +10751,7 @@ noscript {
   box-sizing: border-box;
   font-size: 14px;
   color: var(--color-text-secondary);
-  background: var(--color-bg-tertiary);
+  background: var(--color-bg-secondary);
   border: 1px solid var(--color-border-primary);
   border-top: 0;
   border-radius: 0 0 8px 8px;
diff --git a/app/javascript/styles/mastodon/css_variables.scss b/app/javascript/styles/mastodon/css_variables.scss
index b270bd337f..98b61d2f0b 100644
--- a/app/javascript/styles/mastodon/css_variables.scss
+++ b/app/javascript/styles/mastodon/css_variables.scss
@@ -39,6 +39,7 @@
     var(--color-text-brand)
   );
   --color-text-on-brand-base: var(--color-white);
+  --color-text-brand-on-inverted: var(--color-indigo-600);
   --color-text-error: var(--color-red-500);
   --color-text-on-error-base: var(--color-white);
   --color-text-warning: var(--color-yellow-400);
@@ -60,7 +61,7 @@
 
   // Neutrals
   --color-bg-primary: var(--color-grey-950);
-  --overlay-strength-secondary: 10%;
+  --overlay-strength-secondary: 8%;
   --color-bg-secondary-base: var(--color-indigo-200);
   --color-bg-secondary: #{utils.css-alpha(
       var(--color-bg-secondary-base),