From 7612ead55151625716f176291a32cd7ede57c8d0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 21 Feb 2019 00:30:53 +0900
Subject: Fix #4331

---
 src/client/app/desktop/views/components/notes.vue        | 7 ++++++-
 src/client/app/desktop/views/deck/deck.notes.vue         | 7 ++++++-
 src/client/app/desktop/views/home/timeline.core.vue      | 3 ---
 src/client/app/desktop/views/home/user/user.timeline.vue | 1 -
 src/client/app/mobile/views/components/notes.vue         | 7 ++++++-
 src/client/app/mobile/views/components/user-timeline.vue | 7 +------
 src/client/app/mobile/views/pages/home.timeline.vue      | 6 +-----
 7 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index d1bf6dcc04..198f29b69d 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -4,7 +4,7 @@
 
 	<div class="newer-indicator" :style="{ top: $store.state.uiHeaderHeight + 'px' }" v-show="queue.length > 0"></div>
 
-	<slot name="empty" v-if="notes.length == 0 && !fetching && inited"></slot>
+	<div class="empty" v-if="notes.length == 0 && !fetching && inited">{{ $t('@.no-notes') }}</div>
 
 	<mk-error v-if="!fetching && !inited" @retry="init()"/>
 
@@ -209,6 +209,11 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .empty
+		padding 16px
+		text-align center
+		color var(--text)
+
 	> .placeholder
 		padding 32px
 		opacity 0.3
diff --git a/src/client/app/desktop/views/deck/deck.notes.vue b/src/client/app/desktop/views/deck/deck.notes.vue
index 0f2d33cc0c..810addd505 100644
--- a/src/client/app/desktop/views/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/deck/deck.notes.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="eamppglmnmimdhrlzhplwpvyeaqmmhxu">
-	<slot name="empty" v-if="notes.length == 0 && !fetching && inited"></slot>
+	<div class="empty" v-if="notes.length == 0 && !fetching && inited">{{ $t('@.no-notes') }}</div>
 
 	<mk-error v-if="!fetching && !inited" @retry="init()"/>
 
@@ -201,6 +201,11 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .empty
+		padding 16px
+		text-align center
+		color var(--text)
+
 	> .placeholder
 		padding 16px
 		opacity 0.3
diff --git a/src/client/app/desktop/views/home/timeline.core.vue b/src/client/app/desktop/views/home/timeline.core.vue
index a49fc74d8e..e306ac873c 100644
--- a/src/client/app/desktop/views/home/timeline.core.vue
+++ b/src/client/app/desktop/views/home/timeline.core.vue
@@ -8,9 +8,6 @@
 				<router-link to="/explore">{{ $t('@.empty-timeline-info.explore') }}</router-link>
 			</div>
 		</template>
-		<template #empty>
-			<fa :icon="['far', 'comments']"/>{{ $t('empty') }}
-		</template>
 	</mk-notes>
 </div>
 </template>
diff --git a/src/client/app/desktop/views/home/user/user.timeline.vue b/src/client/app/desktop/views/home/user/user.timeline.vue
index 1c5fa0cff7..f5d14112db 100644
--- a/src/client/app/desktop/views/home/user/user.timeline.vue
+++ b/src/client/app/desktop/views/home/user/user.timeline.vue
@@ -9,7 +9,6 @@
 				<span :data-active="mode == 'my-posts'" @click="mode = 'my-posts'"><fa icon="user"/> {{ $t('my-posts') }}</span>
 			</header>
 		</template>
-		<template #empty><fa :icon="['far', 'comments']"/>{{ $t('empty') }}</template>
 	</mk-notes>
 </div>
 </template>
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 9b4e7a3895..0d85e321d5 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="ivaojijs">
-	<slot name="empty" v-if="notes.length == 0 && !fetching && inited"></slot>
+	<div class="empty" v-if="notes.length == 0 && !fetching && inited">{{ $t('@.no-notes') }}</div>
 
 	<mk-error v-if="!fetching && !inited" @retry="init()"/>
 
@@ -197,6 +197,11 @@ export default Vue.extend({
 	@media (min-width 500px)
 		box-shadow 0 8px 32px rgba(#000, 0.1)
 
+	> .empty
+		padding 16px
+		text-align center
+		color var(--text)
+
 	.transition
 		.mk-notes-enter
 		.mk-notes-leave-to
diff --git a/src/client/app/mobile/views/components/user-timeline.vue b/src/client/app/mobile/views/components/user-timeline.vue
index b6981168b6..1b73b5bc41 100644
--- a/src/client/app/mobile/views/components/user-timeline.vue
+++ b/src/client/app/mobile/views/components/user-timeline.vue
@@ -1,11 +1,6 @@
 <template>
 <div class="mk-user-timeline">
-	<mk-notes ref="timeline" :make-promise="makePromise" @inited="() => $emit('loaded')">
-		<template #empty>
-			<fa :icon="['far', 'comments']"/>
-			{{ withMedia ? this.$t('no-notes-with-media') : this.$t('no-notes') }}
-		</template>
-	</mk-notes>
+	<mk-notes ref="timeline" :make-promise="makePromise" @inited="() => $emit('loaded')"/>
 </div>
 </template>
 
diff --git a/src/client/app/mobile/views/pages/home.timeline.vue b/src/client/app/mobile/views/pages/home.timeline.vue
index 8d92056608..4f9f5119ab 100644
--- a/src/client/app/mobile/views/pages/home.timeline.vue
+++ b/src/client/app/mobile/views/pages/home.timeline.vue
@@ -7,11 +7,7 @@
 		</div>
 	</ui-container>
 
-	<mk-notes ref="timeline" :make-promise="makePromise" @inited="() => $emit('loaded')">
-		<template #empty>
-			<fa :icon="['far', 'comments']"/>{{ $t('empty') }}
-		</template>
-	</mk-notes>
+	<mk-notes ref="timeline" :make-promise="makePromise" @inited="() => $emit('loaded')"/>
 </div>
 </template>
 
-- 
cgit v1.2.3-freya