ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dialog close button (#16219) 

* Fix dialog close button being white on almost white

* Make dialog close button slightly bigger
rebase/4.0.0rc2
Mélanie Chauvel 2021-05-11 21:15:57 +02:00 committed by GitHub
parent 5ed5f62705
commit 0464240f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/mastodon/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/mastodon/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/styles/mastodon/components.scss
View File

@ -5297,9 +5297,10 @@ a.status-card.compact:hover {
.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;
} }
} }