mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09:00
5942347407
* Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop. Also removed animate attribute from compose navigation bar, which should have never been there. Added test for avatar overlay. * fix broken tests * god dammit another bug in tests! travis please let this pass * formatting in avatar overlay
31 lines
857 B
JavaScript
31 lines
857 B
JavaScript
import React from 'react';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
|
|
export default class AvatarOverlay extends React.PureComponent {
|
|
|
|
static propTypes = {
|
|
account: ImmutablePropTypes.map.isRequired,
|
|
friend: ImmutablePropTypes.map.isRequired,
|
|
};
|
|
|
|
render() {
|
|
const { account, friend } = this.props;
|
|
|
|
const baseStyle = {
|
|
backgroundImage: `url(${account.get('avatar_static')})`,
|
|
};
|
|
|
|
const overlayStyle = {
|
|
backgroundImage: `url(${friend.get('avatar_static')})`,
|
|
};
|
|
|
|
return (
|
|
<div className='account__avatar-overlay'>
|
|
<div className='account__avatar-overlay-base' style={baseStyle} data-avatar-of={`@${account.get('acct')}`} />
|
|
<div className='account__avatar-overlay-overlay' style={overlayStyle} data-avatar-of={`@${friend.get('acct')}`} />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|