From 22a9e950c7df88976b66c5b700c128af78132554 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 10 Feb 2019 05:26:49 +0900
Subject: [PATCH] =?UTF-8?q?deck=E3=81=AB=E3=83=95=E3=82=A9=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=BE=E3=81=99?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0=20(#4207?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* deckにフォローされていますを追加

* opacity
---
 locales/ja-JP.yml                                     |  1 +
 .../app/desktop/views/pages/deck/deck.user-column.vue | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 1caad8788..e9f91bb07 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1833,6 +1833,7 @@ deck/deck.tl-column.vue:
   edit: "オプション"
 
 deck/deck.user-column.vue:
+  follows-you: "フォローされています"
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
index e7e1790f8..b3e92f3e8 100644
--- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
@@ -20,6 +20,7 @@
 					<mk-user-name :user="user"/>
 				</span>
 				<span class="acct">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span>
+				<span class="followed" v-if="user.isFollowed">{{ $t('follows-you') }}</span>
 			</div>
 		</header>
 		<div class="info">
@@ -376,6 +377,7 @@ export default Vue.extend({
 				text-shadow 0 0 8px #000
 
 			> .acct
+				display block
 				font-size 14px
 				opacity 0.7
 				text-shadow 0 0 8px #000
@@ -383,6 +385,15 @@ export default Vue.extend({
 				> .locked
 					opacity 0.8
 
+			> .followed
+				display inline-block
+				font-size 12px
+				background rgba(0, 0, 0, 0.5)
+				opacity 0.7
+				margin-top: 2px
+				padding 4px
+				border-radius 4px
+
 	> .info
 		padding 16px
 		font-size 12px