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

Merge upstream changes

app/javascript/flavours/glitch/styles/accounts.scss

@@ -212,9 +212,9 @@
   font-size: 12px;
   line-height: 12px;
   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 {
     color: $success-green;

app/javascript/styles/mastodon/accounts.scss

@@ -210,9 +210,9 @@
   font-size: 12px;
   line-height: 12px;
   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 {
     color: $success-green;

app/views/application/_sidebar.html.haml

@@ -13,4 +13,4 @@
       %h4.emojify= t('footer.trending_now')
 
       - 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

app/views/custom_css/show.css.erb

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