Merge branch 'missing-header-fix' into develop
This commit is contained in:
commit
a370834894
|
@ -291,7 +291,8 @@ class Header extends ImmutablePureComponent {
|
||||||
const info = this.makeInfo();
|
const info = this.makeInfo();
|
||||||
const menu = this.makeMenu();
|
const menu = this.makeMenu();
|
||||||
|
|
||||||
const headerMissing = (account.get('header').indexOf('/headers/original/missing.png') > -1);
|
const header = account.get('header', '');
|
||||||
|
const headerMissing = !header || ['/images/banner.png', '/headers/original/missing.png'].some(path => header.endsWith(path));
|
||||||
const avatarSize = isSmallScreen ? 90 : 200;
|
const avatarSize = isSmallScreen ? 90 : 200;
|
||||||
const deactivated = !account.getIn(['pleroma', 'is_active'], true);
|
const deactivated = !account.getIn(['pleroma', 'is_active'], true);
|
||||||
|
|
||||||
|
@ -306,7 +307,7 @@ class Header extends ImmutablePureComponent {
|
||||||
<SubscriptionButton account={account} />
|
<SubscriptionButton account={account} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<StillImage src={account.get('header')} alt='' className='parallax' />
|
{header && <StillImage src={account.get('header')} alt='' className='parallax' />}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className='account__header__bar'>
|
<div className='account__header__bar'>
|
||||||
|
|
Loading…
Reference in New Issue