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

2024-10-09 12:32:11 +09:00 · 2024-10-09 12:32:11 +09:00 · d021659cb7
commit d021659cb7
parent c1dcc6bfc6 258dce1256
130 changed files with 1120 additions and 917 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -1029,6 +1029,12 @@ a.name-tag,
  color: var(--user-role-accent);
 }

+.applications-list {
+  .icon {
+    vertical-align: middle;
+  }
+}
+
 .announcements-list,
 .filters-list {
  border: 1px solid var(--background-border-color);