summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-02-10 05:26:49 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-10 05:26:49 +0900
commit22a9e950c7df88976b66c5b700c128af78132554 (patch)
tree7c94bb4030f07a0384e6fc9227a28a69ea8765fa /src/client
parentUpdate CircleCI configuration (#4204) (diff)
downloadmisskey-22a9e950c7df88976b66c5b700c128af78132554.tar.gz
misskey-22a9e950c7df88976b66c5b700c128af78132554.tar.bz2
misskey-22a9e950c7df88976b66c5b700c128af78132554.zip
deckにフォローされていますマークを追加 (#4207)
* deckにフォローされていますを追加 * opacity
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.user-column.vue11
1 files changed, 11 insertions, 0 deletions
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 e7e1790f81..b3e92f3e8a 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