From 83388269631f377e9853858916aa8c3897f90bb4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 22 Feb 2022 06:20:04 +0100 Subject: Fix wrong styles on strike page (#17615) --- app/views/disputes/strikes/show.html.haml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/views/disputes/strikes') 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 -- cgit From 51e67f3243d5709361bde722f341b8a5e74d63ca Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 22 Feb 2022 15:27:25 +0100 Subject: Fix link colors in report and strike details (#17616) --- app/javascript/styles/mastodon/admin.scss | 47 +++++++++++----------- .../account_warnings/_account_warning.html.haml | 7 ++-- app/views/disputes/strikes/show.html.haml | 4 +- 3 files changed, 30 insertions(+), 28 deletions(-) (limited to 'app/views/disputes/strikes') diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index d3ac4d995..ee7b26d07 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -645,18 +645,6 @@ body, text-decoration: underline; } } - - &--inactive { - .log-entry__title { - text-decoration: line-through; - } - - a, - .username, - .target { - color: $darker-text-color; - } - } } a.name-tag, @@ -1192,17 +1180,6 @@ a.sparkline { font-weight: 600; padding: 4px 0; } - - a { - color: $ui-highlight-color; - text-decoration: none; - - &:hover, - &:focus, - &:active { - text-decoration: underline; - } - } } &--horizontal { @@ -1290,6 +1267,30 @@ a.sparkline { background: linear-gradient(to left, $ui-base-color, transparent); pointer-events: none; } + + a { + color: $secondary-text-color; + text-decoration: none; + unicode-bidi: isolate; + + &:hover { + text-decoration: underline; + + .fa { + color: lighten($dark-text-color, 7%); + } + } + + &.mention { + &:hover { + text-decoration: none; + + span { + text-decoration: underline; + } + } + } + } } &__actions { diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml index ef23c3b77..1462e76d0 100644 --- a/app/views/admin/account_warnings/_account_warning.html.haml +++ b/app/views/admin/account_warnings/_account_warning.html.haml @@ -1,7 +1,8 @@ -= link_to disputes_strike_path(account_warning), class: ['log-entry', account_warning.overruled? && 'log-entry--inactive'] do += link_to disputes_strike_path(account_warning), class: 'log-entry' do .log-entry__header .log-entry__avatar - = image_tag account_warning.target_account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar' + .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' } + = fa_icon 'warning' .log-entry__content .log-entry__title = t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account.username, class: 'username'), target: content_tag(:span, account_warning.target_account.acct, class: 'target')).html_safe @@ -11,7 +12,7 @@ - if account_warning.report_id.present? · - = t('admin.reports.title', id: account_warning.report_id) + = t('admin.reports.report', id: account_warning.report_id) - if account_warning.overruled? · diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml index 20a43ff98..7248b2574 100644 --- a/app/views/disputes/strikes/show.html.haml +++ b/app/views/disputes/strikes/show.html.haml @@ -76,7 +76,7 @@ .report-header__details__item__header %strong= t('disputes.strikes.recipient') .report-header__details__item__content - = admin_account_link_to @strike.target_account, path: can?(:show, @strike.target_account) ? admin_account_path(@strike.target_account_id) : ActivityPub::TagManager.instance.url_for(@strike.target_account) + = link_to @strike.target_account.username, can?(:show, @strike.target_account) ? admin_account_path(@strike.target_account_id) : ActivityPub::TagManager.instance.url_for(@strike.target_account), class: 'table-action-link' .report-header__details__item .report-header__details__item__header %strong= t('disputes.strikes.action_taken') @@ -90,7 +90,7 @@ .report-header__details__item__header %strong= t('disputes.strikes.associated_report') .report-header__details__item__content - = link_to t('admin.reports.report', id: @strike.report.id), admin_report_path(@strike.report) + = link_to t('admin.reports.report', id: @strike.report.id), admin_report_path(@strike.report), class: 'table-action-link' - if @appeal.persisted? .report-header__details__item .report-header__details__item__header -- cgit