about summary refs log tree commit diff
path: root/app/assets/javascripts/components/components/avatar.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/components/components/avatar.jsx')
-rw-r--r--app/assets/javascripts/components/components/avatar.jsx5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/components/avatar.jsx b/app/assets/javascripts/components/components/avatar.jsx
index 6177683ba..687aa7bb9 100644
--- a/app/assets/javascripts/components/components/avatar.jsx
+++ b/app/assets/javascripts/components/components/avatar.jsx
@@ -4,14 +4,15 @@ const Avatar = React.createClass({
 
   propTypes: {
     src: React.PropTypes.string.isRequired,
-    size: React.PropTypes.number.isRequired
+    size: React.PropTypes.number.isRequired,
+    style: React.PropTypes.object
   },
 
   mixins: [PureRenderMixin],
 
   render () {
     return (
-      <div style={{ width: `${this.props.size}px`, height: `${this.props.size}px` }}>
+      <div style={{ ...this.props.style, width: `${this.props.size}px`, height: `${this.props.size}px` }}>
         <img src={this.props.src} width={this.props.size} height={this.props.size} alt='' style={{ display: 'block', borderRadius: '4px' }} />
       </div>
     );