From d3b4b70bfc4b86ba283b46b4fb95954450854190 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 14 Aug 2021 22:35:15 +0900
Subject: [PATCH] :art:

---
 CHANGELOG.md                                  |  1 +
 src/client/components/date-separated-list.vue |  4 ++--
 src/client/components/notes.vue               | 12 +++++++++---
 src/client/pages/api-console.vue              |  2 +-
 src/client/pages/timeline.vue                 |  8 +++++---
 src/client/ui/universal.vue                   |  9 +++++++--
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef3b99a341..33657e99a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 ### Improvements
 - Misskey更新時にダイアログを表示するように
 - ジョブキューウィジェットに警報音を鳴らす設定を追加
+‐ UIデザインの調整
 
 ### Bugfixes
 - ActivityPub: 長いユーザーの名前や自己紹介の対応
diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue
index 7a4cc5ef98..fa0b6d669c 100644
--- a/src/client/components/date-separated-list.vue
+++ b/src/client/components/date-separated-list.vue
@@ -93,13 +93,13 @@ export default defineComponent({
 		});
 
 		return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? {
-			class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''),
+			class: 'sqadhkmv' + (this.noGap ? ' noGap' : ''),
 			name: 'list',
 			tag: 'div',
 			'data-direction': this.direction,
 			'data-reversed': this.reversed ? 'true' : 'false',
 		} : {
-			class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''),
+			class: 'sqadhkmv' + (this.noGap ? ' noGap' : ''),
 		}, {
 			default: renderChildren
 		});
diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue
index e90102921a..560441ba67 100644
--- a/src/client/components/notes.vue
+++ b/src/client/components/notes.vue
@@ -9,7 +9,7 @@
 		<div>{{ $ts.noNotes }}</div>
 	</div>
 
-	<div v-else>
+	<div v-else class="giivymft">
 		<div v-show="more && reversed" style="margin-bottom: var(--margin);">
 			<MkButton style="margin: 0 auto;" @click="fetchMoreFeature" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
 				<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
@@ -17,8 +17,8 @@
 			</MkButton>
 		</div>
 
-		<XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed" :no-gap="noGap" :ad="true">
-			<XNote :note="note" class="_block" @update:note="updated(note, $event)" :key="note._featuredId_ || note._prId_ || note.id"/>
+		<XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed" :no-gap="noGap" :ad="true" class="notes">
+			<XNote :note="note" @update:note="updated(note, $event)" :key="note._featuredId_ || note._prId_ || note.id"/>
 		</XList>
 
 		<div v-show="more && !reversed" style="margin-top: var(--margin);">
@@ -108,4 +108,10 @@ export default defineComponent({
 .fade-leave-to {
 	opacity: 0;
 }
+
+.giivymft {
+	> .notes {
+		background: var(--panel);
+	}
+}
 </style>
diff --git a/src/client/pages/api-console.vue b/src/client/pages/api-console.vue
index adae17658c..c6d459fd6d 100644
--- a/src/client/pages/api-console.vue
+++ b/src/client/pages/api-console.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="_root">
 	<div class="_block" style="padding: 24px;">
-		<MkInput v-model="endpoint" :datalist="endpoints" @update:modelValue="onEndpointChange()">
+		<MkInput v-model="endpoint" :datalist="endpoints" @update:modelValue="onEndpointChange()" class="_inputNoTopMargin">
 			<template #label>Endpoint</template>
 		</MkInput>
 		<MkTextarea v-model="body" code>
diff --git a/src/client/pages/timeline.vue b/src/client/pages/timeline.vue
index a6a0e6987f..4e149cc518 100644
--- a/src/client/pages/timeline.vue
+++ b/src/client/pages/timeline.vue
@@ -19,7 +19,7 @@
 		</div>
 	</div>
 	<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
-	<XTimeline ref="tl"
+	<XTimeline ref="tl" class="tl"
 		:key="src === 'list' ? `list:${list.id}` : src === 'antenna' ? `antenna:${antenna.id}` : src === 'channel' ? `channel:${channel.id}` : src"
 		:src="src"
 		:list="list ? list.id : null"
@@ -211,8 +211,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .cmuxhskf {
-	background: var(--bg);
-
 	> .new {
 		position: sticky;
 		top: calc(var(--stickyTop, 0px) + 16px);
@@ -289,5 +287,9 @@ export default defineComponent({
 			}
 		}
 	}
+
+	> .tl {
+		border-top: solid 0.5px var(--divider);
+	}
 }
 </style>
diff --git a/src/client/ui/universal.vue b/src/client/ui/universal.vue
index c49ad730f4..ce957d23c4 100644
--- a/src/client/ui/universal.vue
+++ b/src/client/ui/universal.vue
@@ -4,7 +4,7 @@
 
 	<div class="contents" ref="contents" @contextmenu.stop="onContextmenu">
 		<header class="header" ref="header" @click="onHeaderClick">
-			<XHeader :info="pageInfo"/>
+			<XHeader :info="pageInfo" :back-button="true" @back="back()"/>
 		</header>
 		<main ref="main">
 			<div class="content">
@@ -175,6 +175,10 @@ export default defineComponent({
 			window.scroll({ top: 0, behavior: 'smooth' });
 		},
 
+		back() {
+			history.back();
+		},
+
 		onTransition() {
 			if (window._scroll) window._scroll();
 		},
@@ -258,6 +262,7 @@ export default defineComponent({
 		min-width: 0;
 		--stickyTop: #{$header-height};
 		padding-top: $header-height;
+		background: var(--panel);
 
 		> .header {
 			position: fixed;
@@ -272,7 +277,7 @@ export default defineComponent({
 			-webkit-backdrop-filter: var(--blur, blur(32px));
 			backdrop-filter: var(--blur, blur(32px));
 			background-color: var(--header);
-			//border-bottom: solid 0.5px var(--divider);
+			border-bottom: solid 0.5px var(--divider);
 			user-select: none;
 		}