From c68762e2bfc06cf640b6aaf7bf5e277ea3af5daf Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Mon, 14 Apr 2025 10:52:33 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=E3=83=95=E3=83=AB=E3=83=80=E3=83=BC?=
 =?UTF-8?q?=E3=82=AF=E3=81=A7=E6=96=87=E5=AD=97=E3=81=8C=E8=96=84=E3=81=8F?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/styles/full-dark/variables.scss | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/javascript/styles/full-dark/variables.scss b/app/javascript/styles/full-dark/variables.scss
index 6cedec7df9..1720d716fe 100644
--- a/app/javascript/styles/full-dark/variables.scss
+++ b/app/javascript/styles/full-dark/variables.scss
@@ -1,11 +1,14 @@
 $classic-base-color: #282c37; // Midnight Express
 $classic-secondary-color: #d9e1e8; // Pattens Blue
 
-// Variables for defaults in UI
-$simple-background-color: $classic-base-color !default;
+@use '../mastodon/variables' with (
+  // Variables for defaults in UI
+  $simple-background-color: $classic-base-color,
 
-// Tell UI to use selected colors
-$ui-base-lighter-color: #969fbc !default; // Lighter darkest
+  // Tell UI to use selected colors
+  $ui-base-lighter-color: #969fbc,
 
-// For texts on inverted backgrounds
-$inverted-text-color: $classic-secondary-color !default;
+  // Lighter darkest
+  // For texts on inverted backgrounds
+  $inverted-text-color: $classic-secondary-color
+);

From 8992602acf5208f8dc17b5b5887be7bfc4f02e34 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Mon, 14 Apr 2025 13:34:50 +0900
Subject: [PATCH 2/2] Bump version to 18.0

---
 docker-compose.yml      | 6 +++---
 lib/mastodon/version.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0ec0c43bb6..cc9254b21f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     build: .
-    image: kmyblue:18.0-dev
+    image: kmyblue:18.0
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     build:
       dockerfile: ./streaming/Dockerfile
       context: .
-    image: kmyblue-streaming:18.0-dev
+    image: kmyblue-streaming:18.0
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: kmyblue:18.0-dev
+    image: kmyblue:18.0
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index acf7a4e79a..41887dfb31 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -18,8 +18,8 @@ module Mastodon
 
     def kmyblue_flag
       # 'LTS'
-      'dev'
-      # nil
+      # 'dev'
+      nil
     end
 
     def major