Fix badge color not affected (#18826)

* Fix badge color not affected * Generate user role css
2 years ago · f248d95be2
parent ec83e2a35e
commit f248d95be2
2 changed files with 5 additions and 3 deletions
--- 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;
--- 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 %>