diff options
Diffstat (limited to 'app/assets/javascripts/components/features/report')
-rw-r--r-- | app/assets/javascripts/components/features/report/components/status_check_box.jsx | 5 | ||||
-rw-r--r-- | app/assets/javascripts/components/features/report/index.jsx | 17 |
2 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/javascripts/components/features/report/components/status_check_box.jsx b/app/assets/javascripts/components/features/report/components/status_check_box.jsx index 4268e5f3d..bc866616a 100644 --- a/app/assets/javascripts/components/features/report/components/status_check_box.jsx +++ b/app/assets/javascripts/components/features/report/components/status_check_box.jsx @@ -14,14 +14,13 @@ class StatusCheckBox extends React.PureComponent { } return ( - <div className='status-check-box' style={{ display: 'flex' }}> + <div className='status-check-box'> <div className='status__content' - style={{ flex: '1 1 auto', padding: '10px' }} dangerouslySetInnerHTML={content} /> - <div style={{ flex: '0 0 auto', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center' }}> + <div className='status-check-box-toggle'> <Toggle checked={checked} onChange={onToggle} disabled={disabled} /> </div> </div> diff --git a/app/assets/javascripts/components/features/report/index.jsx b/app/assets/javascripts/components/features/report/index.jsx index 7b9b202a8..6e3cfcb2a 100644 --- a/app/assets/javascripts/components/features/report/index.jsx +++ b/app/assets/javascripts/components/features/report/index.jsx @@ -34,10 +34,6 @@ const makeMapStateToProps = () => { return mapStateToProps; }; -const textareaStyle = { - marginBottom: '10px' -}; - class Report extends React.PureComponent { constructor (props, context) { @@ -86,30 +82,29 @@ class Report extends React.PureComponent { <Column heading={intl.formatMessage(messages.heading)} icon='flag'> <ColumnBackButtonSlim /> - <div className='report scrollable' style={{ display: 'flex', flexDirection: 'column', maxHeight: '100%', boxSizing: 'border-box' }}> - <div className='report__target' style={{ flex: '0 0 auto', padding: '10px' }}> + <div className='report scrollable'> + <div className='report__target'> <FormattedMessage id='report.target' defaultMessage='Reporting' /> <strong>{account.get('acct')}</strong> </div> - <div style={{ flex: '1 1 auto' }} className='scrollable'> + <div className='scrollable report__statuses'> <div> {statusIds.map(statusId => <StatusCheckBox id={statusId} key={statusId} disabled={isSubmitting} />)} </div> </div> - <div style={{ flex: '0 0 100px', padding: '10px' }}> + <div className='report__textarea-wrapper'> <textarea className='report__textarea' placeholder={intl.formatMessage(messages.placeholder)} value={comment} onChange={this.handleCommentChange} - style={textareaStyle} disabled={isSubmitting} /> - <div style={{ marginTop: '10px', overflow: 'hidden' }}> - <div style={{ float: 'right' }}><Button disabled={isSubmitting} text={intl.formatMessage(messages.submit)} onClick={this.handleSubmit} /></div> + <div className='report__submit'> + <div className='report__submit-button'><Button disabled={isSubmitting} text={intl.formatMessage(messages.submit)} onClick={this.handleSubmit} /></div> </div> </div> </div> |