Skip to content

Commit

Permalink
Merge pull request mui#3515 from ffxsam/raised-button-color-fixes
Browse files Browse the repository at this point in the history
[RaisedButton] backgroundColor prop was previously ignored
  • Loading branch information
alitaheri committed Feb 28, 2016
2 parents 66ba7f6 + 76ef283 commit e8ac347
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/raised-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ function getStyles(props, state) {
} else if (secondary) {
backgroundColor = raisedButton.secondaryColor;
labelColor = raisedButton.secondaryTextColor;
} else {
if (props.backgroundColor) {
backgroundColor = props.backgroundColor;
}
if (props.labelColor) {
labelColor = props.labelColor;
}
}

return {
Expand Down

0 comments on commit e8ac347

Please sign in to comment.