diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
commit | b81710c02c9d8f27d417aa11b288a5b4e32bd5d5 (patch) | |
tree | 2f5ba10c2eb3c667dab2dfdb77c3d1724677ce87 /app/javascript/mastodon/features | |
parent | d1255ab8a5101bc04af4a5214f975edf443a37d9 (diff) | |
parent | 7f1c56954b46b26b4dadfa92047f1ee5d7f9ad0a (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
Diffstat (limited to 'app/javascript/mastodon/features')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 0b4431d62..4647b98b2 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -340,7 +340,7 @@ class Header extends ImmutablePureComponent { {account.get('id') !== me && !suspended && <AccountNoteContainer account={account} />} - {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={content} className='translate' />} + {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content translate' dangerouslySetInnerHTML={content} />} </div> {!suspended && ( diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js index 856383893..a1d5c420c 100644 --- a/app/javascript/mastodon/features/compose/components/reply_indicator.js +++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js @@ -56,7 +56,7 @@ class ReplyIndicator extends ImmutablePureComponent { </a> </div> - <div className='reply-indicator__content' dangerouslySetInnerHTML={content} /> + <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} /> {status.get('media_attachments').size > 0 && ( <AttachmentList diff --git a/app/javascript/mastodon/features/directory/components/account_card.js b/app/javascript/mastodon/features/directory/components/account_card.js index 419ab9e11..e37733828 100644 --- a/app/javascript/mastodon/features/directory/components/account_card.js +++ b/app/javascript/mastodon/features/directory/components/account_card.js @@ -241,7 +241,7 @@ class AccountCard extends ImmutablePureComponent { <div className='directory__card__extra' ref={this.setRef}> <div - className='account__header__content' + className='account__header__content translate' dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }} /> </div> diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js index a3b524db1..8269f5ae4 100644 --- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js +++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js @@ -35,7 +35,7 @@ class AccountAuthorize extends ImmutablePureComponent { <DisplayName account={account} /> </Permalink> - <div className='account__header__content' dangerouslySetInnerHTML={content} /> + <div className='account__header__content translate' dangerouslySetInnerHTML={content} /> </div> <div className='account--panel'> |