Merge remote-tracking branch 'parent/main' into kb_migration

2023-09-03 10:55:46 +09:00 · 2023-09-03 10:55:46 +09:00 · 32cfd20257
commit 32cfd20257
parent 0e0e9e383b 728eb6a153
54 changed files with 1045 additions and 138 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -143,6 +143,11 @@ $content-width: 840px;
        }
      }

+      .warning a {
+        color: $gold-star;
+        font-weight: 700;
+      }
+
      .simple-navigation-active-leaf a {
        color: $primary-text-color;
        background-color: $ui-highlight-color;