Merge branch 'main' of https://github.com/glitch-soc/mastodon into 4.1.4-glitch-fix

Updating Glitch

app/javascript/flavours/glitch/styles/components/accounts.scss

@@ -319,7 +319,7 @@
   color: $white;
   margin-bottom: 4px;
   display: block;
-  background-color: $base-overlay-background;
+  background-color: rgba($black, 0.45);
   text-transform: uppercase;
   font-size: 11px;
   font-weight: 500;

app/javascript/flavours/glitch/styles/components/local_settings.scss

@@ -56,15 +56,21 @@
   padding: 15px 20px;
   color: inherit;
   background: lighten($ui-secondary-color, 8%);
+  border: 0;
   border-bottom: 1px $ui-secondary-color solid;
   cursor: pointer;
   text-decoration: none;
   outline: none;
   transition: background 0.3s;
+  box-sizing: border-box;
+  width: 100%;
+  text-align: start;
+  font-size: inherit;
 
   .text-icon-button {
     color: inherit;
     transition: unset;
+    unicode-bidi: embed;
   }
 
   &:hover {

app/javascript/flavours/glitch/styles/components/status.scss

@@ -175,8 +175,7 @@
 
 .notif-cleaning {
   .status,
-  .notification-follow,
-  .notification-follow-request {
+  .notification {
     padding-inline-end: ($dismiss-overlay-width + 0.5rem);
   }
 }