diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-12 11:39:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 11:39:55 +0200 |
| commit | db2f6fa49b1a704c66be3f0ea04a440cde80cf50 (patch) | |
| tree | 705571dd7a856c57f23dfd02917c115a887ca525 /app/javascript/flavours/glitch/features/ui | |
| parent | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (diff) | |
| parent | 671a95c545bf7b47d74e1021b76d17bbf44cc5cc (diff) | |
Merge pull request #1535 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/report_modal.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js index 915e26718..893e76585 100644 --- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js @@ -309,7 +309,7 @@ class FocalPointModal extends ImmutablePureComponent { return ( <div className='modal-root__modal report-modal' style={{ maxWidth: 960 }}> <div className='report-modal__target'> - <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} /> + <IconButton className='report-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={20} /> <FormattedMessage id='upload_modal.edit_media' defaultMessage='Edit media' /> </div> diff --git a/app/javascript/flavours/glitch/features/ui/components/report_modal.js b/app/javascript/flavours/glitch/features/ui/components/report_modal.js index 9016b08d7..5cb7c5d07 100644 --- a/app/javascript/flavours/glitch/features/ui/components/report_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.js @@ -91,7 +91,7 @@ class ReportModal extends ImmutablePureComponent { return ( <div className='modal-root__modal report-modal'> <div className='report-modal__target'> - <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} /> + <IconButton className='report-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={20} /> <FormattedMessage id='report.target' defaultMessage='Report {target}' values={{ target: <strong>{account.get('acct')}</strong> }} /> </div> |