Merge remote-tracking branch 'parent/main' into upstream-20241006

app/javascript/styles/mastodon/admin.scss

@@ -226,6 +226,10 @@ $content-width: 840px;
           gap: 5px;
           white-space: nowrap;
 
+          @media screen and (max-width: $mobile-breakpoint) {
+            flex: 1 0 50%;
+          }
+
           &:hover,
           &:focus,
           &:active {
@@ -1054,6 +1058,10 @@ a.name-tag,
       }
     }
 
+    .icon {
+      vertical-align: middle;
+    }
+
     a.announcements-list__item__title {
       &:hover,
       &:focus,

app/javascript/styles/mastodon/basics.scss

@@ -170,6 +170,7 @@ body {
           width: 100%;
           height: auto;
           margin-top: -120px;
+          margin-bottom: -45px;
         }
       }
 

app/javascript/styles/mastodon/components.scss

@@ -3705,6 +3705,7 @@ $ui-header-logo-wordmark-width: 99px;
   overflow-y: auto;
   width: 100%;
   height: 100%;
+  z-index: 0;
 }
 
 .drawer__inner__mastodon {

app/javascript/styles/mastodon/tables.scss

@@ -137,6 +137,7 @@ a.table-action-link {
   padding: 0 10px;
   color: $darker-text-color;
   font-weight: 500;
+  white-space: nowrap;
 
   &:hover {
     color: $highlight-text-color;