Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.

app/javascript/styles/contrast.scss

@@ -1,2 +1 @@
 @use 'common';
-@use 'mastodon/high-contrast';

app/javascript/styles/mastodon/components.scss

@@ -39,8 +39,8 @@
     color: var(--color-text-error);
   }
 
-  &:hover,
-  &:active {
+  &:not(:disabled):hover,
+  &:not(:disabled):active {
     text-decoration: underline;
   }
 
@@ -1081,20 +1081,36 @@ body > [data-popper-placement] {
   }
 
   a {
+    --text-decoration-default: none;
+    --text-decoration-hover: underline;
+
+    [data-contrast='high'] & {
+      --text-decoration-default: underline;
+      --text-decoration-hover: none;
+    }
+
     color: var(--color-text-status-links);
-    text-decoration: none;
+    text-decoration: var(--text-decoration-default);
     unicode-bidi: isolate;
 
-    &:hover {
-      text-decoration: underline;
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: var(--text-decoration-hover);
     }
 
     &.mention {
-      &:hover {
-        text-decoration: none;
+      text-decoration: none;
 
+      span {
+        text-decoration: var(--text-decoration-default);
+      }
+
+      &:hover,
+      &:focus,
+      &:active {
         span {
-          text-decoration: underline;
+          text-decoration: var(--text-decoration-hover);
         }
       }
     }
@@ -1356,6 +1372,15 @@ body > [data-popper-placement] {
     text-decoration: underline;
   }
 
+  [data-contrast='high'] & {
+    text-decoration: underline;
+
+    &:hover,
+    &:active {
+      text-decoration: none;
+    }
+  }
+
   .icon {
     width: 15px;
     height: 15px;

app/javascript/styles/mastodon/high-contrast.scss

@@ -1,40 +0,0 @@
-.status__content a,
-.reply-indicator__content a,
-.edit-indicator__content a,
-.link-footer a,
-.status__content__read-more-button,
-.status__content__translate-button {
-  text-decoration: underline;
-
-  &:hover,
-  &:focus,
-  &:active {
-    text-decoration: none;
-  }
-
-  &.mention {
-    text-decoration: none;
-
-    span {
-      text-decoration: underline;
-    }
-
-    &:hover,
-    &:focus,
-    &:active {
-      span {
-        text-decoration: none;
-      }
-    }
-  }
-}
-
-.link-button:disabled {
-  cursor: not-allowed;
-
-  &:hover,
-  &:focus,
-  &:active {
-    text-decoration: none !important;
-  }
-}