From 26b7c3f3779a991bad29ea06aad90975bb97999b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 30 Nov 2018 13:52:14 +0100 Subject: [PATCH] MOBILE-2765 iframe: Iframe viewer should occupy full height --- src/components/loading/loading.ts | 6 ++++++ src/core/viewer/pages/iframe/iframe.scss | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts index 293ff885b..21cb4e92f 100644 --- a/src/components/loading/loading.ts +++ b/src/components/loading/loading.ts @@ -67,6 +67,12 @@ export class CoreLoadingComponent implements OnInit, OnChanges { // Default loading message. this.message = this.translate.instant('core.loading'); } + + // Add class if loaded on init. + if (this.hideUntil) { + this.element.classList.add('core-loading-loaded'); + this.content.nativeElement.classList.add('core-loading-content'); + } } ngOnChanges(changes: { [name: string]: SimpleChange }): void { diff --git a/src/core/viewer/pages/iframe/iframe.scss b/src/core/viewer/pages/iframe/iframe.scss index 9c2fa5108..f28277b37 100644 --- a/src/core/viewer/pages/iframe/iframe.scss +++ b/src/core/viewer/pages/iframe/iframe.scss @@ -1,4 +1,7 @@ ion-app.app-root page-core-viewer-iframe { + .scroll-content { + overflow: hidden; + } core-loading .core-loading-content { height: 100%; }