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

Add close modal icon to report dialog (#6591) 

Port 9769285278 to glitch-soc flavour
lolsob-rspec
Thibaut Girka 2018-03-12 19:32:47 +01:00
parent 15563f8421
commit 8e7394c876
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,10 @@ import { OrderedSet } from 'immutable';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import Button from 'flavours/glitch/components/button'; import Button from 'flavours/glitch/components/button';
import Toggle from 'react-toggle'; import Toggle from 'react-toggle';
import IconButton from '../../../components/icon_button';
const messages = defineMessages({ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' }, placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
submit: { id: 'report.submit', defaultMessage: 'Submit' }, submit: { id: 'report.submit', defaultMessage: 'Submit' },
}); });
@ -72,7 +74,7 @@ export default class ReportModal extends ImmutablePureComponent {
} }
render () { render () {
const { account, comment, intl, statusIds, isSubmitting, forward } = this.props; const { account, comment, intl, statusIds, isSubmitting, forward, onClose } = this.props;
if (!account) { if (!account) {
return null; return null;
@ -83,6 +85,7 @@ export default 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} />
<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>

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

@ -615,6 +615,11 @@
.report-modal__target { .report-modal__target {
padding: 20px; padding: 20px;
.media-modal__close {
top: 19px;
right: 15px;
}
} }
.actions-modal { .actions-modal {