diff options
| author | Jeong Arm <kjwonmail@gmail.com> | 2022-07-19 08:06:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-19 01:06:11 +0200 |
| commit | f248d95be26ceca3c2d717fa71557a56e975fece (patch) | |
| tree | e3f193d0b7a7c980b5e0b95d4c4881262a15ba3d | |
| parent | ec83e2a35ee5f3a68ec0f8f5285e45d24d4d1da6 (diff) | |
Fix badge color not affected (#18826)
* Fix badge color not affected * Generate user role css
| -rw-r--r-- | app/javascript/styles/mastodon/accounts.scss | 6 | ||||
| -rw-r--r-- | app/views/custom_css/show.css.erb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index 215774a19..54b65bfc8 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -210,9 +210,9 @@ font-size: 12px; line-height: 12px; font-weight: 500; - color: $ui-secondary-color; - background-color: rgba($ui-secondary-color, 0.1); - border: 1px solid rgba($ui-secondary-color, 0.5); + color: var(--user-role-accent, $ui-secondary-color); + background-color: var(--user-role-background, rgba($ui-secondary-color, 0.1)); + border: 1px solid var(--user-role-border, rgba($ui-secondary-color, 0.5)); &.moderator { color: $success-green; diff --git a/app/views/custom_css/show.css.erb b/app/views/custom_css/show.css.erb index 9cd38fb37..bcbe81962 100644 --- a/app/views/custom_css/show.css.erb +++ b/app/views/custom_css/show.css.erb @@ -5,6 +5,8 @@ <%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %> .user-role-<%= role.id %> { --user-role-accent: <%= role.color %>; + --user-role-background: <%= role.color + '19' %>; + --user-role-border: <%= role.color + '80' %>; } <%- end %> |