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

app/javascript/styles/mastodon/admin.scss

@@ -411,7 +411,7 @@ $content-width: 840px;
         display: flex;
       }
 
-      & > ul {
+      & > nav > ul {
         display: none;
 
         &.visible {

app/javascript/styles/mastodon/components.scss

@@ -1613,7 +1613,6 @@ body > [data-popper-placement] {
   font-size: 15px;
   line-height: 22px;
   height: 40px;
-  order: 2;
   flex: 0 0 auto;
   color: var(--color-text-secondary);
 }
@@ -1666,7 +1665,6 @@ body > [data-popper-placement] {
 
 .status__quote-cancel {
   align-self: self-start;
-  order: 5;
 }
 
 .status__info {
@@ -10778,6 +10776,7 @@ noscript {
     -webkit-box-orient: vertical;
     max-height: 2 * 20px;
     overflow: hidden;
+    overflow-wrap: anywhere;
 
     p {
       margin-bottom: 0;