logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 98de6927f39f5d0cd6637779c76da016dc510769
parent: 337462aa5e68014aa15788e4513e190b2e434d7e
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 19 Sep 2016 23:28:22 +0200

Remove background mask from avatars

Diffstat:

Mapp/assets/javascripts/components/components/avatar.jsx2+-
Mapp/assets/javascripts/components/features/account/components/header.jsx2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/components/avatar.jsx b/app/assets/javascripts/components/components/avatar.jsx @@ -11,7 +11,7 @@ const Avatar = React.createClass({ render () { return ( - <div style={{ width: `${this.props.size}px`, height: `${this.props.size}px`, borderRadius: '4px', overflow: 'hidden' }} className='transparent-background'> + <div 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> ); diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx @@ -18,7 +18,7 @@ const Header = React.createClass({ return ( <div style={{ flex: '0 0 auto', background: '#2f3441', textAlign: 'center', backgroundImage: `url(${account.get('header')})`, backgroundSize: 'cover' }}> <div style={{ background: 'rgba(47, 52, 65, 0.8)', padding: '30px 10px' }}> - <div style={{ width: '90px', margin: '0 auto', marginBottom: '15px', borderRadius: '90px', overflow: 'hidden' }} className='transparent-background'> + <div style={{ width: '90px', margin: '0 auto', marginBottom: '15px' }}> <img src={account.get('avatar')} alt='' style={{ display: 'block', width: '90px', height: '90px', borderRadius: '90px' }} /> </div>