From d6120f956d611e24d844f9d3652cd927ffea21f0 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:17:46 +0900
Subject: [PATCH 01/12] =?UTF-8?q?enhance(frontend):=20=E3=80=8C=E3=83=87?=
 =?UTF-8?q?=E3=83=90=E3=82=A4=E3=82=B9=E3=81=AE=E3=83=80=E3=83=BC=E3=82=AF?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E3=81=A8=E5=90=8C=E6=9C=9F=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=80=8D=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E9=9A=9B=E3=81=AE=E6=8C=99=E5=8B=95?=
 =?UTF-8?q?=E3=82=92=E8=A6=96=E8=A6=9A=E7=9A=84=E3=81=AB=E3=82=8F=E3=81=8B?=
 =?UTF-8?q?=E3=82=8A=E3=82=84=E3=81=99=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/pages/settings/theme.vue     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 0a4bd4b82618..36ed667a0aec 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -6,7 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div class="_gaps_m rsljpzjq">
 	<div v-adaptive-border class="rfqxtzch _panel">
-		<div class="toggle">
+		<div
+			class="toggle"
+			:class="{ disabled: syncDeviceDarkMode }"
+		>
 			<div class="toggleWrapper">
 				<input id="dn" v-model="darkMode" type="checkbox" class="dn"/>
 				<label for="dn" class="toggle">
@@ -90,6 +93,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { unisonReload } from '@/scripts/unison-reload.js';
 import * as os from '@/os.js';
