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

Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually adjacent to glitch-soc-only ones.
  Updated them as upstream did.

app/javascript/styles/mastodon-light/css_variables.scss

@@ -7,7 +7,7 @@ body {
   --dropdown-border-color: hsl(240deg, 25%, 88%);
   --dropdown-background-color: #fff;
   --modal-border-color: hsl(240deg, 25%, 88%);
-  --modal-background-color: var(--background-color-tint);
+  --modal-background-color: var(--background-color);
   --background-border-color: hsl(240deg, 25%, 88%);
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);

app/javascript/styles/mastodon/components.scss

@@ -2874,10 +2874,26 @@ a.account__display-name {
     color: $error-value-color;
   }
 
+  &--highlighted {
+    color: $highlight-text-color;
+  }
+
+  &-content {
+    display: flex;
+    flex-direction: column;
+  }
+
+  &-subtitle {
+    font-weight: 400;
+  }
+
   a,
   button {
     font: inherit;
-    display: block;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    white-space: inherit;
     width: 100%;
     padding: 10px 14px;
     border: 0;
@@ -2886,9 +2902,6 @@ a.account__display-name {
     box-sizing: border-box;
     text-decoration: none;
     color: inherit;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
     text-align: inherit;
     border-radius: 4px;
 
@@ -2908,30 +2921,8 @@ a.account__display-name {
   }
 }
 
-.reblog-button {
-  &__item {
-    max-width: 360px;
-
-    button {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      white-space: inherit;
-    }
-
-    div {
-      display: flex;
-      flex-direction: column;
-    }
-
-    &.active:not(.disabled) {
-      color: $highlight-text-color;
-    }
-  }
-
-  &__meta {
-    font-weight: 400;
-  }
+.reblog-menu-item {
+  max-width: 360px;
 }
 
 .inline-account {
@@ -5509,7 +5500,6 @@ a.status-card {
   border-radius: 4px;
   overflow: hidden;
   z-index: 2;
-  width: 300px;
 
   &.top {
     transform-origin: 50% 100%;
@@ -5616,6 +5606,7 @@ a.status-card {
 
 .language-dropdown {
   &__dropdown {
+    width: 300px;
     padding: 0;
 
     .emoji-mart-search {
@@ -5703,26 +5694,23 @@ a.status-card {
     z-index: 9999;
   }
 
+  &.disabled {
+    opacity: 0.6;
+    cursor: default;
+  }
+
   &__label {
-    cursor: pointer;
     display: block;
-
-    > span {
-      display: block;
-      font-weight: 500;
-      margin-bottom: 8px;
-    }
-
-    &.disabled {
-      cursor: default;
-      opacity: 0.5;
-    }
+    font-weight: 500;
+    margin-bottom: 8px;
   }
 
   &__button {
+    display: flex;
+    align-items: center;
     color: $primary-text-color;
-    background: var(--dropdown-background-color);
-    border: 1px solid var(--dropdown-border-color);
+    background: var(--input-background-color);
+    border: 1px solid var(--background-border-color);
     padding: 8px 12px;
     width: 100%;
     text-align: left;
@@ -5735,6 +5723,13 @@ a.status-card {
     }
   }
 
+  &__icon {
+    margin-inline: auto -4px;
+    width: 18px;
+    height: 18px;
+    opacity: 0.5;
+  }
+
   &__helper {
     margin-top: 4px;
     font-size: 0.8em;