From 26b7c3f3779a991bad29ea06aad90975bb97999b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 30 Nov 2018 13:52:14 +0100
Subject: [PATCH 1/2] 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%;
     }

From 989123bc9e849e12914a5c07ca440cb81312b8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 3 Dec 2018 12:35:39 +0100
Subject: [PATCH 2/2] MOBILE-2765 page: Fix iframe embedding on page module

---
 .../page/components/index/addon-mod-page-index.html    |  2 +-
 src/addon/mod/page/components/index/index.scss         | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/addon/mod/page/components/index/index.scss

diff --git a/src/addon/mod/page/components/index/addon-mod-page-index.html b/src/addon/mod/page/components/index/addon-mod-page-index.html
index 8572f4d64..4f99c5dac 100644
--- a/src/addon/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addon/mod/page/components/index/addon-mod-page-index.html
@@ -16,7 +16,7 @@
 
     <div padding>
         <core-format-text [component]="component" [componentId]="componentId" [text]="contents"></core-format-text>
-        <p class="addon-mod_page-timemodified" *ngIf="displayTimemodified && page && page.timemodified">
+        <p padding-bottom class="addon-mod_page-timemodified" *ngIf="displayTimemodified && page && page.timemodified">
             {{ 'core.lastmodified' | translate}}: {{ page.timemodified * 1000 | coreFormatDate: "dfmediumdate" }}
         </p>
     </div>
diff --git a/src/addon/mod/page/components/index/index.scss b/src/addon/mod/page/components/index/index.scss
new file mode 100644
index 000000000..e1837f5ea
--- /dev/null
+++ b/src/addon/mod/page/components/index/index.scss
@@ -0,0 +1,10 @@
+addon-mod-page-index {
+    /* Solves iframe height */
+    .core-loading-content > div[padding] {
+        height: 100%;
+    }
+
+    core-format-text > .no-overflow {
+        display: inline;
+    }
+}
\ No newline at end of file