Merge pull request mui#1575 from TrySpace/master

oliviertassinari · oliviertassinari · commit b7e4cd6e4784 · 2015-10-21T20:19:36.000+02:00
[FloatingActionButton] add iconStyle prop
diff --git a/src/floating-action-button.jsx b/src/floating-action-button.jsx
@@ -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}>
