Merge pull request #462 from kmycode/upstream-20240115

Upstream 20240115

app/views/custom_css/show.css.erb

@@ -1,8 +1,8 @@
-<%- if Setting.custom_css.present? %>
-<%= raw Setting.custom_css %>
+<%- if custom_css_styles.present? %>
+<%= raw custom_css_styles %>
 
 <%- end %>
-<%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %>
+<%- @user_roles.each do |role| %>
 .user-role-<%= role.id %> {
   --user-role-accent: <%= role.color %>;
 }

app/views/disputes/strikes/show.html.haml

@@ -21,7 +21,7 @@
 
 .report-header
   .report-header__card
-    = render 'card', strike: @strike
+    = render 'disputes/strikes/card', strike: @strike
 
   .report-header__details
     .report-header__details__item

app/views/layouts/application.html.haml

@@ -28,12 +28,14 @@
 
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
+    = stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
+
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
-    = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style'
     = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
 
     = yield :header_tags