forked from AkkomaGang/akkoma-fe
Compare commits
2 commits
56fd2e773b
...
7f4dd9ff03
Author | SHA1 | Date | |
---|---|---|---|
7f4dd9ff03 | |||
a9a95e9120 |
3 changed files with 9 additions and 1 deletions
|
@ -235,7 +235,7 @@
|
||||||
line-height: 22px;
|
line-height: 22px;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
|
||||||
.following, .requested_by {
|
.following, .requested_by, .blocking {
|
||||||
flex: 1 0 auto;
|
flex: 1 0 auto;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-bottom: .25em;
|
margin-bottom: .25em;
|
||||||
|
|
|
@ -127,6 +127,12 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="user-meta">
|
<div class="user-meta">
|
||||||
|
<div
|
||||||
|
v-if="relationship.blocked_by && loggedIn && isOtherUser"
|
||||||
|
class="blocking"
|
||||||
|
>
|
||||||
|
{{ $t('user_card.blocks_you') }}
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="relationship.followed_by && loggedIn && isOtherUser"
|
v-if="relationship.followed_by && loggedIn && isOtherUser"
|
||||||
class="following"
|
class="following"
|
||||||
|
@ -187,6 +193,7 @@
|
||||||
<FollowButton
|
<FollowButton
|
||||||
:relationship="relationship"
|
:relationship="relationship"
|
||||||
:user="user"
|
:user="user"
|
||||||
|
:disabled="relationship.blocked_by"
|
||||||
/>
|
/>
|
||||||
<template v-if="relationship.following">
|
<template v-if="relationship.following">
|
||||||
<ProgressButton
|
<ProgressButton
|
||||||
|
|
|
@ -1123,6 +1123,7 @@
|
||||||
"block_confirm_title": "Block user",
|
"block_confirm_title": "Block user",
|
||||||
"block_progress": "Blocking…",
|
"block_progress": "Blocking…",
|
||||||
"blocked": "Blocked!",
|
"blocked": "Blocked!",
|
||||||
|
"blocks_you": "Blocks you!",
|
||||||
"bot": "Bot",
|
"bot": "Bot",
|
||||||
"deactivated": "Deactivated",
|
"deactivated": "Deactivated",
|
||||||
"deny": "Deny",
|
"deny": "Deny",
|
||||||
|
|
Loading…
Reference in a new issue