Merge pull request #1641 from crazyserver/MOBILE-2765

Mobile 2765
main
Juan Leyva 2018-12-03 16:25:36 +01:00 committed by GitHub
commit 4ff2686617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 1 deletions

View File

@ -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>

View File

@ -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;
}
}

View File

@ -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 {

View File

@ -1,4 +1,7 @@
ion-app.app-root page-core-viewer-iframe {
.scroll-content {
overflow: hidden;
}
core-loading .core-loading-content {
height: 100%;
}