From 67bf6ff3ce7d4ecb5b68c0f3638c790c69ce9cff Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 25 Oct 2021 00:13:54 +0900
Subject: [PATCH] :art:

---
 src/client/pages/announcements.vue | 10 +++++++---
 src/client/pages/featured.vue      |  6 +++---
 src/client/pages/mentions.vue      |  6 +++---
 src/client/pages/messages.vue      |  4 ++--
 src/client/style.scss              |  1 +
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/client/pages/announcements.vue b/src/client/pages/announcements.vue
index 327fa9b1f..429d183d1 100644
--- a/src/client/pages/announcements.vue
+++ b/src/client/pages/announcements.vue
@@ -1,7 +1,7 @@
 <template>
-<div class="_section">
+<MkSpacer :content-max="800">
 	<MkPagination :pagination="pagination" #default="{items}" class="ruryvtyk _content">
-		<section class="_card announcement _gap" v-for="(announcement, i) in items" :key="announcement.id">
+		<section class="_card announcement" v-for="(announcement, i) in items" :key="announcement.id">
 			<div class="_title"><span v-if="$i && !announcement.isRead">🆕 </span>{{ announcement.title }}</div>
 			<div class="_content">
 				<Mfm :text="announcement.text"/>
@@ -12,7 +12,7 @@
 			</div>
 		</section>
 	</MkPagination>
-</div>
+</MkSpacer>
 </template>
 
 <script lang="ts">
@@ -58,6 +58,10 @@ export default defineComponent({
 <style lang="scss" scoped>
 .ruryvtyk {
 	> .announcement {
+		&:not(:last-child) {
+			margin-bottom: var(--margin);
+		}
+
 		> ._content {
 			> img {
 				display: block;
diff --git a/src/client/pages/featured.vue b/src/client/pages/featured.vue
index afe3d6263..50df26bfb 100644
--- a/src/client/pages/featured.vue
+++ b/src/client/pages/featured.vue
@@ -1,7 +1,7 @@
 <template>
-<div class="_section">
-	<XNotes class="_content" ref="notes" :pagination="pagination" @before="before" @after="after"/>
-</div>
+<MkSpacer :content-max="800">
+	<XNotes ref="notes" :pagination="pagination" @before="before" @after="after"/>
+</MkSpacer>
 </template>
 
 <script lang="ts">
diff --git a/src/client/pages/mentions.vue b/src/client/pages/mentions.vue
index 00c6a3d4d..04682a856 100644
--- a/src/client/pages/mentions.vue
+++ b/src/client/pages/mentions.vue
@@ -1,7 +1,7 @@
 <template>
-<div class="_section">
-	<XNotes class="_content" :pagination="pagination" @before="before()" @after="after()"/>
-</div>
+<MkSpacer :content-max="800">
+	<XNotes :pagination="pagination" @before="before()" @after="after()"/>
+</MkSpacer>
 </template>
 
 <script lang="ts">
diff --git a/src/client/pages/messages.vue b/src/client/pages/messages.vue
index 15cd9546b..e3d668cf4 100644
--- a/src/client/pages/messages.vue
+++ b/src/client/pages/messages.vue
@@ -1,7 +1,7 @@
 <template>
-<div>
+<MkSpacer :content-max="800">
 	<XNotes :pagination="pagination" @before="before()" @after="after()"/>
-</div>
+</MkSpacer>
 </template>
 
 <script lang="ts">
diff --git a/src/client/style.scss b/src/client/style.scss
index 0275efa8b..d77cdacf7 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -348,6 +348,7 @@ hr {
 	contain: layout; // ふき出しがボックスから飛び出て表示されるようなデザインをする場合もあるので paint は contain することができない
 }
 
+// TODO: 廃止
 ._monolithic_ {
 	._section:not(:empty) {
 		box-sizing: border-box;