Merge branch 'profile-overhaul' into shigusegubu-themes3
This commit is contained in:
commit
a616b20c7c
2 changed files with 45 additions and 42 deletions
|
|
@ -370,6 +370,7 @@
|
||||||
.user-stats {
|
.user-stats {
|
||||||
display: block;
|
display: block;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
word-wrap: break-word;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
dl {
|
dl {
|
||||||
|
|
|
||||||
|
|
@ -114,48 +114,50 @@
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<span
|
<template v-if="!hideBio">
|
||||||
v-if="user.deactivated"
|
<span
|
||||||
class="alert neutral user-role"
|
v-if="user.deactivated"
|
||||||
>
|
class="alert neutral user-role"
|
||||||
{{ $t('user_card.deactivated') }}
|
>
|
||||||
</span>
|
{{ $t('user_card.deactivated') }}
|
||||||
<span
|
</span>
|
||||||
v-if="!!visibleRole"
|
<span
|
||||||
class="alert neutral user-role"
|
v-if="!!visibleRole"
|
||||||
>
|
class="alert neutral user-role"
|
||||||
{{ $t(`general.role.${visibleRole}`) }}
|
>
|
||||||
</span>
|
{{ $t(`general.role.${visibleRole}`) }}
|
||||||
<span
|
</span>
|
||||||
v-if="user.actor_type === 'Service'"
|
<span
|
||||||
class="alert neutral user-role"
|
v-if="user.actor_type === 'Service'"
|
||||||
>
|
class="alert neutral user-role"
|
||||||
{{ $t('user_card.bot') }}
|
>
|
||||||
</span>
|
{{ $t('user_card.bot') }}
|
||||||
<span
|
</span>
|
||||||
v-if="user.actor_type === 'Group'"
|
<span
|
||||||
class="alert user-role"
|
v-if="user.actor_type === 'Group'"
|
||||||
>
|
class="alert user-role"
|
||||||
{{ $t('user_card.group') }}
|
>
|
||||||
</span>
|
{{ $t('user_card.group') }}
|
||||||
<span
|
</span>
|
||||||
v-if="relationship.muting && muteExpiryAvailable"
|
<span
|
||||||
class="alert neutral user-role"
|
v-if="relationship.muting && muteExpiryAvailable"
|
||||||
>
|
class="alert neutral user-role"
|
||||||
{{ muteExpiry }}
|
>
|
||||||
</span>
|
{{ muteExpiry }}
|
||||||
<span
|
</span>
|
||||||
v-if="relationship.blocking && blockExpiryAvailable"
|
<span
|
||||||
class="alert neutral user-role"
|
v-if="relationship.blocking && blockExpiryAvailable"
|
||||||
>
|
class="alert neutral user-role"
|
||||||
{{ blockExpiry }}
|
>
|
||||||
</span>
|
{{ blockExpiry }}
|
||||||
<span
|
</span>
|
||||||
v-if="relationship.followed_by && loggedIn && isOtherUser"
|
<span
|
||||||
class="alert neutral user-role"
|
v-if="relationship.followed_by && loggedIn && isOtherUser"
|
||||||
>
|
class="alert neutral user-role"
|
||||||
{{ $t('user_card.follows_you') }}
|
>
|
||||||
</span>
|
{{ $t('user_card.follows_you') }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue