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

app/javascript/styles/mastodon/components.scss

@@ -11256,21 +11256,17 @@ noscript {
       color: $darker-text-color;
       -webkit-line-clamp: 4;
       -webkit-box-orient: vertical;
-      max-height: 4 * 22px;
+      max-height: none;
       overflow: hidden;
 
-      p {
-        display: none;
-
-        &:first-child {
-          display: initial;
-        }
-      }
-
       p,
       a {
         color: inherit;
       }
+
+      p {
+        margin-bottom: 8px;
+      }
     }
 
     .reply-indicator__attachments {

app/javascript/styles/mastodon/forms.scss

@@ -23,6 +23,8 @@ code {
   position: relative;
   overflow: hidden;
   height: 160px;
+  max-width: 566px;
+  margin-inline: auto;
 
   &::after {
     content: '';

app/javascript/styles/mastodon/rtl.scss

@@ -35,6 +35,10 @@ body.rtl {
     direction: rtl;
   }
 
+  .column-back-button__icon {
+    transform: scale(-1, 1);
+  }
+
   .simple_form select {
     background: $ui-base-color
       url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>")