Merge 9deaa44872 into c1ff6feeda

CHANGELOG.md

@@ -225,6 +225,7 @@
 ### Client
 - Feat: 設定の検索を追加(実験的)
 - Enhance: 設定項目の再配置
+- Enhance: 「デバイスのダークモードと同期する」を有効にしている際のカラーモード切替設定の挙動を視覚的にわかりやすく
 
 ### Server
 - Fix: DBマイグレーション際にシステムアカウントのユーザーID判定が正しくない問題を修正

packages/frontend/src/components/MkToast.vue

@@ -26,9 +26,12 @@ import { onMounted, ref } from 'vue';
 import * as os from '@/os.js';
 import { prefer } from '@/preferences.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>
 

packages/frontend/src/os.ts

@@ -214,9 +214,10 @@ export function pageWindow(path: string) {
 	});
 }
 
-export function toast(message: string) {
+export function toast(message: string, duration?: number) {
 	const { dispose } = popup(MkToast, {
 		message,
+    duration,
 	}, {
 		closed: () => dispose(),
 	});

packages/frontend/src/pages/settings/theme.vue

@@ -7,9 +7,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <SearchMarker path="/settings/theme" :label="i18n.ts.theme" :keywords="['theme']" icon="ti ti-palette">
 	<div class="_gaps_m">
 		<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"/>
+					<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>
@@ -350,13 +353,19 @@ definePage(() => ({
 		position: relative;
 		padding: 26px 0;
 		text-align: center;
+		overflow: clip;
 
-		&.disabled {
+		&.disabled::after {
-			opacity: 0.7;
+			position: absolute;
-
+			z-index: 3;
-			&, * {
+			content: '';
-				cursor: not-allowed !important;
+			top: 0;
-			}
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background-color: var(--panel);
+			opacity: .5;
+			cursor: not-allowed;
 		}
 
 		> .toggleWrapper {