Skip to content

Commit

Permalink
Merge pull request #1 from TrySpace/TrySpace-FloatingActionButton-ico…
Browse files Browse the repository at this point in the history
…nStyle

add `iconStyle` to EnhancedButton
  • Loading branch information
TrySpace committed Sep 2, 2015
2 parents 28403c3 + 5fc8647 commit adc5a8c
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 @@ -190,7 +190,8 @@ let FloatingActionButton = React.createClass({
disabled={disabled}
style={this.mergeAndPrefix(
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 adc5a8c

Please sign in to comment.