Skip to content

Commit 7cdb06c

Browse files
committed
MOBILE-3401 login: Fix site logo show on fixed sites
1 parent 8f85933 commit 7cdb06c

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

src/core/login/login.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,8 @@ ion-app.app-root page-core-login-site {
9393
}
9494

9595
.core-login-site-logo {
96-
margin-top: 5px;
97-
margin-bottom: 5px;
98-
img {
99-
width: 90%;
100-
max-width: 300px;
101-
}
96+
width: 90%;
97+
max-width: 300px;
98+
margin: 5px auto;
10299
}
103100
}

src/core/login/pages/credentials/credentials.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div text-wrap text-center margin-bottom>
1515
<div class="core-login-site-logo">
1616
<!-- Show site logo or a default image. -->
17-
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation">
17+
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'">
1818
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
1919
</div>
2020

src/core/login/pages/reconnect/reconnect.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<div class="core-login-site-logo" *ngIf="!showSiteAvatar">
1616
<!-- Show site logo or a default image. -->
17-
<img *ngIf="logoUrl" [src]="logoUrl" core-external-content [siteId]="siteId" role="presentation">
17+
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'">
1818
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
1919
</div>
2020

src/core/login/pages/reconnect/reconnect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ export class CoreLoginReconnectPage {
105105
// Check logoURL if user avatar is not set.
106106
if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
107107
this.showSiteAvatar = false;
108-
this.logoUrl = this.loginHelper.getLogoUrl(config);
109108
}
109+
this.logoUrl = this.loginHelper.getLogoUrl(config);
110110

111111
this.getDataFromConfig(this.siteConfig);
112112
}).catch(() => {

src/core/login/pages/site/site.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ ion-app.app-root page-core-login-site {
5454
&.hidden {
5555
opacity: 0;
5656
visibility: hidden;
57-
margin: 0;
57+
margin-top: 0;
58+
margin-bottom: 0;
5859
padding: 0;
5960
max-height: 0;
6061
}

0 commit comments

Comments
 (0)