From e04d866b209947978a257ad8bb4b6e3c99239cae Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 18 Apr 2021 14:29:31 +0900
Subject: [PATCH] Tweak UI

---
 src/client/components/notifications.vue |  4 ++--
 src/client/pages/page.vue               |  4 ++--
 src/client/pages/timeline.vue           |  7 +++----
 src/client/style.scss                   | 11 ++++-------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue
index 1b789093ef..161419f891 100644
--- a/src/client/components/notifications.vue
+++ b/src/client/components/notifications.vue
@@ -6,8 +6,8 @@
 
 	<p class="mfcuwfyp" v-else-if="empty">{{ $ts.noNotifications }}</p>
 
-	<div v-else class="_magnetParent">
-		<XList class="notifications _magnetChild" :items="items" v-slot="{ item: notification }" :no-gap="true">
+	<div v-else>
+		<XList class="notifications" :items="items" v-slot="{ item: notification }" :no-gap="true">
 			<XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :note="notification.note" @update:note="noteUpdated(notification.note, $event)" :key="notification.id"/>
 			<XNotification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/>
 		</XList>
diff --git a/src/client/pages/page.vue b/src/client/pages/page.vue
index 6ff09e2b68..d7b570e5f4 100644
--- a/src/client/pages/page.vue
+++ b/src/client/pages/page.vue
@@ -1,6 +1,6 @@
 <template>
-<div class="xcukqgmh _root _magnetParent" v-if="page" :key="page.id" v-size="{ max: [450] }">
-	<div class="_block _magnetChild main">
+<div class="xcukqgmh _root" v-if="page" :key="page.id" v-size="{ max: [450] }">
+	<div class="_block main">
 		<!--
 		<div class="header">
 			<h1>{{ page.title }}</h1>
diff --git a/src/client/pages/timeline.vue b/src/client/pages/timeline.vue
index 0e0116465c..efad31c252 100644
--- a/src/client/pages/timeline.vue
+++ b/src/client/pages/timeline.vue
@@ -1,10 +1,8 @@
 <template>
-<div class="cmuxhskf _root _magnetParent" v-hotkey.global="keymap">
-	<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
-
+<div class="cmuxhskf _root" v-hotkey.global="keymap">
 	<XTutorial v-if="$store.reactiveState.tutorial.value != -1" class="tutorial _block"/>
 	<XPostForm v-if="$store.reactiveState.showFixedPostForm.value" class="post-form _block" fixed/>
-	<div class="tabs _block _magnetChild">
+	<div class="tabs _block">
 		<div class="left">
 			<button class="_button tab" @click="() => { src = 'home'; saveSrc(); }" :class="{ active: src === 'home' }" v-tooltip="$ts._timelines.home"><Fa :icon="faHome"/></button>
 			<button class="_button tab" @click="() => { src = 'local'; saveSrc(); }" :class="{ active: src === 'local' }" v-tooltip="$ts._timelines.local" v-if="isLocalTimelineAvailable"><Fa :icon="faComments"/></button>
@@ -32,6 +30,7 @@
 		@after="after()"
 		@queue="queueUpdated"
 	/>
+	<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
 </div>
 </template>
 
diff --git a/src/client/style.scss b/src/client/style.scss
index 4c101c1dab..ab8da9ccfa 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -243,7 +243,10 @@ hr {
 
 ._block {
 	@extend ._panel;
-	margin: var(--margin) 0;
+
+	& + ._block {
+		margin-top: var(--margin);
+	}
 }
 
 ._gap {
@@ -375,12 +378,6 @@ hr {
 	}
 }
 
-._magnetParent {
-	._magnetChild:not(* + ._magnetChild) {
-		margin-top: 0;
-	}
-}
-
 ._narrow_ ._card {
 	> ._title {
 		padding: 16px;