Skip to content

Commit

Permalink
[FormHelperText] Error styles should override disabled styles (#13217)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewdordal authored and oliviertassinari committed Oct 16, 2018
1 parent 10e01bf commit b784369
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/material-ui/src/FormHelperText/FormHelperText.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ export const styles = theme => ({
lineHeight: '1em',
minHeight: '1em',
margin: 0,
'&$error': {
color: theme.palette.error.main,
},
'&$disabled': {
color: theme.palette.text.disabled,
},
'&$error': {
color: theme.palette.error.main,
},
},
/* Styles applied to the root element if `error={true}`. */
error: {},
Expand Down

0 comments on commit b784369

Please sign in to comment.