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

2025-03-28 08:44:30 +09:00 · 2025-03-28 08:44:30 +09:00 · 12ed20b6d5
commit 12ed20b6d5
parent a24031b527 0479efdbb6
257 changed files with 3505 additions and 2010 deletions
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@ -1,3 +1,6 @@
+@use 'variables' as *;
+@use 'functions' as *;
+
 .emoji-mart {
  font-size: 13px;
  display: inline-block;