Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Commit

Permalink
Fix wrong styles on strike page (mastodon#17615)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gargron authored Feb 22, 2022
1 parent 8603a07 commit 8338826
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
19 changes: 19 additions & 0 deletions app/javascript/styles/mastodon/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 4 additions & 3 deletions app/views/disputes/strikes/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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? && [email protected]_ids.empty?
%p
Expand Down

0 comments on commit 8338826

Please sign in to comment.