fedward/custom-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sync develop with 2023.02 stable branch #6

Merged
fedward merged 102 commits from stable into develop 2023-02-12 19:20:33 +00:00
Conversation 0 Commits 102 Files changed 91 +9 -1
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b4b13d777f - Show all commits

2
src/components/user_card/user_card.scss
View file

@ -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;

7
src/components/user_card/user_card.vue
View file

@ -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

1
src/i18n/en.json
View file

@ -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",