From bc012784ef19a73f382a34e8254d6dd8b9fe8b4f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 5 Jul 2022 22:40:15 +0900
Subject: [PATCH] chore(client): tweak ui

---
 packages/client/src/pages/explore.vue | 26 +++++-----
 packages/client/src/pages/note.vue    | 70 ++++++++++++++-------------
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 7a662c9ca6..c0b9438a50 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -12,19 +12,21 @@
 			<XUsers origin="remote"/>
 		</div>
 		<div v-else-if="tab === 'search'">
-			<div class="_isolated">
-				<MkInput v-model="searchQuery" :debounce="true" type="search">
-					<template #prefix><i class="fas fa-search"></i></template>
-					<template #label>{{ $ts.searchUser }}</template>
-				</MkInput>
-				<MkRadios v-model="searchOrigin">
-					<option value="combined">{{ $ts.all }}</option>
-					<option value="local">{{ $ts.local }}</option>
-					<option value="remote">{{ $ts.remote }}</option>
-				</MkRadios>
-			</div>
+			<MkSpacer :content-max="1200">
+				<div>
+					<MkInput v-model="searchQuery" :debounce="true" type="search" class="_formBlock">
+						<template #prefix><i class="fas fa-search"></i></template>
+						<template #label>{{ $ts.searchUser }}</template>
+					</MkInput>
+					<MkRadios v-model="searchOrigin" class="_formBlock">
+						<option value="combined">{{ $ts.all }}</option>
+						<option value="local">{{ $ts.local }}</option>
+						<option value="remote">{{ $ts.remote }}</option>
+					</MkRadios>
+				</div>
 
-			<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
+				<XUserList v-if="searchQuery" ref="searchEl" class="_gap" :pagination="searchPagination"/>
+			</MkSpacer>
 		</div>
 	</div>
 </MkStickyContainer>
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 7c936cc629..5e153482d6 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -1,41 +1,43 @@
-<template><MkStickyContainer>
+<template>
+<MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-		<MkSpacer :content-max="800">
-	<div class="fcuexfpr">
-		<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-			<div v-if="note" class="note">
-				<div v-if="showNext" class="_gap">
-					<XNotes class="_content" :pagination="nextPagination" :no-gap="true"/>
-				</div>
-
-				<div class="main _gap">
-					<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="fas fa-chevron-up"></i></MkButton>
-					<div class="note _gap">
-						<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri" class="_isolated"/>
-						<XNoteDetailed :key="note.id" v-model:note="note" class="_isolated note"/>
+	<MkSpacer :content-max="800">
+		<div class="fcuexfpr">
+			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
+				<div v-if="note" class="note">
+					<div v-if="showNext" class="_gap">
+						<XNotes class="_content" :pagination="nextPagination" :no-gap="true"/>
 					</div>
-					<div v-if="clips && clips.length > 0" class="_content clips _gap">
-						<div class="title">{{ $ts.clip }}</div>
-						<MkA v-for="item in clips" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
-							<b>{{ item.name }}</b>
-							<div v-if="item.description" class="description">{{ item.description }}</div>
-							<div class="user">
-								<MkAvatar :user="item.user" class="avatar" :show-indicator="true"/> <MkUserName :user="item.user" :nowrap="false"/>
-							</div>
-						</MkA>
-					</div>
-					<MkButton v-if="!showPrev && hasPrev" class="load prev" @click="showPrev = true"><i class="fas fa-chevron-down"></i></MkButton>
-				</div>
 
-				<div v-if="showPrev" class="_gap">
-					<XNotes class="_content" :pagination="prevPagination" :no-gap="true"/>
+					<div class="main _gap">
+						<MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="fas fa-chevron-up"></i></MkButton>
+						<div class="note _gap">
+							<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
+							<XNoteDetailed :key="note.id" v-model:note="note" class="note"/>
+						</div>
+						<div v-if="clips && clips.length > 0" class="_content clips _gap">
+							<div class="title">{{ $ts.clip }}</div>
+							<MkA v-for="item in clips" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
+								<b>{{ item.name }}</b>
+								<div v-if="item.description" class="description">{{ item.description }}</div>
+								<div class="user">
+									<MkAvatar :user="item.user" class="avatar" :show-indicator="true"/> <MkUserName :user="item.user" :nowrap="false"/>
+								</div>
+							</MkA>
+						</div>
+						<MkButton v-if="!showPrev && hasPrev" class="load prev" @click="showPrev = true"><i class="fas fa-chevron-down"></i></MkButton>
+					</div>
+
+					<div v-if="showPrev" class="_gap">
+						<XNotes class="_content" :pagination="prevPagination" :no-gap="true"/>
+					</div>
 				</div>
-			</div>
-			<MkError v-else-if="error" @retry="fetch()"/>
-			<MkLoading v-else/>
-		</transition>
-	</div>
-</MkSpacer></MkStickyContainer>
+				<MkError v-else-if="error" @retry="fetch()"/>
+				<MkLoading v-else/>
+			</transition>
+		</div>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>