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

2023-08-16 23:03:09 +09:00 · 2023-08-16 23:03:09 +09:00 · 60fc82cde0
commit 60fc82cde0
parent c6fa8f6871 f0862bcf98
3 changed files with 7 additions and 6 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1122,7 +1122,8 @@ body > [data-popper-placement] {
    .audio-player,
    .attachment-list,
    .picture-in-picture-placeholder,
-    .status-card {
+    .status-card,
+    .hashtag-bar {
      margin-inline-start: $thread-margin;
      width: calc(100% - ($thread-margin));
    }