Merge branch 'master' into premod_setting

This commit is contained in:
Kim Gardner
2017-10-30 13:25:14 +00:00
committed by GitHub
2 changed files with 12 additions and 1 deletions
@@ -158,9 +158,16 @@ export default class FlagButton extends Component {
<ClickOutside onClickOutside={this.handleClickOutside}>
<div className={`${name}-container`}>
<button
disabled={flagged}
ref={(ref) => this.flagButton = ref}
onClick={!this.props.banned && !flaggedByCurrentUser && !localPost ? this.onReportClick : null}
className={cn(`${name}-button`, {[`${name}-button-flagged`]: flagged}, styles.button)}>
className={
cn(`${name}-button`, {
[`${name}-button-flagged`]: flagged,
[styles.flaggedButton]: flagged
},
styles.button)}
>
{
flagged
? <span className={`${name}-button-text`}>{t('reported')}</span>
@@ -3,6 +3,10 @@
margin: 5px 0px 5px 10px;
}
button[disabled] {
cursor: default;
}
.flaggedIcon {
color: #f00
}