diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-26 23:21:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 23:21:32 +0100 |
| commit | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (patch) | |
| tree | eeeeeead25872b19b34b31e3ccbd543d3e2fd9b8 /app/javascript/flavours/glitch/features | |
| parent | ca6c62068e35537251cc650c8b2d03a1a2163d06 (diff) | |
| parent | 00e55445b9aa5a399a9f8b76e42fde9da2c399fd (diff) | |
Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.js b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.js index 0fd07c282..37ae9cab9 100644 --- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.js +++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.js @@ -66,7 +66,7 @@ class ReplyIndicator extends ImmutablePureComponent { )} </header> <div - className='content' + className='content translate' dangerouslySetInnerHTML={{ __html: content || '' }} /> {attachments.size > 0 && ( diff --git a/app/javascript/flavours/glitch/features/directory/components/account_card.js b/app/javascript/flavours/glitch/features/directory/components/account_card.js index 2ef9d5ba4..5f952b382 100644 --- a/app/javascript/flavours/glitch/features/directory/components/account_card.js +++ b/app/javascript/flavours/glitch/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/flavours/glitch/features/follow_requests/components/account_authorize.js b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.js index bf145cb67..eb9f3db7e 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.js +++ b/app/javascript/flavours/glitch/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'> |