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

app/javascript/styles/mastodon/components.scss

@@ -2010,7 +2010,9 @@ body > [data-popper-placement] {
 .account {
   padding: 16px;
 
-  &:not(&--without-border) {
+  // Using :where keeps specificity low, allowing for existing
+  // .account overrides to still apply
+  &:where(:not(&--without-border)) {
     border-bottom: 1px solid var(--color-border-primary);
   }
 
@@ -11509,6 +11511,9 @@ noscript {
 
 .column-footer {
   padding: 16px;
+  position: sticky;
+  bottom: 0;
+  background: var(--color-bg-primary);
 }
 
 .lists-scrollable {

app/javascript/styles/mastodon/theme/_dark.scss

@@ -81,6 +81,11 @@
       var(--color-bg-brand-base),
       var(--overlay-strength-brand)
     )};
+  --color-bg-brand-softer-solid: color-mix(
+    in srgb,
+    var(--color-bg-primary),
+    var(--color-bg-brand-base) var(--overlay-strength-brand)
+  );
 
   // Error
   --overlay-strength-error: 10%;

app/javascript/styles/mastodon/theme/_light.scss

@@ -78,6 +78,11 @@
       #0012d8,
       var(--overlay-strength-brand)
     )};
+  --color-bg-brand-softer-solid: color-mix(
+    in srgb,
+    var(--color-bg-primary),
+    var(--color-bg-brand-base) var(--overlay-strength-brand)
+  );
 
   // Error
   --overlay-strength-error: 5%;