+import { readFile } from 'fs';
 
 async function reloadAsk() {
 	const { canceled } = await os.confirm({
@@ -191,13 +195,18 @@ definePageMetadata(() => ({
 		position: relative;
 		padding: 26px 0;
 		text-align: center;
+		overflow: hidden;
 
-		&.disabled {
-			opacity: 0.7;
-
-			&, * {
-				cursor: not-allowed !important;
-			}
+		&.disabled::after {
+			position: absolute;
+			z-index: 3;
+			content: '';
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background-color: var(--acrylicPanel);
+			cursor: not-allowed;
 		}
 
 		> .toggleWrapper {

From 8f7308f50128e3e0b048649231e3fa405bda071e Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:19:01 +0900
Subject: [PATCH 02/12] tweak

---
 packages/frontend/src/pages/settings/theme.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 36ed667a0aec..f696d2f517eb 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -195,7 +195,7 @@ definePageMetadata(() => ({
 		position: relative;
 		padding: 26px 0;
 		text-align: center;
-		overflow: hidden;
+		overflow: clip;
 
 		&.disabled::after {
 			position: absolute;

From 18c2467967d258a98296f45a6109d4cd7ef9fddc Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:19:38 +0900
Subject: [PATCH 03/12] Update Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bafee277d259..5cd4f8bbedbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 -
 
 ### Client
+- Enhance: 「デバイスのダークモードと同期する」を有効にしている際のカラーモード切替設定の挙動を視覚的にわかりやすく
 - Fix: 絵文字関係の不具合を修正 (#13485)
   - 履歴に残っている or ピン留めされた絵文字がコントロールパネルより削除されていた際にリアクションデッキが表示できなくなる
   - Unicode絵文字が履歴に残っている or ピン留めされているとリアクションデッキが表示できなくなる

From 55eee7d4d04f8c68b7b363963ff0d9188139e413 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:20:33 +0900
Subject: [PATCH 04/12] =?UTF-8?q?=E3=81=AA=E3=82=93=E3=81=A0=E3=81=93?=
 =?UTF-8?q?=E3=82=8C=E3=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/settings/theme.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index f696d2f517eb..3100c99f688b 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -93,7 +93,6 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { unisonReload } from '@/scripts/unison-reload.js';
 import * as os from '@/os.js';
-import { readFile } from 'fs';
 
 async function reloadAsk() {
 	const { canceled } = await os.confirm({

From d99a91bbbf6c3ba2b20ff118c7ea1acc78a5412b Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:23:23 +0900
Subject: [PATCH 05/12] =?UTF-8?q?=E3=81=84=E3=81=A1=E3=81=8A=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/settings/theme.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 3100c99f688b..e7273587ef78 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			:class="{ disabled: syncDeviceDarkMode }"
 		>
 			<div class="toggleWrapper">
-				<input id="dn" v-model="darkMode" type="checkbox" class="dn"/>
+				<input id="dn" v-model="darkMode" type="checkbox" class="dn" :disabled="syncDeviceDarkMode"/>
 				<label for="dn" class="toggle">
 					<span class="before">{{ i18n.ts.light }}</span>
 					<span class="after">{{ i18n.ts.dark }}</span>

From 83ef9d165b4e4fa66b1835e2eadd962a65f4564c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:10:08 +0900
Subject: [PATCH 06/12] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58211dfaccd5..276143f4608c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@
 -
 
 ### Client
-- 
+- Enhance: 「デバイスのダークモードと同期する」を有効にしている際のカラーモード切替設定の挙動を視覚的にわかりやすく
 
 ### Server
 -
@@ -29,7 +29,6 @@
 -
 
 ### Client
-- Enhance: 「デバイスのダークモードと同期する」を有効にしている際のカラーモード切替設定の挙動を視覚的にわかりやすく
 - Fix: 絵文字関係の不具合を修正 (#13485)
   - 履歴に残っている or ピン留めされた絵文字がコントロールパネルより削除されていた際にリアクションデッキが表示できなくなる
   - Unicode絵文字が履歴に残っている or ピン留めされているとリアクションデッキが表示できなくなる

From e96c94ef2e0b4726e7fe4e450b63f4367b5c2ca6 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:00:10 +0900
Subject: [PATCH 07/12] =?UTF-8?q?=E7=94=A8=E9=80=94=E3=81=AE=E9=81=95?=
 =?UTF-8?q?=E3=81=86=E8=89=B2=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/settings/theme.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index e7273587ef78..e7f68b4ca15e 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -204,7 +204,8 @@ definePageMetadata(() => ({
 			left: 0;
 			width: 100%;
 			height: 100%;
-			background-color: var(--acrylicPanel);
+			background-color: var(--panel);
+			opacity: .5;
 			cursor: not-allowed;
 		}
 

From 3f20639fba6529e87a7c4ac378bc33db2656fd7a Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:00:25 +0900
Subject: [PATCH 08/12] =?UTF-8?q?d=E3=82=AD=E3=83=BC=E3=82=92=E6=8A=BC?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AE=E6=8C=99=E5=8B=95=E3=82=82?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/boot/main-boot.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 5cb19f388aee..56c8fb3d98cf 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -69,6 +69,7 @@ export async function mainBoot() {
 
 	const hotkeys = {
 		'd': (): void => {
+			ColdDeviceStorage.set('syncDeviceDarkMode', false);
 			defaultStore.set('darkMode', !defaultStore.state.darkMode);
 		},
 		's': (): void => {
@@ -96,7 +97,7 @@ export async function mainBoot() {
 					}).render();
 				}
 			}
-		}	
+		}
 	} catch (error) {
 		// console.error(error);
 		console.error('Failed to initialise the seasonal screen effect canvas context:', error);

From b0cad800cdd9871bddc4c462f1cccae34582032d Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 22 Jun 2024 17:10:54 +0900
Subject: [PATCH 09/12] =?UTF-8?q?=E3=82=AD=E3=83=BC=E3=83=9C=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=A7=E3=82=AB=E3=83=A9=E3=83=BC=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F=E9=9A=9B?=
 =?UTF-8?q?=E3=81=ABtoast=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                           | 4 ++++
 locales/ja-JP.yml                            | 1 +
 packages/frontend/src/boot/main-boot.ts      | 1 +
 packages/frontend/src/components/MkToast.vue | 9 ++++++---
 packages/frontend/src/os.ts                  | 3 ++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index acdc1fc421c3..457ee8ad0e31 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4984,6 +4984,10 @@ export interface Locale extends ILocale {
      * お問い合わせ
      */
     "inquiry": string;
+    /**
+     * カラーモードを{mode}に変更しました。
+     */
+    "colorModeChangedToX": ParameterizedString<"mode">;
     "_delivery": {
         /**
          * 配信状態
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3ac1ce82a3b7..a0bbe9eecbc2 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1242,6 +1242,7 @@ keepOriginalFilenameDescription: "この設定をオフにすると、アップ
 noDescription: "説明文はありません"
 alwaysConfirmFollow: "フォローの際常に確認する"
 inquiry: "お問い合わせ"
+colorModeChangedToX: "カラーモードを{mode}に変更しました。"
 
 _delivery:
   status: "配信状態"
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 56c8fb3d98cf..71e5c005e4d6 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -71,6 +71,7 @@ export async function mainBoot() {
 		'd': (): void => {
 			ColdDeviceStorage.set('syncDeviceDarkMode', false);
 			defaultStore.set('darkMode', !defaultStore.state.darkMode);
+			toast(i18n.tsx.colorModeChangedToX({ mode: defaultStore.state.darkMode ? i18n.ts.dark : i18n.ts.light }), 1500);
 		},
 		's': (): void => {
 			mainRouter.push('/search');
diff --git a/packages/frontend/src/components/MkToast.vue b/packages/frontend/src/components/MkToast.vue
index e256640649d6..cac9420c7b70 100644
--- a/packages/frontend/src/components/MkToast.vue
+++ b/packages/frontend/src/components/MkToast.vue
@@ -26,9 +26,12 @@ import { onMounted, ref } from 'vue';
 import * as os from '@/os.js';
 import { defaultStore } from '@/store.js';
 
-defineProps<{
+const props = withDefaults(defineProps<{
 	message: string;
-}>();
+	duration?: number;
+}>(), {
+	duration: 4000,
+});
 
 const emit = defineEmits<{
 	(ev: 'closed'): void;
@@ -40,7 +43,7 @@ const showing = ref(true);
 onMounted(() => {
 	window.setTimeout(() => {
 		showing.value = false;
-	}, 4000);
+	}, props.duration);
 });
 </script>
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index f656a5237165..78d7b7afc90c 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -204,9 +204,10 @@ export function pageWindow(path: string) {
 	}, {}, 'closed');
 }
 
-export function toast(message: string) {
+export function toast(message: string, duration?: number) {
 	popup(MkToast, {
 		message,
+		duration,
 	}, {}, 'closed');
 }
 

From f848d86bd1dee7cffcb091b841bf62054a374f74 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 22 Jun 2024 17:30:17 +0900
Subject: [PATCH 10/12] =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=82=AB=E3=83=83=E3=83=88=E3=82=AD=E3=83=BC=E5=91=A8=E3=82=8A?=
 =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E4=B8=80=E6=97=A6=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E3=82=82=E3=81=A8=E3=81=AB=E6=88=BB=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                      | 4 ----
 locales/ja-JP.yml                       | 1 -
 packages/frontend/src/boot/main-boot.ts | 2 --
 3 files changed, 7 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 457ee8ad0e31..acdc1fc421c3 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4984,10 +4984,6 @@ export interface Locale extends ILocale {
      * お問い合わせ
      */
     "inquiry": string;
-    /**
-     * カラーモードを{mode}に変更しました。
-     */
-    "colorModeChangedToX": ParameterizedString<"mode">;
     "_delivery": {
         /**
          * 配信状態
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index a0bbe9eecbc2..3ac1ce82a3b7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1242,7 +1242,6 @@ keepOriginalFilenameDescription: "この設定をオフにすると、アップ
 noDescription: "説明文はありません"
 alwaysConfirmFollow: "フォローの際常に確認する"
 inquiry: "お問い合わせ"
-colorModeChangedToX: "カラーモードを{mode}に変更しました。"
 
 _delivery:
   status: "配信状態"
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 71e5c005e4d6..4118a6f81cff 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -69,9 +69,7 @@ export async function mainBoot() {
 
 	const hotkeys = {
 		'd': (): void => {
-			ColdDeviceStorage.set('syncDeviceDarkMode', false);
 			defaultStore.set('darkMode', !defaultStore.state.darkMode);
-			toast(i18n.tsx.colorModeChangedToX({ mode: defaultStore.state.darkMode ? i18n.ts.dark : i18n.ts.light }), 1500);
 		},
 		's': (): void => {
 			mainRouter.push('/search');

From cefa91c3ee1a0bb3235c40c966185e7aa5752910 Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Fri, 7 Mar 2025 23:06:42 +0900
Subject: [PATCH 11/12] chore: fix incorrect indent(mistook on resolving
 conflict)

---
 packages/frontend/src/pages/settings/theme.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index e92269f0ed60..6ef2b210c2ba 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -8,9 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div class="_gaps_m rsljpzjq">
 		<div v-adaptive-border class="rfqxtzch _panel">
 			<div
-        class="toggle"
-        :class="{ disabled: syncDeviceDarkMode }"
-      >
+				class="toggle"
+				:class="{ disabled: syncDeviceDarkMode }"
+			>
 				<div class="toggleWrapper">
 					<input id="dn" v-model="darkMode" type="checkbox" class="dn" :disabled="syncDeviceDarkMode"/>
 					<label for="dn" class="toggle">

From 9deaa4487244797b11eea4c0549a9d5aa4808239 Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Fri, 7 Mar 2025 23:07:47 +0900
Subject: [PATCH 12/12] docs(changelog): fix changelog insertion position

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fc329857356..5a490bc2c38c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Client
 - Feat: 設定の検索を追加(実験的)
 - Enhance: 設定項目の再配置
+- Enhance: 「デバイスのダークモードと同期する」を有効にしている際のカラーモード切替設定の挙動を視覚的にわかりやすく
 
 ### Server
 - Fix: DBマイグレーション際にシステムアカウントのユーザーID判定が正しくない問題を修正
@@ -440,7 +441,6 @@
 - Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
 - Enhance: ブラウザのコンテキストメニューを使用できるように
 - Enhance: 連合の「連合中」,「購読中」,「配信中」に対してブロックしているサーバー、配信停止しているサーバーを含めないように
-- Enhance: 「デバイスのダークモードと同期する」を有効にしている際のカラーモード切替設定の挙動を視覚的にわかりやすく
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正