From 7c927c9bc351fb067a1fac17a5f8ef8eab4fb3ef Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Fri, 24 Oct 2025 16:26:12 +0200
Subject: [PATCH] Clean up theme structure, bring back contrast theme

---
 app/javascript/styles/application.scss           |  1 +
 app/javascript/styles/common.scss                |  1 -
 app/javascript/styles/contrast.scss              |  2 +-
 app/javascript/styles/contrast/diff.scss         | 16 ++++++++++++++++
 app/javascript/styles/mastodon-light.scss        |  3 +--
 .../styles/mastodon-light/css_variables.scss     |  1 -
 app/javascript/styles/mastodon-light/diff.scss   | 11 -----------
 .../styles/mastodon/css_variables.scss           |  2 +-
 8 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 app/javascript/styles/mastodon-light/diff.scss

diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index f593d5c85a..e16e5368e7 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -1,4 +1,5 @@
 @use 'mastodon/css_variables';
+@use 'mastodon/variables';
 @use 'common';
 
 html {
diff --git a/app/javascript/styles/common.scss b/app/javascript/styles/common.scss
index 5e0f436c87..d8a7f90a32 100644
--- a/app/javascript/styles/common.scss
+++ b/app/javascript/styles/common.scss
@@ -1,5 +1,4 @@
 @use 'mastodon/mixins';
-@use 'mastodon/variables';
 @use 'fonts/roboto';
 @use 'fonts/roboto-mono';
 
diff --git a/app/javascript/styles/contrast.scss b/app/javascript/styles/contrast.scss
index 6505741894..af73c88fef 100644
--- a/app/javascript/styles/contrast.scss
+++ b/app/javascript/styles/contrast.scss
@@ -1,5 +1,5 @@
-@use 'mastodon/variables';
 @use 'mastodon/css_variables';
+@use 'mastodon/variables';
 @use 'common';
 @use 'contrast/diff';
 
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index f55e7fae3b..2093d9a1de 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,3 +1,19 @@
+@use '../mastodon/_theme_utils' as utils;
+
+:root {
+  /* TEXT TOKENS */
+
+  --clr-text-primary: var(--clr-grey-50);
+  --clr-text-secondary: var(--clr-grey-300);
+  --clr-text-tertiary: var(--clr-grey-400);
+  --clr-text-accent: var(--clr-indigo-300);
+  --clr-text-status-links: var(--clr-text-accent);
+
+  /* BORDER TOKENS */
+
+  --clr-border-primary-strength: 18%;
+}
+
 .status__content a,
 .reply-indicator__content a,
 .edit-indicator__content a,
diff --git a/app/javascript/styles/mastodon-light.scss b/app/javascript/styles/mastodon-light.scss
index 4cf98b5d70..494efdbbde 100644
--- a/app/javascript/styles/mastodon-light.scss
+++ b/app/javascript/styles/mastodon-light.scss
@@ -1,9 +1,8 @@
+@use 'mastodon-light/css_variables';
 @use 'mastodon/variables' with (
   $emojis-requiring-inversion: 'chains'
 );
-@use 'mastodon-light/css_variables';
 @use 'common';
-@use 'mastodon-light/diff';
 
 html {
   color-scheme: light;
diff --git a/app/javascript/styles/mastodon-light/css_variables.scss b/app/javascript/styles/mastodon-light/css_variables.scss
index 47bb90ea86..78da597796 100644
--- a/app/javascript/styles/mastodon-light/css_variables.scss
+++ b/app/javascript/styles/mastodon-light/css_variables.scss
@@ -145,7 +145,6 @@
     var(--clr-bg-primary),
     var(--clr-border-primary-base) var(--clr-border-primary-strength)
   );
-  --clr-border-strong: var(--clr-grey-950);
   --clr-border-media: rgb(252 248 255 / 15%);
   --clr-border-on-bg-secondary: var(--clr-grey-200);
   --clr-border-on-bg-accent-subtle: var(--clr-indigo-200);
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
deleted file mode 100644
index a4c5c9892a..0000000000
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.simple_form .warning {
-  box-shadow: none;
-  text-shadow: none;
-}
-
-.nothing-here,
-.directory__tag > a,
-.directory__tag > div,
-.card > a {
-  box-shadow: none;
-}
diff --git a/app/javascript/styles/mastodon/css_variables.scss b/app/javascript/styles/mastodon/css_variables.scss
index 407a66c58b..316c821017 100644
--- a/app/javascript/styles/mastodon/css_variables.scss
+++ b/app/javascript/styles/mastodon/css_variables.scss
@@ -15,6 +15,7 @@
   --clr-white: #fff;
   --clr-indigo-600: #6147e6;
   --clr-indigo-400: #8886ff;
+  --clr-indigo-300: #a5abfd;
   --clr-indigo-200: #c8cdfe;
   --clr-indigo-100: #e0e3ff;
   --clr-indigo-50: #f0f1ff;
@@ -154,7 +155,6 @@
       var(--clr-border-primary-base),
       var(--clr-border-primary-strength)
     )};
-  --clr-border-strong: var(--clr-grey-200);
   --clr-border-media: rgb(252 248 255 / 15%);
   --clr-border-on-bg-secondary: #{utils.css-alpha(
       var(--clr-border-primary-base),