From e4bc3e1120f557bd3faa7040e4109779af117b45 Mon Sep 17 00:00:00 2001 From: Rijul Aggarwal Date: Mon, 12 Dec 2016 22:21:40 -0500 Subject: [PATCH 1/2] Icon support for other libraries --- demo/index.js | 2 +- src/main-button.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/demo/index.js b/demo/index.js index 476d1c9..bd9b17d 100644 --- a/demo/index.js +++ b/demo/index.js @@ -20,7 +20,7 @@ var effect = 'zoomin', function renderMenu(){ var component = ( - + - - + {this.props.iconResting} + {this.props.iconActive} ); } else { return ( - - + {this.props.iconResting} + {this.props.iconActive} ); } From 8eb86eda540d93c90aaf9ab284382562914b87f1 Mon Sep 17 00:00:00 2001 From: Rijul Aggarwal Date: Mon, 12 Dec 2016 23:38:45 -0500 Subject: [PATCH 2/2] icon support for child buttons --- demo/index.js | 6 +++--- src/child-button.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/index.js b/demo/index.js index bd9b17d..1d27c51 100644 --- a/demo/index.js +++ b/demo/index.js @@ -23,15 +23,15 @@ function renderMenu(){ diff --git a/src/child-button.js b/src/child-button.js index 5880868..2bbf32f 100644 --- a/src/child-button.js +++ b/src/child-button.js @@ -15,7 +15,7 @@ var ChildButton = React.createClass({ }, render: function(){ - var iconClass = classnames('mfb-component__child-icon', this.props.icon); + var iconClass = classnames('mfb-component__child-icon', this.props.iconClass); var className = classnames('mfb-component__button--child', this.props.className, {"mfb-component__button--disabled": this.props.disabled}); @@ -25,7 +25,7 @@ var ChildButton = React.createClass({ data-mfb-label={this.props.label} onClick={this.handleOnClick} className={className}> - + {this.props.icon} );