treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Fix dialog close button 

Port 0464240f19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Mélanie Chauvel 2021-05-11 21:15:57 +02:00 committed by Claire
parent dc58d02192
commit 67c2c0a41e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js
View File

@ -309,7 +309,7 @@ class FocalPointModal extends ImmutablePureComponent {
return ( return (
<div className='modal-root__modal report-modal' style={{ maxWidth: 960 }}> <div className='modal-root__modal report-modal' style={{ maxWidth: 960 }}>
<div className='report-modal__target'> <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' /> <FormattedMessage id='upload_modal.edit_media' defaultMessage='Edit media' />
</div> </div>

2
app/javascript/flavours/glitch/features/ui/components/report_modal.js
View File

@ -91,7 +91,7 @@ class ReportModal extends ImmutablePureComponent {
return ( return (
<div className='modal-root__modal report-modal'> <div className='modal-root__modal report-modal'>
<div className='report-modal__target'> <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> }} /> <FormattedMessage id='report.target' defaultMessage='Report {target}' values={{ target: <strong>{account.get('acct')}</strong> }} />
</div> </div>

7
app/javascript/flavours/glitch/styles/components/modal.scss
View File

@ -847,9 +847,10 @@
.report-modal__target { .report-modal__target {
padding: 15px; padding: 15px;
.media-modal__close { .report-modal__close {
top: 14px; position: absolute;
right: 15px; top: 10px;
right: 10px;
} }
} }