mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-22 15:17:53 -05:00
Subcategories and deadends work
This commit is contained in:
parent
010ee42a99
commit
22bed516f5
2 changed files with 10 additions and 3 deletions
|
@ -2,6 +2,7 @@ const bindAll = require('lodash.bindall');
|
||||||
const PropTypes = require('prop-types');
|
const PropTypes = require('prop-types');
|
||||||
const React = require('react');
|
const React = require('react');
|
||||||
const connect = require('react-redux').connect;
|
const connect = require('react-redux').connect;
|
||||||
|
const FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
|
||||||
const FormattedMessage = require('react-intl').FormattedMessage;
|
const FormattedMessage = require('react-intl').FormattedMessage;
|
||||||
const injectIntl = require('react-intl').injectIntl;
|
const injectIntl = require('react-intl').injectIntl;
|
||||||
const intlShape = require('react-intl').intlShape;
|
const intlShape = require('react-intl').intlShape;
|
||||||
|
@ -156,7 +157,7 @@ class ReportModal extends React.Component {
|
||||||
<div className="instructions-header">
|
<div className="instructions-header">
|
||||||
<FormattedMessage {...category.label} />
|
<FormattedMessage {...category.label} />
|
||||||
</div>
|
</div>
|
||||||
<FormattedMessage {...category.prompt} />
|
<FormattedHTMLMessage {...category.prompt} />
|
||||||
</div>
|
</div>
|
||||||
<Select
|
<Select
|
||||||
required
|
required
|
||||||
|
@ -184,7 +185,7 @@ class ReportModal extends React.Component {
|
||||||
<div className="instructions-header">
|
<div className="instructions-header">
|
||||||
<FormattedMessage {...finalCategory.label} />
|
<FormattedMessage {...finalCategory.label} />
|
||||||
</div>
|
</div>
|
||||||
<FormattedMessage {...finalCategory.prompt} />
|
<FormattedHTMLMessage {...finalCategory.prompt} />
|
||||||
</div>
|
</div>
|
||||||
<TextArea
|
<TextArea
|
||||||
autoFocus
|
autoFocus
|
||||||
|
@ -224,7 +225,7 @@ class ReportModal extends React.Component {
|
||||||
submitEnabled
|
submitEnabled
|
||||||
nextLabel={{id: 'general.close'}}
|
nextLabel={{id: 'general.close'}}
|
||||||
onNext={onRequestClose}
|
onNext={onRequestClose}
|
||||||
>
|
>
|
||||||
<div className="instructions">
|
<div className="instructions">
|
||||||
<div className="instructions-header">
|
<div className="instructions-header">
|
||||||
<FormattedMessage {...finalCategory.label} />
|
<FormattedMessage {...finalCategory.label} />
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
.report-modal-content {
|
.report-modal-content {
|
||||||
margin: 1rem auto;
|
margin: 1rem auto;
|
||||||
width: 80%;
|
width: 80%;
|
||||||
|
font-size: .875rem;
|
||||||
|
|
||||||
|
|
||||||
.instructions {
|
.instructions {
|
||||||
line-height: 1.5rem;
|
line-height: 1.5rem;
|
||||||
|
@ -69,6 +71,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ul {
|
||||||
|
font-size: .875rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.report-modal-field {
|
.report-modal-field {
|
||||||
|
|
Loading…
Reference in a new issue