therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'feature/accountHighlight'

Browse source 
# Conflicts:
#   src/components/user_card_content/user_card_content.vue
This commit is contained in:
Henry 2018-08-12 12:05:08 +00:00
commit 27adde9887
12 changed files with 55 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/user_card_content/user_card_content.vue
View file

@ -13,7 +13,8 @@
<StillImage class="avatar" :src="user.profile_image_url_original"/>
</router-link>
<div class="name-and-screen-name">
<div :title="user.name" class='user-name'>{{user.name}}</div>
<div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
<div :title="user.name" class='user-name' v-else>{{user.name}}</div>
<router-link class='user-screen-name':to="{ name: 'user-profile', params: { id: user.id } }">
<span>@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
<span class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
@ -104,7 +105,8 @@
<span>{{user.followers_count}}</span>
</div>
</div>
<p v-if="!hideBio">{{user.description}}</p>
<p v-if="!hideBio && user.description_html" v-html="user.description_html"></p>
<p v-else-if="!hideBio">{{ user.description }}</p>
</div>
</div>
</template>