Merge branch 'misskey-dev:develop' into yarn-3

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.112.0-beta.6",
+	"version": "12.112.0-beta.7",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/components/form/input.vue

@@ -33,123 +33,83 @@
 </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
-import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
+import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
 import { debounce } from 'throttle-debounce';
 import MkButton from '@/components/ui/button.vue';
 import { useInterval } from '@/scripts/use-interval';
 
-export default defineComponent({
+const props = defineProps<{
-	components: {
+	modelValue: string | number;
-		MkButton,
+	type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time';
-	},
+	required?: boolean;
+	readonly?: boolean;
+	disabled?: boolean;
+	pattern?: string;
+	placeholder?: string;
+	autofocus?: boolean;
+	autocomplete?: boolean;
+	spellcheck?: boolean;
+	step?: any;
+	datalist?: string[];
+	inline?: boolean;
+	debounce?: boolean;
+	manualSave?: boolean;
+	small?: boolean;
+	large?: boolean;
+}>();
 
-	props: {
+const emit = defineEmits<{
-		modelValue: {
+	(ev: 'change', _ev: KeyboardEvent): void;
-			required: true,
+	(ev: 'keydown', _ev: KeyboardEvent): void;
-		},
+	(ev: 'enter'): void;
-		type: {
+	(ev: 'update:modelValue', value: string | number): void;
-			type: String,
+}>();
-			required: false,
-		},
-		required: {
-			type: Boolean,
-			required: false,
-		},
-		readonly: {
-			type: Boolean,
-			required: false,
-		},
-		disabled: {
-			type: Boolean,
-			required: false,
-		},
-		pattern: {
-			type: String,
-			required: false,
-		},
-		placeholder: {
-			type: String,
-			required: false,
-		},
-		autofocus: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		autocomplete: {
-			required: false,
-		},
-		spellcheck: {
-			required: false,
-		},
-		step: {
-			required: false,
-		},
-		datalist: {
-			type: Array,
-			required: false,
-		},
-		inline: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		debounce: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		manualSave: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-	},
 
-	emits: ['change', 'keydown', 'enter', 'update:modelValue'],
+const { modelValue, type, autofocus } = toRefs(props);
+const v = ref(modelValue.value);
+const id = Math.random().toString(); // TODO: uuid?
+const focused = ref(false);
+const changed = ref(false);
+const invalid = ref(false);
+const filled = computed(() => v.value !== '' && v.value != null);
+const inputEl = ref<HTMLElement>();
+const prefixEl = ref<HTMLElement>();
+const suffixEl = ref<HTMLElement>();
+const height =
+	props.small ? 38 :
+	props.large ? 42 :
+	40;
 
-	setup(props, context) {
+const focus = () => inputEl.value.focus();
-		const { modelValue, type, autofocus } = toRefs(props);
+const onInput = (ev: KeyboardEvent) => {
-		const v = ref(modelValue.value);
-		const id = Math.random().toString(); // TODO: uuid?
-		const focused = ref(false);
-		const changed = ref(false);
-		const invalid = ref(false);
-		const filled = computed(() => v.value !== '' && v.value != null);
-		const inputEl = ref<HTMLElement>();
-		const prefixEl = ref<HTMLElement>();
-		const suffixEl = ref<HTMLElement>();
-
-		const focus = () => inputEl.value.focus();
-		const onInput = (ev) => {
 	changed.value = true;
-			context.emit('change', ev);
+	emit('change', ev);
-		};
+};
-		const onKeydown = (ev: KeyboardEvent) => {
+const onKeydown = (ev: KeyboardEvent) => {
-			context.emit('keydown', ev);
+	emit('keydown', ev);
 
 	if (ev.code === 'Enter') {
-				context.emit('enter');
+		emit('enter');
 	}
-		};
+};
 
-		const updated = () => {
+const updated = () => {
 	changed.value = false;
 	if (type.value === 'number') {
-				context.emit('update:modelValue', parseFloat(v.value));
+		emit('update:modelValue', parseFloat(v.value));
 	} else {
-				context.emit('update:modelValue', v.value);
+		emit('update:modelValue', v.value);
 	}
-		};
+};
 
-		const debouncedUpdated = debounce(1000, updated);
+const debouncedUpdated = debounce(1000, updated);
 
-		watch(modelValue, newValue => {
+watch(modelValue, newValue => {
 	v.value = newValue;
-		});
+});
 
-		watch(v, newValue => {
+watch(v, newValue => {
 	if (!props.manualSave) {
 		if (props.debounce) {
 			debouncedUpdated();
@@ -159,11 +119,11 @@ export default defineComponent({
 	}
 
 	invalid.value = inputEl.value.validity.badInput;
-		});
+});
 
-		// このコンポーネントが作成された時、非表示状態である場合がある
+// このコンポーネントが作成された時、非表示状態である場合がある
-		// 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
+// 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
-		useInterval(() => {
+useInterval(() => {
 	if (prefixEl.value) {
 		if (prefixEl.value.offsetWidth) {
 			inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px';
@@ -174,35 +134,17 @@ export default defineComponent({
 			inputEl.value.style.paddingRight = suffixEl.value.offsetWidth + 'px';
 		}
 	}
-		}, 100, {
+}, 100, {
 	immediate: true,
 	afterMounted: true,
-		});
+});
 
-		onMounted(() => {
+onMounted(() => {
 	nextTick(() => {
 		if (autofocus.value) {
 			focus();
 		}
 	});
-		});
-
-		return {
-			id,
-			v,
-			focused,
-			invalid,
-			changed,
-			filled,
-			inputEl,
-			prefixEl,
-			suffixEl,
-			focus,
-			onInput,
-			onKeydown,
-			updated,
-		};
-	},
 });
 </script>
 
@@ -229,14 +171,13 @@ export default defineComponent({
 	}
 
 	> .input {
-		$height: 42px;
 		position: relative;
 
 		> input {
 			appearance: none;
 			-webkit-appearance: none;
 			display: block;
-			height: $height;
+			height: v-bind("height + 'px'");
 			width: 100%;
 			margin: 0;
 			padding: 0 12px;
@@ -266,7 +207,7 @@ export default defineComponent({
 			top: 0;
 			padding: 0 12px;
 			font-size: 1em;
-			height: $height;
+			height: v-bind("height + 'px'");
 			pointer-events: none;
 
 			&:empty {

packages/client/src/components/form/radio.vue

@@ -7,7 +7,8 @@
 	:aria-disabled="disabled"
 	@click="toggle"
 >
-	<input type="radio"
+	<input
+		type="radio"
 		:disabled="disabled"
 	>
 	<span class="button">
@@ -23,27 +24,27 @@ import { defineComponent } from 'vue';
 export default defineComponent({
 	props: {
 		modelValue: {
-			required: false
+			required: false,
 		},
 		value: {
-			required: false
+			required: false,
 		},
 		disabled: {
 			type: Boolean,
-			default: false
+			default: false,
-		}
+		},
 	},
 	computed: {
 		checked(): boolean {
 			return this.modelValue === this.value;
-		}
+		},
 	},
 	methods: {
 		toggle() {
 			if (this.disabled) return;
 			this.$emit('update:modelValue', this.value);
-		}
+		},
-	}
+	},
 });
 </script>
 
@@ -53,7 +54,8 @@ export default defineComponent({
 	display: inline-block;
 	text-align: left;
 	cursor: pointer;
-	padding: 10px 12px;
+	padding: 9px 12px;
+	min-width: 60px;
 	background-color: var(--panel);
 	background-clip: padding-box !important;
 	border: solid 1px var(--panel);

packages/client/src/components/form/radios.vue

@@ -4,11 +4,11 @@ import MkRadio from './radio.vue';
 
 export default defineComponent({
 	components: {
-		MkRadio
+		MkRadio,
 	},
 	props: {
 		modelValue: {
-			required: false
+			required: false,
 		},
 	},
 	data() {
@@ -19,7 +19,7 @@ export default defineComponent({
 	watch: {
 		value() {
 			this.$emit('update:modelValue', this.value);
-		}
+		},
 	},
 	render() {
 		let options = this.$slots.default();
@@ -30,13 +30,13 @@ export default defineComponent({
 		if (options.length === 1 && options[0].props == null) options = options[0].children;
 
 		return h('div', {
-			class: 'novjtcto'
+			class: 'novjtcto',
 		}, [
 			...(label ? [h('div', {
-				class: 'label'
+				class: 'label',
 			}, [label])] : []),
 			h('div', {
-				class: 'body'
+				class: 'body',
 			}, options.map(option => h(MkRadio, {
 				key: option.key,
 				value: option.props.value,
@@ -45,10 +45,10 @@ export default defineComponent({
 			}, option.children)),
 			),
 			...(caption ? [h('div', {
-				class: 'caption'
+				class: 'caption',
 			}, [caption])] : []),
 		]);
-	}
+	},
 });
 </script>
 
@@ -65,9 +65,9 @@ export default defineComponent({
 	}
 
 	> .body {
-		display: grid;
+		display: flex;
-		grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+    gap: 12px;
-		grid-gap: 12px;
+    flex-wrap: wrap;
 	}
 
 	> .caption {

packages/client/src/components/form/range.vue

@@ -195,7 +195,7 @@ export default defineComponent({
 	$thumbWidth: 20px;
 
 	> .body {
-		padding: 12px;
+		padding: 10px 12px;
 		background: var(--panel);
 		border: solid 1px var(--panel);
 		border-radius: 6px;

packages/client/src/components/form/select.vue

@@ -26,94 +26,73 @@
 </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
-import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode } from 'vue';
+import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode, useSlots } from 'vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 
-export default defineComponent({
+const props = defineProps<{
-	components: {
+	modelValue: string;
-		MkButton,
+	required?: boolean;
-	},
+	readonly?: boolean;
+	disabled?: boolean;
+	placeholder?: string;
+	autofocus?: boolean;
+	inline?: boolean;
+	manualSave?: boolean;
+	small?: boolean;
+	large?: boolean;
+}>();
 
-	props: {
+const emit = defineEmits<{
-		modelValue: {
+	(ev: 'change', _ev: KeyboardEvent): void;
-			required: true,
+	(ev: 'update:modelValue', value: string): void;
-		},
+}>();
-		required: {
-			type: Boolean,
-			required: false,
-		},
-		readonly: {
-			type: Boolean,
-			required: false,
-		},
-		disabled: {
-			type: Boolean,
-			required: false,
-		},
-		placeholder: {
-			type: String,
-			required: false,
-		},
-		autofocus: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		inline: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		manualSave: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-	},
 
-	emits: ['change', 'update:modelValue'],
+const slots = useSlots();
 
-	setup(props, context) {
+const { modelValue, autofocus } = toRefs(props);
-		const { modelValue, autofocus } = toRefs(props);
+const v = ref(modelValue.value);
-		const v = ref(modelValue.value);
+const focused = ref(false);
-		const focused = ref(false);
+const changed = ref(false);
-		const changed = ref(false);
+const invalid = ref(false);
-		const invalid = ref(false);
+const filled = computed(() => v.value !== '' && v.value != null);
-		const filled = computed(() => v.value !== '' && v.value != null);
+const inputEl = ref(null);
-		const inputEl = ref(null);
+const prefixEl = ref(null);
-		const prefixEl = ref(null);
+const suffixEl = ref(null);
-		const suffixEl = ref(null);
+const container = ref(null);
-		const container = ref(null);
+const height =
+	props.small ? 38 :
+	props.large ? 42 :
+	40;
 
-		const focus = () => inputEl.value.focus();
+const focus = () => inputEl.value.focus();
-		const onInput = (ev) => {
+const onInput = (ev) => {
 	changed.value = true;
-			context.emit('change', ev);
+	emit('change', ev);
-		};
+};
 
-		const updated = () => {
+const updated = () => {
 	changed.value = false;
-			context.emit('update:modelValue', v.value);
+	emit('update:modelValue', v.value);
-		};
+};
 
-		watch(modelValue, newValue => {
+watch(modelValue, newValue => {
 	v.value = newValue;
-		});
+});
 
-		watch(v, newValue => {
+watch(v, newValue => {
 	if (!props.manualSave) {
 		updated();
 	}
 
 	invalid.value = inputEl.value.validity.badInput;
-		});
+});
 
-		// このコンポーネントが作成された時、非表示状態である場合がある
+// このコンポーネントが作成された時、非表示状態である場合がある
-		// 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
+// 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
-		useInterval(() => {
+useInterval(() => {
 	if (prefixEl.value) {
 		if (prefixEl.value.offsetWidth) {
 			inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px';
@@ -124,24 +103,24 @@ export default defineComponent({
 			inputEl.value.style.paddingRight = suffixEl.value.offsetWidth + 'px';
 		}
 	}
-		}, 100, {
+}, 100, {
 	immediate: true,
 	afterMounted: true,
-		});
+});
 
-		onMounted(() => {
+onMounted(() => {
 	nextTick(() => {
 		if (autofocus.value) {
 			focus();
 		}
 	});
-		});
+});
 
-		const onClick = (ev: MouseEvent) => {
+const onClick = (ev: MouseEvent) => {
 	focused.value = true;
 
 	const menu = [];
-			let options = context.slots.default();
+	let options = slots.default!();
 
 	const pushOption = (option: VNode) => {
 		menu.push({
@@ -179,25 +158,7 @@ export default defineComponent({
 	}).then(() => {
 		focused.value = false;
 	});
-		};
+};
-
-		return {
-			v,
-			focused,
-			invalid,
-			changed,
-			filled,
-			inputEl,
-			prefixEl,
-			suffixEl,
-			container,
-			focus,
-			onInput,
-			onClick,
-			updated,
-		};
-	},
-});
 </script>
 
 <style lang="scss" scoped>
@@ -223,7 +184,6 @@ export default defineComponent({
 	}
 
 	> .input {
-		$height: 42px;
 		position: relative;
 		cursor: pointer;
 
@@ -237,7 +197,7 @@ export default defineComponent({
 			appearance: none;
 			-webkit-appearance: none;
 			display: block;
-			height: $height;
+			height: v-bind("height + 'px'");
 			width: 100%;
 			margin: 0;
 			padding: 0 12px;
@@ -265,7 +225,7 @@ export default defineComponent({
 			top: 0;
 			padding: 0 12px;
 			font-size: 1em;
-			height: $height;
+			height: v-bind("height + 'px'");
 			pointer-events: none;
 
 			&:empty {

packages/client/src/components/global/page-header.vue

@@ -181,7 +181,7 @@ onUnmounted(() => {
 	border-bottom: solid 0.5px var(--divider);
 
 	&.thin {
-		--height: 50px;
+		--height: 45px;
 
 		> .buttons {
 			> .button {

packages/client/src/components/notification.vue

@@ -72,8 +72,8 @@
 </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
-import { defineComponent, ref, onMounted, onUnmounted, watch } from 'vue';
+import { ref, onMounted, onUnmounted, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import XReactionIcon from './reaction-icon.vue';
 import MkFollowButton from './follow-button.vue';
@@ -86,36 +86,22 @@ import * as os from '@/os';
 import { stream } from '@/stream';
 import { useTooltip } from '@/scripts/use-tooltip';
 
-export default defineComponent({
+const props = withDefaults(defineProps<{
-	components: {
+	notification: misskey.entities.Notification;
-		XReactionIcon, MkFollowButton,
+	withTime?: boolean;
-	},
+	full?: boolean;
+}>(), {
+	withTime: false,
+	full: false,
+});
 
-	props: {
+const elRef = ref<HTMLElement>(null);
-		notification: {
+const reactionRef = ref(null);
-			type: Object,
-			required: true,
-		},
-		withTime: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		full: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-	},
 
-	setup(props) {
+let readObserver: IntersectionObserver | undefined;
-		const elRef = ref<HTMLElement>(null);
+let connection;
-		const reactionRef = ref(null);
 
-		let readObserver: IntersectionObserver | undefined;
+onMounted(() => {
-		let connection;
-
-		onMounted(() => {
 	if (!props.notification.isRead) {
 		readObserver = new IntersectionObserver((entries, observer) => {
 			if (!entries.some(entry => entry.isIntersecting)) return;
@@ -134,60 +120,43 @@ export default defineComponent({
 			readObserver.disconnect();
 		});
 	}
-		});
+});
 
-		onUnmounted(() => {
+onUnmounted(() => {
 	if (readObserver) readObserver.disconnect();
 	if (connection) connection.dispose();
-		});
+});
 
-		const followRequestDone = ref(false);
+const followRequestDone = ref(false);
-		const groupInviteDone = ref(false);
+const groupInviteDone = ref(false);
 
-		const acceptFollowRequest = () => {
+const acceptFollowRequest = () => {
 	followRequestDone.value = true;
 	os.api('following/requests/accept', { userId: props.notification.user.id });
-		};
+};
 
-		const rejectFollowRequest = () => {
+const rejectFollowRequest = () => {
 	followRequestDone.value = true;
 	os.api('following/requests/reject', { userId: props.notification.user.id });
-		};
+};
 
-		const acceptGroupInvitation = () => {
+const acceptGroupInvitation = () => {
 	groupInviteDone.value = true;
 	os.apiWithDialog('users/groups/invitations/accept', { invitationId: props.notification.invitation.id });
-		};
+};
 
-		const rejectGroupInvitation = () => {
+const rejectGroupInvitation = () => {
 	groupInviteDone.value = true;
 	os.api('users/groups/invitations/reject', { invitationId: props.notification.invitation.id });
-		};
+};
 
-		useTooltip(reactionRef, (showing) => {
+useTooltip(reactionRef, (showing) => {
 	os.popup(XReactionTooltip, {
 		showing,
 		reaction: props.notification.reaction ? props.notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : props.notification.reaction,
 		emojis: props.notification.note.emojis,
 		targetElement: reactionRef.value.$el,
 	}, {}, 'closed');
-		});
-
-		return {
-			getNoteSummary: (note: misskey.entities.Note) => getNoteSummary(note),
-			followRequestDone,
-			groupInviteDone,
-			notePage,
-			userPage,
-			acceptFollowRequest,
-			rejectFollowRequest,
-			acceptGroupInvitation,
-			rejectGroupInvitation,
-			elRef,
-			reactionRef,
-			i18n,
-		};
-	},
 });
 </script>
 

packages/client/src/components/poll-editor.vue

@@ -5,7 +5,7 @@
 	</p>
 	<ul>
 		<li v-for="(choice, i) in choices" :key="i">
-			<MkInput class="input" :model-value="choice" :placeholder="$t('_poll.choiceN', { n: i + 1 })" @update:modelValue="onInput(i, $event)">
+			<MkInput class="input" small :model-value="choice" :placeholder="$t('_poll.choiceN', { n: i + 1 })" @update:modelValue="onInput(i, $event)">
 			</MkInput>
 			<button class="_button" @click="remove(i)">
 				<i class="fas fa-times"></i>
@@ -17,25 +17,25 @@
 	<MkSwitch v-model="multiple">{{ $ts._poll.canMultipleVote }}</MkSwitch>
 	<section>
 		<div>
-			<MkSelect v-model="expiration">
+			<MkSelect v-model="expiration" small>
 				<template #label>{{ $ts._poll.expiration }}</template>
 				<option value="infinite">{{ $ts._poll.infinite }}</option>
 				<option value="at">{{ $ts._poll.at }}</option>
 				<option value="after">{{ $ts._poll.after }}</option>
 			</MkSelect>
 			<section v-if="expiration === 'at'">
-				<MkInput v-model="atDate" type="date" class="input">
+				<MkInput v-model="atDate" small type="date" class="input">
 					<template #label>{{ $ts._poll.deadlineDate }}</template>
 				</MkInput>
-				<MkInput v-model="atTime" type="time" class="input">
+				<MkInput v-model="atTime" small type="time" class="input">
 					<template #label>{{ $ts._poll.deadlineTime }}</template>
 				</MkInput>
 			</section>
 			<section v-else-if="expiration === 'after'">
-				<MkInput v-model="after" type="number" class="input">
+				<MkInput v-model="after" small type="number" class="input">
 					<template #label>{{ $ts._poll.duration }}</template>
 				</MkInput>
-				<MkSelect v-model="unit">
+				<MkSelect v-model="unit" small>
 					<option value="second">{{ $ts._time.second }}</option>
 					<option value="minute">{{ $ts._time.minute }}</option>
 					<option value="hour">{{ $ts._time.hour }}</option>
@@ -49,12 +49,12 @@
 
 <script lang="ts" setup>
 import { ref, watch } from 'vue';
-import { addTime } from '@/scripts/time';
-import { formatDateTimeString } from '@/scripts/format-time-string';
 import MkInput from './form/input.vue';
 import MkSelect from './form/select.vue';
 import MkSwitch from './form/switch.vue';
 import MkButton from './ui/button.vue';
+import { formatDateTimeString } from '@/scripts/format-time-string';
+import { addTime } from '@/scripts/time';
 
 const props = defineProps<{
 	modelValue: {
@@ -129,7 +129,7 @@ function get() {
 		...(
 			expiration.value === 'at' ? { expiresAt: calcAt() } :
 			expiration.value === 'after' ? { expiredAfter: calcAfter() } : {}
-		)
+		),
 	};
 }
 

packages/client/src/components/ui/window.vue

@@ -408,7 +408,7 @@ export default defineComponent({
 			background: var(--windowHeader);
 			-webkit-backdrop-filter: var(--blur, blur(15px));
 			backdrop-filter: var(--blur, blur(15px));
-			border-bottom: solid 1px var(--divider);
+			//border-bottom: solid 1px var(--divider);
 			font-size: 95%;
 
 			> .left, > .right {

packages/client/src/nirax.ts

@@ -66,6 +66,7 @@ export class Router extends EventEmitter<{
 	private currentKey = Date.now().toString();
 
 	public currentRoute: ShallowRef<RouteDef | null> = shallowRef(null);
+	public navHook: ((path: string) => boolean) | null = null;
 
 	constructor(routes: Router['routes'], currentPath: Router['currentPath']) {
 		super();
@@ -192,6 +193,10 @@ export class Router extends EventEmitter<{
 	}
 
 	public push(path: string) {
+		if (this.navHook) {
+			const cancel = this.navHook(path);
+			if (cancel) return;
+		}
 		const beforePath = this.currentPath;
 		this.navigate(path, null);
 		this.emit('push', {

packages/client/src/pages/instance-info.vue

@@ -134,16 +134,11 @@ let suspended = $ref(false);
 let isBlocked = $ref(false);
 
 async function fetch() {
-	if (iAmModerator) {
-		// suspended and blocked information is only displayed to moderators.
-		// otherwise the API will error anyway
-
 	instance = await os.api('federation/show-instance', {
 		host: props.host,
 	});
 	suspended = instance.isSuspended;
 	isBlocked = instance.isBlocked;
-	}
 }
 
 async function toggleBlock(ev) {

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

@@ -1,5 +1,5 @@
 <template>
-<div class="_formRoot">
+<div class="_formRoot root">
 	<div v-adaptive-border class="rfqxtzch _panel _formBlock">
 		<div class="toggle">
 			<div class="toggleWrapper">
@@ -26,18 +26,8 @@
 		</div>
 	</div>
 
-	<template v-if="darkMode">
+	<div class="selects _formBlock">
-		<FormSelect v-model="darkThemeId" class="_formBlock">
+		<FormSelect v-model="lightThemeId" large class="select">
-			<template #label>{{ $ts.themeForDarkMode }}</template>
-			<template #prefix><i class="fas fa-moon"></i></template>
-			<optgroup :label="$ts.darkThemes">
-				<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="$ts.lightThemes">
-				<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-		</FormSelect>
-		<FormSelect v-model="lightThemeId" class="_formBlock">
 			<template #label>{{ $ts.themeForLightMode }}</template>
 			<template #prefix><i class="fas fa-sun"></i></template>
 			<optgroup :label="$ts.lightThemes">
@@ -47,19 +37,7 @@
 				<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
 		</FormSelect>
-	</template>
+		<FormSelect v-model="darkThemeId" large class="select">
-	<template v-else>
-		<FormSelect v-model="lightThemeId" class="_formBlock">
-			<template #label>{{ $ts.themeForLightMode }}</template>
-			<template #prefix><i class="fas fa-sun"></i></template>
-			<optgroup :label="$ts.lightThemes">
-				<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="$ts.darkThemes">
-				<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
-			</optgroup>
-		</FormSelect>
-		<FormSelect v-model="darkThemeId" class="_formBlock">
 			<template #label>{{ $ts.themeForDarkMode }}</template>
 			<template #prefix><i class="fas fa-moon"></i></template>
 			<optgroup :label="$ts.darkThemes">
@@ -69,7 +47,7 @@
 				<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
 			</optgroup>
 		</FormSelect>
-	</template>
+	</div>
 
 	<FormSection>
 		<div class="_formLinksGrid">
@@ -406,4 +384,17 @@ definePageMetadata({
 		border-top: solid 0.5px var(--divider);
 	}
 }
+
+.root {
+	> .selects {
+		display: flex;
+		gap: 1.5em var(--margin);
+		flex-wrap: wrap;
+
+		> .select {
+			flex: 1;
+			min-width: 280px;
+		}
+	}
+}
 </style>

packages/client/src/ui/deck.vue

@@ -65,6 +65,13 @@ import { $i } from '@/account';
 import { i18n } from '@/i18n';
 import { mainRouter } from '@/router';
 
+if (deckStore.state.navWindow) {
+	mainRouter.navHook = (path) => {
+		os.pageWindow(path);
+		return true;
+	};
+}
+
 const isMobile = ref(window.innerWidth <= 500);
 window.addEventListener('resize', () => {
 	isMobile.value = window.innerWidth <= 500;