From 9412b06ba22deb82b1fd75bcbbc7e71746bc628f Mon Sep 17 00:00:00 2001
From: Mike Barnes <mike@grousemedia.com>
Date: Sat, 19 Oct 2024 13:11:13 +1100
Subject: [PATCH] Theme selections changed

---
 app/javascript/styles/mastodon.scss           | 24 +++++++++++++++++++
 .../tangerineui-chinwag.scss                  | 14 +++++------
 config/locales/en.yml                         |  8 +++----
 config/themes.yml                             |  2 +-
 4 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 app/javascript/styles/mastodon.scss

diff --git a/app/javascript/styles/mastodon.scss b/app/javascript/styles/mastodon.scss
new file mode 100644
index 000000000..465b74807
--- /dev/null
+++ b/app/javascript/styles/mastodon.scss
@@ -0,0 +1,24 @@
+@import 'mastodon/mixins';
+@import 'mastodon/variables';
+@import 'fonts/roboto';
+@import 'fonts/roboto-mono';
+
+@import 'mastodon/reset';
+@import 'mastodon/basics';
+@import 'mastodon/branding';
+@import 'mastodon/containers';
+@import 'mastodon/lists';
+@import 'mastodon/widgets';
+@import 'mastodon/forms';
+@import 'mastodon/accounts';
+@import 'mastodon/components';
+@import 'mastodon/polls';
+@import 'mastodon/modal';
+@import 'mastodon/emoji_picker';
+@import 'mastodon/about';
+@import 'mastodon/tables';
+@import 'mastodon/admin';
+@import 'mastodon/dashboard';
+@import 'mastodon/rtl';
+@import 'mastodon/accessibility';
+@import 'mastodon/rich_text';
diff --git a/app/javascript/styles/tangerineui-chinwag/tangerineui-chinwag.scss b/app/javascript/styles/tangerineui-chinwag/tangerineui-chinwag.scss
index 8825ad062..73c2caa8f 100644
--- a/app/javascript/styles/tangerineui-chinwag/tangerineui-chinwag.scss
+++ b/app/javascript/styles/tangerineui-chinwag/tangerineui-chinwag.scss
@@ -32,14 +32,14 @@
     --color-content-fg: #444a5a;
     --color-content-fg-bold: #000000;
     --color-content-fg-muted: color-mix(in srgb, var(--color-content-fg), var(--color-content-bg) 40%);
-    --color-content-secondary-bg: #eeebdb;
+    --color-content-secondary-bg: #f8f1ee;
     --color-content-secondary-separator: rgba(223, 219, 237, 0.4);
     --color-content-bg-focus: #fffcfa;
 
     --color-accent: #3b953f;
     --color-accent-focus: #4e9f52;
-    --color-accent-lines: rgba(221, 240, 225, 0.52);
-    --color-accent-bg: #ebf4eb;
+    --color-accent-lines: rgba(237, 238, 246, 0.52);
+    --color-accent-bg: #f6f5ed;
     --color-accent-fg: #ffffff;
 
     --color-lines: #e1dde4;
@@ -69,7 +69,7 @@
         --color-content-secondary-separator: rgba(64, 62, 89, 0.4);
         --color-content-bg-focus: #0e0e0e;
 
-        --color-accent: #3b953f;
+        --color-accent: #2f7732; /* slightly darker shade of brand green */
         --color-accent-focus: #4e9f52;
         --color-accent-lines: rgba(221, 240, 225, 0.52);
         --color-accent-bg: #0e0e0e;
@@ -4049,12 +4049,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     flex-grow: unset;
     padding: 0;
     border: 0;
-    width: 64px;
-    height: 64px;
+    width: 54px;
+    height: 54px;
     background-image: var(--logo);
     background-repeat: no-repeat;
     background-position: center;
-    background-size: 50px auto;
+    background-size: 54px auto;
 }
 .app-body .column-link.column-link--logo svg,
 .app-body .ui__header__logo svg {
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7f28d93ad..6a6ef6ecd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1800,11 +1800,11 @@ en:
   tags:
     does_not_match_previous_name: does not match the previous name
   themes:
-    tangerineui-chinwag: Chinwag
-    contrast: High Contrast
-    default: Mastodon Dark
-    mastodon-light: Mastodon Light
     system: Automatic (use system theme)
+    default: Chinwag
+    contrast: High Contrast
+    mastodon: Mastodon Dark
+    mastodon-light: Mastodon Light
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/themes.yml b/config/themes.yml
index 98b74c4b6..f84ad06e5 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,4 +1,4 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
+mastodon: styles/mastodon.scss
 mastodon-light: styles/mastodon-light.scss
-tangerineui-chinwag: styles/tangerineui-chinwag.scss