Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream

2023-09-15 20:57:40 +02:00
parent 526f457ebc 398635c0c4
commit 5d8c65f2a7
21 changed files with 123 additions and 49 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -836,7 +836,7 @@ body > [data-popper-placement] {
  }

  p {
-    margin-bottom: 20px;
+    margin-bottom: 22px;
    white-space: pre-wrap;
    unicode-bidi: plaintext;