]> cat aescling's git repositories - mastodon.git/commitdiff
Fix wrong styles on strike page (#17615)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 22 Feb 2022 05:20:04 +0000 (06:20 +0100)
committerGitHub <noreply@github.com>
Tue, 22 Feb 2022 05:20:04 +0000 (06:20 +0100)
app/javascript/styles/mastodon/admin.scss
app/views/disputes/strikes/show.html.haml

index 1921eb1466ebe5455d4ecdf2434ecebfe3187fb3..d3ac4d9952249a566ed64ec621f48e78afe22d0a 100644 (file)
@@ -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 {
index 3dcb19016e62f379fbae635fcd44e623e7aca70e..20a43ff98b3251fe1afb593ef8c5b43a2dfba98a 100644 (file)
@@ -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)
           = 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