Fix link colors in report and strike details (#17616)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index d3ac4d9952249a566ed64ec621f48e78afe22d0a..ee7b26d076d82596fbe658805ca93d58eb456e67 100644 (file)
--- 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 ef23c3b77642f88b2960158663ba285eae6440c2..1462e76d0046e3d5d1ea79297db7bb97f684adf3 100644 (file)
--- 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 20a43ff98b3251fe1afb593ef8c5b43a2dfba98a..7248b25741612ea932492afa096193dbcea849b1 100644 (file)
--- 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