From 950c828bbc35d55705e13579e923ec4d935a845c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nil=C3=A9ane?= <nileanedorffer@gmail.com>
Date: Tue, 21 Nov 2023 00:29:03 +0100
Subject: [PATCH] Added Cherry variant

---
 .github/workflows/copies.yml                           | 5 +++--
 README.md                                              | 2 ++
 TangerineUI-cherry.css                                 | 2 +-
 mastodon/app/javascript/styles/tangerineui-cherry.scss | 2 ++
 mastodon/app/javascript/styles/tangerineui-purple.scss | 2 +-
 mastodon/app/javascript/styles/tangerineui.scss        | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 mastodon/app/javascript/styles/tangerineui-cherry.scss

diff --git a/.github/workflows/copies.yml b/.github/workflows/copies.yml
index 9cd6017..df1573b 100644
--- a/.github/workflows/copies.yml
+++ b/.github/workflows/copies.yml
@@ -10,8 +10,9 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - run: cp TangerineUI.css mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
-      - run: cp TangerineUI-purple.css mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss
+      - run: cp TangerineUI.css mastodon/app/javascript/styles/tangerineui/tangerineui.scss
+      - run: cp TangerineUI-purple.css mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
+      - run: cp TangerineUI-cherry.css mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Copy CSS files to installation folder
diff --git a/README.md b/README.md
index bf872d4..1a323e7 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
 tangerineui: styles/tangerineui.scss                  | **new**
 tangerineui-purple: styles/tangerineui-purple.scss    | **new**
+tangerineui-cherry: styles/tangerineui-cherry.scss    | **new**
 ```
 
 3. **Add a localized name (optional).** You can edit each desired language's locale file in `config/locales/[lang].yml` to add a localized string name for Tangerine UI. You need to do this for every language you expect your users to use. Otherwise, in their themes list, they will see the unlocalized theme name ("*tangerineui-purple*"), instead of a readable theme name ("*Tangerine UI (Purple)*").
@@ -112,6 +113,7 @@ themes:
   mastodon-light: Mastodon (Light)
   tangerineui: Tangerine UI                           | **new**
   tangerineui-purple: Tangerine UI (Purple)           | **new**
+  tangerineui-cherry: Tangerine UI (Cherry)           | **new**
 ```
 
 4. **Compile theme assets and restart.** Run `RAILS_ENV=production bundle exec rails assets:precompile` and restart your Mastodon instance for the changes to take effect.
diff --git a/TangerineUI-cherry.css b/TangerineUI-cherry.css
index b610d85..9f2ae14 100644
--- a/TangerineUI-cherry.css
+++ b/TangerineUI-cherry.css
@@ -1,5 +1,5 @@
 /*  TangerineUI 🍊 for Mastodon ・ Cherry variant 🍒
-    version: 2.0.0
+    version: 2.0.0-pre
 
     A Tangerine redesign for Mastodon's Web UI.
     https://github.com/nileane/TangerineUI-for-Mastodon/
diff --git a/mastodon/app/javascript/styles/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry.scss
new file mode 100644
index 0000000..95af6d5
--- /dev/null
+++ b/mastodon/app/javascript/styles/tangerineui-cherry.scss
@@ -0,0 +1,2 @@
+@import 'application';
+@import 'tangerineui-purple/tangerineui-cherry.scss';
diff --git a/mastodon/app/javascript/styles/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple.scss
index 5f40e67..a0e1670 100644
--- a/mastodon/app/javascript/styles/tangerineui-purple.scss
+++ b/mastodon/app/javascript/styles/tangerineui-purple.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'tangerineui-purple/layout-single-column.scss';
+@import 'tangerineui-purple/tangerineui-purple.scss';
diff --git a/mastodon/app/javascript/styles/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui.scss
index db88b68..84ed96c 100644
--- a/mastodon/app/javascript/styles/tangerineui.scss
+++ b/mastodon/app/javascript/styles/tangerineui.scss
@@ -1,2 +1,2 @@
 @import 'application';
-@import 'tangerineui/layout-single-column.scss';
+@import 'tangerineui/tangerineui.scss';