Skip to content

Commit

Permalink
Merge pull request #1575 from TrySpace/master
Browse files Browse the repository at this point in the history
[FloatingActionButton] add iconStyle prop
  • Loading branch information
oliviertassinari committed Oct 21, 2015
2 parents cbca4f3 + adc5a8c commit b7e4cd6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/floating-action-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ const FloatingActionButton = React.createClass({
disabled={disabled}
style={this.mergeStyles(
styles.container,
this.props.mini && styles.containerWhenMini
this.props.mini && styles.containerWhenMini,
iconStyle
)}
focusRippleColor={styles.icon.color}
touchRippleColor={styles.icon.color}>
Expand Down

0 comments on commit b7e4cd6

Please sign in to comment.