kikobar/mastodon
1
0
Fork 0
mirror of https://github.com/kikobar/mastodon.git synced 2024-11-18 21:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong styles on strike page (#17615)

Browse source
This commit is contained in:
Eugen Rochko 2022-02-22 06:20:04 +01:00 committed by GitHub
parent 8603a07504
commit 8338826963
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/javascript/styles/mastodon/admin.scss
View file

@ -1497,6 +1497,25 @@ a.sparkline {
&:last-child { &:last-child {
margin-bottom: 0; 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 { &__statuses-list {

7
app/views/disputes/strikes/show.html.haml
View file

@ -23,7 +23,7 @@
.report-header__card .report-header__card
.strike-card .strike-card
- unless @strike.none_action? - 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? - unless @strike.text.blank?
= Formatter.instance.linkify(@strike.text) = Formatter.instance.linkify(@strike.text)
@ -34,9 +34,10 @@
= t("user_mailer.warning.categories.#{@strike.report.category}") = t("user_mailer.warning.categories.#{@strike.report.category}")
- if @strike.report.violation? && @strike.report.rule_ids.present? - if @strike.report.violation? && @strike.report.rule_ids.present?
%ul.rules-list %ul.strike-card__rules
- @strike.report.rules.each do |rule| - @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? - if @strike.status_ids.present? && !@strike.status_ids.empty?
%p %p