From 83388269631f377e9853858916aa8c3897f90bb4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 22 Feb 2022 06:20:04 +0100
Subject: [PATCH] Fix wrong styles on strike page (#17615)
---
app/javascript/styles/mastodon/admin.scss | 19 +++++++++++++++++++
app/views/disputes/strikes/show.html.haml | 7 ++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 1921eb1466..d3ac4d9952 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1497,6 +1497,25 @@ a.sparkline {
&:last-child {
margin-bottom: 0;
}
+
+ strong {
+ font-weight: 700;
+ }
+ }
+
+ &__rules {
+ list-style: disc;
+ padding-left: 15px;
+ margin-bottom: 20px;
+ color: $darker-text-color;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ &__text {
+ color: $primary-text-color;
+ }
}
&__statuses-list {
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml
index 3dcb19016e..20a43ff98b 100644
--- a/app/views/disputes/strikes/show.html.haml
+++ b/app/views/disputes/strikes/show.html.haml
@@ -23,7 +23,7 @@
.report-header__card
.strike-card
- unless @strike.none_action?
- %p= t "user_mailer.warning.explanation.#{@strike.action}"
+ %p= t "user_mailer.warning.explanation.#{@strike.action}", instance: Rails.configuration.x.local_domain
- unless @strike.text.blank?
= Formatter.instance.linkify(@strike.text)
@@ -34,9 +34,10 @@
= t("user_mailer.warning.categories.#{@strike.report.category}")
- if @strike.report.violation? && @strike.report.rule_ids.present?
- %ul.rules-list
+ %ul.strike-card__rules
- @strike.report.rules.each do |rule|
- %li= rule.text
+ %li
+ %span.strike-card__rules__text= rule.text
- if @strike.status_ids.present? && !@strike.status_ids.empty?
%p