tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix badge color not affected (#18826)

Browse Source 
* Fix badge color not affected

* Generate user role css
This commit is contained in:
Jeong Arm 2022-07-19 08:06:11 +09:00 committed by GitHub
parent ec83e2a35e
commit f248d95be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/styles/mastodon/accounts.scss
View File

@ -210,9 +210,9 @@
font-size: 12px; font-size: 12px;
line-height: 12px; line-height: 12px;
font-weight: 500; font-weight: 500;
color: $ui-secondary-color; color: var(--user-role-accent, $ui-secondary-color);
background-color: rgba($ui-secondary-color, 0.1); background-color: var(--user-role-background, rgba($ui-secondary-color, 0.1));
border: 1px solid rgba($ui-secondary-color, 0.5); border: 1px solid var(--user-role-border, rgba($ui-secondary-color, 0.5));
&.moderator { &.moderator {
color: $success-green; color: $success-green;

2
app/views/custom_css/show.css.erb
View File

@ -5,6 +5,8 @@
<%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %> <%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %>
.user-role-<%= role.id %> { .user-role-<%= role.id %> {
--user-role-accent: <%= role.color %>; --user-role-accent: <%= role.color %>;
--user-role-background: <%= role.color + '19' %>;
--user-role-border: <%= role.color + '80' %>;
} }
<%- end %> <%- end %>