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

2024-10-05 09:10:58 +09:00 · 2024-10-05 09:10:58 +09:00 · 66bed31dbe
commit 66bed31dbe
parent 294acdfd94 c40ab43dc7
226 changed files with 2688 additions and 1846 deletions
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@ -170,6 +170,7 @@ body {
          width: 100%;
          height: auto;
          margin-top: -120px;
+          margin-bottom: -45px;
        }
      }