Merge branch 'configure_logo' into 'admin_cfg'

Fix site logo and banner rendering when no logo or banner is set

See merge request soapbox-pub/soapbox-fe!122
preload
Curtis 2020-08-03 03:19:05 +00:00
commit f87b5d7ab8
2 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -15,7 +15,7 @@ class SiteBanner extends ImmutablePureComponent {
imgLogo: (<img alt={instance.get('title')} src={soapbox.get('banner')} />),
textLogo: (<h1>{instance.get('title')}</h1>),
};
return soapbox.has('banner') ? logos.imgLogo : logos.textLogo;
return soapbox.getIn(['banner']) ? logos.imgLogo : logos.textLogo;
}
}

Wyświetl plik

@ -15,7 +15,7 @@ class SiteLogo extends ImmutablePureComponent {
imgLogo: (<img alt={instance.get('title')} src={soapbox.get('logo')} />),
textLogo: (<h1>{instance.get('title')}</h1>),
};
return soapbox.has('logo') ? logos.imgLogo : logos.textLogo;
return soapbox.getIn(['logo']) ? logos.imgLogo : logos.textLogo;
}
}