Merge branch 'main' into glitch-soc/merge

2023-01-02 17:29:59 +01:00
parent 498cde7dc6 41fe7576bf
commit b4aabf3cf1
77 changed files with 2717 additions and 564 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -254,10 +254,8 @@ $content-width: 840px;

      &__actions {
        display: inline-flex;
-
-        & > :not(:first-child) {
-          margin-left: 5px;
-        }
+        flex-flow: wrap;
+        gap: 5px;
      }

      h2 small {