diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
| commit | b28b405b9763a0bb3df653b51e6d084b42e9a54d (patch) | |
| tree | c69f1ccb99440fea8cc94014e77687238e205160 /app/javascript | |
| parent | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff) | |
| parent | dc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/styles/mastodon/accounts.scss | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index b00dd8c1e..24a55c7bc 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -571,7 +571,19 @@ font-size: 12px; line-height: 12px; font-weight: 500; - color: $success-green; - background-color: rgba($success-green, 0.1); - border: 1px solid rgba($success-green, 0.5); + 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; + background-color: rgba($success-green, 0.1); + 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); + } } |