Merge branch 'fix/its-me-elements' into 'develop'
Show "it's you" label and hide follow btn for current user Closes #839 and #827 See merge request pleroma/pleroma-fe!1111
This commit is contained in:
commit
0b44a5b601
1 changed files with 2 additions and 2 deletions
|
@ -2,7 +2,7 @@
|
||||||
<basic-user-card :user="user">
|
<basic-user-card :user="user">
|
||||||
<div class="follow-card-content-container">
|
<div class="follow-card-content-container">
|
||||||
<span
|
<span
|
||||||
v-if="!noFollowsYou && relationship.followed_by"
|
v-if="isMe || (!noFollowsYou && relationship.followed_by)"
|
||||||
class="faint"
|
class="faint"
|
||||||
>
|
>
|
||||||
{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
|
{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
<RemoteFollow :user="user" />
|
<RemoteFollow :user="user" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else-if="!isMe">
|
||||||
<FollowButton
|
<FollowButton
|
||||||
:relationship="relationship"
|
:relationship="relationship"
|
||||||
:label-following="$t('user_card.follow_unfollow')"
|
:label-following="$t('user_card.follow_unfollow')"
|
||||||
|
|
Loading…
Reference in a new issue