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

2024-08-13 07:01:38 +09:00 · 2024-08-13 07:01:38 +09:00 · e7ccc0539f
commit e7ccc0539f
parent b787b130a2 b42661ba95
358 changed files with 4653 additions and 4261 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -13,7 +13,7 @@ $content-width: 840px;
  .icon {
    width: 16px;
    height: 16px;
-    vertical-align: middle;
+    vertical-align: top;
    margin: 0 2px;
  }

@ -65,16 +65,16 @@ $content-width: 840px;
          background: $ui-base-color;
        }

-        .fa-times {
+        .material-close {
          display: none;
        }

        &.active {
-          .fa-times {
+          .material-close {
            display: block;
          }

-          .fa-bars {
+          .material-menu {
            display: none;
          }
        }