diff options
| author | Henry <spam@hjkos.com> | 2018-08-12 12:05:08 +0000 |
|---|---|---|
| committer | Henry <spam@hjkos.com> | 2018-08-12 12:05:08 +0000 |
| commit | 27adde9887d7205703ed461560f3272f6709b83b (patch) | |
| tree | b04030b899850b503097c2df1e7fde2a13043a7f /src/components/user_card/user_card.vue | |
| parent | 3d72c2b964e460762b7ccecc10ddb119fbe80ace (diff) | |
| parent | db6ff4824afa7adca1f3b633278e9ed033d8671d (diff) | |
Merge branch 'develop' into 'feature/accountHighlight'
# Conflicts:
# src/components/user_card_content/user_card_content.vue
Diffstat (limited to 'src/components/user_card/user_card.vue')
| -rw-r--r-- | src/components/user_card/user_card.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 6478a65f..7e3e0afe 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -7,10 +7,16 @@ <user-card-content :user="user" :switcher="false"></user-card-content> </div> <div class="name-and-screen-name" v-else> - <div :title="user.name" class="user-name"> + <div :title="user.name" v-if="user.name_html" class="user-name"> + <span v-html="user.name_html"></span> + <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you"> + {{ $t('user_card.follows_you') }} + </span> + </div> + <div :title="user.name" v-else class="user-name"> {{ user.name }} <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you"> - {{ $t('user_card.follows_you') }} + {{ $t('user_card.follows_you') }} </span> </div> <a :href="user.statusnet_profile_url" target="blank"><div class="user-screen-name">@{{ user.screen_name }}</div></a> |