diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-02-22 06:20:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 06:20:04 +0100 |
| commit | 83388269631f377e9853858916aa8c3897f90bb4 (patch) | |
| tree | 36e728bf3d0367f92ed74f104547a363c62ee26a | |
| parent | 8603a075049a9e903b05e2370cf4c5ebfda1e703 (diff) | |
Fix wrong styles on strike page (#17615)
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 19 | ||||
| -rw-r--r-- | 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 1921eb146..d3ac4d995 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 3dcb19016..20a43ff98 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 |