mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 05:13:01 +00:00
Display moderator badge (green), admin badge changed to red (#5728)
This commit is contained in:
parent
ad207456d6
commit
2151fd3150
|
@ -531,7 +531,19 @@
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 12px;
|
line-height: 12px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
color: $ui-secondary-color;
|
||||||
|
background-color: rgba($ui-secondary-color, 0.1);
|
||||||
|
border: 1px solid rgba($ui-secondary-color, 0.5);
|
||||||
|
|
||||||
|
&.moderator {
|
||||||
color: $success-green;
|
color: $success-green;
|
||||||
background-color: rgba($success-green, 0.1);
|
background-color: rgba($success-green, 0.1);
|
||||||
border: 1px solid rgba($success-green, 0.5);
|
border-color: rgba($success-green, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
&.admin {
|
||||||
|
color: $error-red;
|
||||||
|
background-color: rgba($error-red, 0.1);
|
||||||
|
border-color: rgba($error-red, 0.5);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,6 +115,8 @@ class Account < ApplicationRecord
|
||||||
:current_sign_in_at,
|
:current_sign_in_at,
|
||||||
:confirmed?,
|
:confirmed?,
|
||||||
:admin?,
|
:admin?,
|
||||||
|
:moderator?,
|
||||||
|
:staff?,
|
||||||
:locale,
|
:locale,
|
||||||
to: :user,
|
to: :user,
|
||||||
prefix: true,
|
prefix: true,
|
||||||
|
|
|
@ -29,8 +29,12 @@
|
||||||
|
|
||||||
- if account.user_admin?
|
- if account.user_admin?
|
||||||
.roles
|
.roles
|
||||||
.account-role
|
.account-role.admin
|
||||||
= t 'accounts.roles.admin'
|
= t 'accounts.roles.admin'
|
||||||
|
- elsif account.user_moderator?
|
||||||
|
.roles
|
||||||
|
.account-role.moderator
|
||||||
|
= t 'accounts.roles.moderator'
|
||||||
|
|
||||||
.bio
|
.bio
|
||||||
.account__header__content.p-note.emojify= Formatter.instance.simplified_format(account)
|
.account__header__content.p-note.emojify= Formatter.instance.simplified_format(account)
|
||||||
|
|
|
@ -48,6 +48,7 @@ en:
|
||||||
reserved_username: The username is reserved
|
reserved_username: The username is reserved
|
||||||
roles:
|
roles:
|
||||||
admin: Admin
|
admin: Admin
|
||||||
|
moderator: Mod
|
||||||
unfollow: Unfollow
|
unfollow: Unfollow
|
||||||
admin:
|
admin:
|
||||||
account_moderation_notes:
|
account_moderation_notes:
|
||||||
|
|
Loading…
Reference in a new issue