luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-22 23:03:23 +00:00
Code Issues Projects Releases Wiki Activity

Updated glitch files to use the new Avatar class correctly

Browse source
This commit is contained in:
Ondřej Hruška 2017-08-06 20:59:53 +02:00
parent 811d895f7b
commit 7de0fa698d
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/glitch/components/account/header.js
View file

@ -194,11 +194,7 @@ Here, we render our component using all the things we've defined above.
<div>
<a href={account.get('url')} target='_blank' rel='noopener'>
<span className='account__header__avatar'>
<Avatar
src={account.get('avatar')}
staticSrc={account.get('avatar_static')}
size={90}
/>
<Avatar account={account} size={90} />
</span>
<span
className='account__header__display-name'

11
app/javascript/glitch/components/status/header.js
View file

@ -216,16 +216,9 @@ if we have a `friend` and a normal `<Avatar>` if we don't.
>
<div className='status__avatar'>{
friend ? (
<AvatarOverlay
staticSrc={account.get('avatar_static')}
overlaySrc={friend.get('avatar_static')}
/>
<AvatarOverlay account={account} friend={friend} />
) : (
<Avatar
src={account.get('avatar')}
staticSrc={account.get('avatar_static')}
size={48}
/>
<Avatar account={account} size={48} />
)
}</div>
<DisplayName account={account} />