MOBILE-3401 login: Fix site logo show on fixed sites
parent
8f85933df2
commit
7cdb06c69f
|
@ -93,11 +93,8 @@ ion-app.app-root page-core-login-site {
|
||||||
}
|
}
|
||||||
|
|
||||||
.core-login-site-logo {
|
.core-login-site-logo {
|
||||||
margin-top: 5px;
|
width: 90%;
|
||||||
margin-bottom: 5px;
|
max-width: 300px;
|
||||||
img {
|
margin: 5px auto;
|
||||||
width: 90%;
|
|
||||||
max-width: 300px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<div text-wrap text-center margin-bottom>
|
<div text-wrap text-center margin-bottom>
|
||||||
<div class="core-login-site-logo">
|
<div class="core-login-site-logo">
|
||||||
<!-- Show site logo or a default image. -->
|
<!-- Show site logo or a default image. -->
|
||||||
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation">
|
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'">
|
||||||
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
|
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<div class="core-login-site-logo" *ngIf="!showSiteAvatar">
|
<div class="core-login-site-logo" *ngIf="!showSiteAvatar">
|
||||||
<!-- Show site logo or a default image. -->
|
<!-- Show site logo or a default image. -->
|
||||||
<img *ngIf="logoUrl" [src]="logoUrl" core-external-content [siteId]="siteId" role="presentation">
|
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'">
|
||||||
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
|
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -105,8 +105,8 @@ export class CoreLoginReconnectPage {
|
||||||
// Check logoURL if user avatar is not set.
|
// Check logoURL if user avatar is not set.
|
||||||
if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
|
if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
|
||||||
this.showSiteAvatar = false;
|
this.showSiteAvatar = false;
|
||||||
this.logoUrl = this.loginHelper.getLogoUrl(config);
|
|
||||||
}
|
}
|
||||||
|
this.logoUrl = this.loginHelper.getLogoUrl(config);
|
||||||
|
|
||||||
this.getDataFromConfig(this.siteConfig);
|
this.getDataFromConfig(this.siteConfig);
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
|
|
@ -54,7 +54,8 @@ ion-app.app-root page-core-login-site {
|
||||||
&.hidden {
|
&.hidden {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
margin: 0;
|
margin-top: 0;
|
||||||
|
margin-bottom: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
max-height: 0;
|
max-height: 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue