From 7cdb06c69f510bf4d6274f136d9ab35a9025d2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 Jun 2020 10:27:20 +0200
Subject: [PATCH] MOBILE-3401 login: Fix site logo show on fixed sites

---
 src/core/login/login.scss                         | 9 +++------
 src/core/login/pages/credentials/credentials.html | 2 +-
 src/core/login/pages/reconnect/reconnect.html     | 2 +-
 src/core/login/pages/reconnect/reconnect.ts       | 2 +-
 src/core/login/pages/site/site.scss               | 3 ++-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/core/login/login.scss b/src/core/login/login.scss
index 2ea9290ef..ea34c1161 100644
--- a/src/core/login/login.scss
+++ b/src/core/login/login.scss
@@ -93,11 +93,8 @@ ion-app.app-root page-core-login-site {
     }
 
     .core-login-site-logo {
-        margin-top: 5px;
-        margin-bottom: 5px;
-        img {
-            width: 90%;
-            max-width: 300px;
-        }
+        width: 90%;
+        max-width: 300px;
+        margin: 5px auto;
     }
 }
diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index 3bcde32fa..eb2eab7ed 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -14,7 +14,7 @@
         <div text-wrap text-center margin-bottom>
             <div class="core-login-site-logo">
                 <!-- 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">
             </div>
 
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index 986354d87..afd1a75da 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -14,7 +14,7 @@
 
         <div class="core-login-site-logo" *ngIf="!showSiteAvatar">
             <!-- 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">
         </div>
 
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index f36a21975..ca2789441 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -105,8 +105,8 @@ export class CoreLoginReconnectPage {
                     // Check logoURL if user avatar is not set.
                     if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
                         this.showSiteAvatar = false;
-                        this.logoUrl = this.loginHelper.getLogoUrl(config);
                     }
+                    this.logoUrl = this.loginHelper.getLogoUrl(config);
 
                     this.getDataFromConfig(this.siteConfig);
                 }).catch(() => {
diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss
index 4ea5a43fe..2cf512a3a 100644
--- a/src/core/login/pages/site/site.scss
+++ b/src/core/login/pages/site/site.scss
@@ -54,7 +54,8 @@ ion-app.app-root page-core-login-site {
         &.hidden {
             opacity: 0;
             visibility: hidden;
-            margin: 0;
+            margin-top: 0;
+            margin-bottom: 0;
             padding: 0;
             max-height: 0;
         }