Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream

2023-07-30 15:54:34 +02:00
parent 450f75b6f7 1814990a3d
commit 454d8567d4
259 changed files with 1455 additions and 1989 deletions
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
@ -128,7 +128,11 @@ export default class MediaItem extends ImmutablePureComponent {
        <div className='media-gallery__gifv'>
          {content}

-          {label && <span className='media-gallery__gifv__label'>{label}</span>}
+          {label && (
+            <div className='media-gallery__item__badges'>
+              <span className='media-gallery__gifv__label'>{label}</span>
+            </div>
+          )}
        </div>
      );
    }