hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1807 from ClearlyClaire/glitch-soc/merge-upstream 

Merge upstream changes
rebase/4.0.0rc1
Claire 2022-07-19 16:42:45 +02:00 committed by GitHub
parent ab1488a6ad 7205098ccf
commit 0a61b000e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/styles/accounts.scss
View File

@ -212,9 +212,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;

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/application/_sidebar.html.haml
View File

@ -13,4 +13,4 @@
%h4.emojify= t('footer.trending_now') %h4.emojify= t('footer.trending_now')
- trends.each do |tag| - trends.each do |tag|
= react_component :hashtag, hashtag: ActiveModelSerializers::SerializableResource.new(tag, serializer: REST::TagSerializer).as_json = react_component :hashtag, hashtag: ActiveModelSerializers::SerializableResource.new(tag, serializer: REST::TagSerializer, scope: current_user, scope_name: :current_user).as_json

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

@ -1,10 +1,12 @@
<%- if Setting.custom_css.present? %> <%- if Setting.custom_css.present? %>
<%= Setting.custom_css %> <%= raw Setting.custom_css %>
<%- end %> <%- end %>
<%- 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 %>