From 3e12c236871c102a058744008c745668edecd987 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Nov 16 2017 16:56:02 +0000 Subject: [PATCH 1/2] Spinner: allow passing CSS classes --- diff --git a/hubs/static/client/app/components/Spinner/index.js b/hubs/static/client/app/components/Spinner/index.js index 4979621..28776e3 100644 --- a/hubs/static/client/app/components/Spinner/index.js +++ b/hubs/static/client/app/components/Spinner/index.js @@ -10,10 +10,10 @@ export default class Spinner extends React.Component { render() { let img, className; if (this.props.circle) { - className = "SpinnerCircle"; + className = `SpinnerCircle ${this.props.className}`; img = SpinnerCircleImg; } else { - className = "Spinner"; + className = `Spinner ${this.props.className}`; img = SpinnerImg; } return ( @@ -24,8 +24,10 @@ export default class Spinner extends React.Component { } } Spinner.propTypes = { - circle: PropTypes.bool + circle: PropTypes.bool, + className: PropTypes.string, } Spinner.defaultProps = { - circle: false + circle: false, + className: "", } From ff877aa52d6ce5ed5da34d7ceeef66be5445c02f Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Nov 16 2017 16:56:03 +0000 Subject: [PATCH 2/2] Spinner: fix CSS --- diff --git a/hubs/static/client/app/components/Spinner/Spinner.css b/hubs/static/client/app/components/Spinner/Spinner.css index 97b52cb..9a7ba7c 100644 --- a/hubs/static/client/app/components/Spinner/Spinner.css +++ b/hubs/static/client/app/components/Spinner/Spinner.css @@ -3,6 +3,9 @@ height: 10px; vertical-align: bottom; } +.Spinner img { + display: block; +} .SpinnerCircle { width: 32px;