Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream

app/javascript/styles/contrast/diff.scss

@@ -37,10 +37,6 @@
   color: $highlight-text-color;
 }
 
-.nothing-here {
-  color: $darker-text-color;
-}
-
 .report-dialog-modal__textarea::placeholder {
   color: $inverted-text-color;
 }

app/javascript/styles/contrast/variables.scss

@@ -21,5 +21,5 @@ $ui-highlight-color: $classic-highlight-color !default;
   $action-button-color: lighten($ui-base-color, 50%),
   $inverted-text-color: $black,
   $lighter-text-color: darken($ui-base-color, 6%),
-  $light-text-color: darken($ui-primary-color, 40%)
+  $light-text-color: $classic-primary-color
 );

app/javascript/styles/mastodon/accounts.scss

@@ -162,7 +162,7 @@
 .nothing-here {
   background: $ui-base-color;
   box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  color: $light-text-color;
+  color: $darker-text-color;
   font-size: 14px;
   font-weight: 500;
   text-align: center;

app/javascript/styles/mastodon/components.scss

@@ -7309,6 +7309,7 @@ a.status-card {
     opacity: 0;
     pointer-events: none;
     transition: opacity 0.1s ease;
+    will-change: opacity, pointer-events;
 
     &.active {
       opacity: 1;
@@ -7414,6 +7415,9 @@ a.status-card {
     overflow: hidden;
     text-overflow: ellipsis;
     margin: 0 5px;
+
+    // Ensure digits maintain a consistent width
+    font-variant-numeric: tabular-nums;
   }
 
   &__time-sep,
@@ -10899,6 +10903,11 @@ noscript {
     }
   }
 
+  &__limited-account-note {
+    text-align: center;
+    font-weight: 500;
+  }
+
   .display-name {
     font-size: 15px;
     line-height: 22px;