merge: Minor improvements to relation badges on user profiles (!674)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674 Approved-by: Marie <github@yuugi.dev> Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
commit
eb2ea85d40
4 changed files with 20 additions and 6 deletions
|
@ -271,6 +271,7 @@ defaultValueIs: "Default: {value}"
|
|||
noCustomEmojis: "There are no emoji"
|
||||
noJobs: "There are no jobs"
|
||||
federating: "Federating"
|
||||
blockingYou: "Blocking you"
|
||||
blocked: "Blocked"
|
||||
blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
|
||||
silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."
|
||||
|
|
4
locales/index.d.ts
vendored
4
locales/index.d.ts
vendored
|
@ -1100,6 +1100,10 @@ export interface Locale extends ILocale {
|
|||
* 連合中
|
||||
*/
|
||||
"federating": string;
|
||||
/**
|
||||
* Blocking you
|
||||
*/
|
||||
"blockingYou": string;
|
||||
/**
|
||||
* ブロック中
|
||||
*/
|
||||
|
|
|
@ -271,6 +271,7 @@ defaultValueIs: "デフォルト: {value}"
|
|||
noCustomEmojis: "絵文字はありません"
|
||||
noJobs: "ジョブはありません"
|
||||
federating: "連合中"
|
||||
blockingYou: "Blocking you"
|
||||
blocked: "ブロック中"
|
||||
blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
|
||||
silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."
|
||||
|
|
|
@ -30,12 +30,15 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="$i && $i.id != user.id" class="info-badges">
|
||||
<span v-if="user.isFollowed">{{ i18n.ts.followsYou }}</span>
|
||||
<span v-if="user.isMuted">{{ i18n.ts.muted }}</span>
|
||||
<span v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</span>
|
||||
<span v-if="user.isBlocking">{{ i18n.ts.blocked }}</span>
|
||||
</div>
|
||||
<ul v-if="$i && $i.id != user.id" class="info-badges">
|
||||
<li v-if="user.isFollowed && user.isFollowing">{{ i18n.ts.mutuals }}</li>
|
||||
<li v-else-if="user.isFollowing">{{ i18n.ts.following }}</li>
|
||||
<li v-else-if="user.isFollowed">{{ i18n.ts.followsYou }}</li>
|
||||
<li v-if="user.isMuted">{{ i18n.ts.muted }}</li>
|
||||
<li v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</li>
|
||||
<li v-if="user.isBlocking">{{ i18n.ts.blocked }}</li>
|
||||
<li v-if="user.isBlocked && $i.isModerator">{{ i18n.ts.blockingYou }}</li>
|
||||
</ul>
|
||||
<div class="actions">
|
||||
<button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button>
|
||||
<MkFollowButton v-if="$i?.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
|
||||
|
@ -469,12 +472,17 @@ onUnmounted(() => {
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
> * {
|
||||
padding: 4px 8px;
|
||||
color: #fff;
|
||||
background: rgba(0, 0, 0, 0.7);
|
||||
font-size: 0.7em;
|
||||
border-radius: var(--radius-sm);
|
||||
list-style-type: none;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
> :not(:first-child) {
|
||||
|
|
Loading…
Reference in a new issue