From 62bf0d53d35f1e2a9b2740b88617334f2eadd219 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 18 Mar 2025 22:21:28 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPageWindow.vue        | 1 -
 .../src/components/global/StackingRouterView.vue         | 9 +++++++--
 packages/frontend/src/pages/settings/index.vue           | 2 +-
 packages/frontend/src/style.scss                         | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index eae2ccec4a..8a1a9c58d2 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -23,7 +23,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</template>
 
 	<div :class="$style.root">
-		<StackingRouterView :key="reloadCount" :router="windowRouter"/>
 		<StackingRouterView v-if="prefer.s['experimental.stackingRouterView']" :key="reloadCount" :router="windowRouter"/>
 		<RouterView v-else :key="reloadCount" :router="windowRouter"/>
 	</div>
diff --git a/packages/frontend/src/components/global/StackingRouterView.vue b/packages/frontend/src/components/global/StackingRouterView.vue
index 71a91d4887..8a4afe7360 100644
--- a/packages/frontend/src/components/global/StackingRouterView.vue
+++ b/packages/frontend/src/components/global/StackingRouterView.vue
@@ -17,7 +17,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-if="i > 0" :class="$style.tabBg" @click="back()"></div>
 		<div :class="$style.tabFg" @click.stop="back()">
 			<div v-if="i > 0" :class="$style.tabMenu">
-				<button :class="$style.tabMenuButton" class="_button" @click.stop="mount"><i class="ti ti-arrows-maximize"/></button>
+				<button :class="$style.tabMenuButton" class="_button" @click.stop="mount"><i class="ti ti-rectangle"></i></button>
+				<button :class="$style.tabMenuButton" class="_button" @click.stop="back"><i class="ti ti-x"></i></button>
 			</div>
 			<div :class="$style.tabContent" class="_pageContainer" @click.stop="">
 				<Suspense :timeout="0">
@@ -164,6 +165,8 @@ onBeforeUnmount(() => {
 }
 
 .tab {
+	overflow: clip;
+
 	&:first-child {
 		position: relative;
 		width: 100%;
@@ -221,10 +224,12 @@ onBeforeUnmount(() => {
 
 .tabMenu {
 	margin-left: auto;
+	padding: 0 4px;
 	background: var(--MI_THEME-bg);
 }
 
 .tabMenuButton {
-	padding: 10px;
+	padding: 8px;
+	font-size: 13px;
 }
 </style>
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index ea1b714aed..f6feaee453 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkStickyContainer>
+<MkStickyContainer class="_pageScrollable">
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="900" :marginMin="20" :marginMax="32">
 		<div ref="el" class="vvcocwet" :class="{ wide: !narrow }">
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 68384e80cb..7251674f28 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -177,8 +177,8 @@ rt {
 	overscroll-behavior: contain;
 }
 
-._page {
-	height: 100cqh;
+._pageScrollable {
+	height: 100%;
 	overflow: auto;
 	overflow-y: scroll;
 	overscroll-behavior: contain;