diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-08-13 10:27:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-13 10:27:53 -0700 |
| commit | b39c6e08832cecedc95047b00280c2240461f83b (patch) | |
| tree | d6230b65e9f487568f0714bc940af2f13183a39c /web/src/js/components/common/Button.jsx | |
| parent | 9da55e20477f10155fb79ba66fdc21cca760e40d (diff) | |
| parent | 8b43972b95f002e8a5d8a85b7a53f43f16711362 (diff) | |
| download | mitmproxy-b39c6e08832cecedc95047b00280c2240461f83b.tar.gz mitmproxy-b39c6e08832cecedc95047b00280c2240461f83b.tar.bz2 mitmproxy-b39c6e08832cecedc95047b00280c2240461f83b.zip | |
Merge pull request #1441 from mitmproxy/integrate_mitmproxy_contentviews
Integrate mitmproxy contentviews
Diffstat (limited to 'web/src/js/components/common/Button.jsx')
| -rw-r--r-- | web/src/js/components/common/Button.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx index cd01af22..bfbb455d 100644 --- a/web/src/js/components/common/Button.jsx +++ b/web/src/js/components/common/Button.jsx @@ -1,4 +1,5 @@ import React, { PropTypes } from 'react' +import classnames from 'classnames' Button.propTypes = { onClick: PropTypes.func.isRequired, @@ -6,9 +7,9 @@ Button.propTypes = { icon: PropTypes.string } -export default function Button({ onClick, text, icon, disabled }) { +export default function Button({ onClick, text, icon, disabled, className }) { return ( - <div className={"btn btn-default"} + <div className={classnames(className, 'btn btn-default')} onClick={onClick} disabled={disabled}> {icon && (<i className={"fa fa-fw " + icon}/> )} |