Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)

Browse source 
* 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
This commit is contained in:
Ondřej Hruška 2017-08-07 19:44:55 +02:00 • committed by Eugen Rochko
parent 22db947225
commit 5942347407
13 changed files with 82 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/account.js
View file

@ -70,7 +70,7 @@ export default class Account extends ImmutablePureComponent {
<div className='account'>
<div className='account__wrapper'>
<Permalink key={account.get('id')} className='account__display-name' href={account.get('url')} to={`/accounts/${account.get('id')}`}>
<div className='account__avatar-wrapper'><Avatar src={account.get('avatar')} staticSrc={account.get('avatar_static')} size={36} /></div>
<div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
<DisplayName account={account} />
</Permalink>