Merge branch 'main' into glitch-soc/merge-upstream

2022-02-26 21:15:37 +01:00
parent 551820cbd9 57814a98a9
commit 8158b04d18
7 changed files with 104 additions and 50 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -1383,16 +1383,20 @@ a.sparkline {
      line-height: 20px;
      margin-bottom: 4px;

-      .username a {
+      .username {
        color: $primary-text-color;
        font-weight: 500;
-        text-decoration: none;
        margin-right: 5px;

-        &:hover,
-        &:focus,
-        &:active {
-          text-decoration: underline;
+        a {
+          color: inherit;
+          text-decoration: none;
+
+          &:hover,
+          &:focus,
+          &:active {
+            text-decoration: underline;
+          }
        }
      }