MOBILE-3068 loading: Fix loading styles on blocks and tabs
parent
f23908d522
commit
3e29f2e428
|
@ -1,4 +1,4 @@
|
||||||
<core-loading [hideUntil]="loaded">
|
<core-loading [hideUntil]="loaded" class="core-loading-center">
|
||||||
|
|
||||||
<!-- User and status of the submission. -->
|
<!-- User and status of the submission. -->
|
||||||
<a ion-item text-wrap *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId" [title]="user.fullname">
|
<a ion-item text-wrap *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId" [title]="user.fullname">
|
||||||
|
|
|
@ -61,3 +61,8 @@ ion-app.app-root core-empty-box {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ion-app.app-root core-block-course-blocks core-empty-box .core-empty-box {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,12 +21,14 @@ ion-app.app-root {
|
||||||
|
|
||||||
.scroll-content > core-loading,
|
.scroll-content > core-loading,
|
||||||
ion-content > .scroll-content > core-loading,
|
ion-content > .scroll-content > core-loading,
|
||||||
|
core-tab core-loading,
|
||||||
.core-loading-center {
|
.core-loading-center {
|
||||||
position: static !important;
|
position: static !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.scroll-content > core-loading,
|
.scroll-content > core-loading,
|
||||||
ion-content > .scroll-content > core-loading,
|
ion-content > .scroll-content > core-loading,
|
||||||
|
core-tab core-loading,
|
||||||
.core-loading-center,
|
.core-loading-center,
|
||||||
core-loading.core-loading-loaded {
|
core-loading.core-loading-loaded {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
|
@ -54,18 +54,18 @@
|
||||||
|
|
||||||
<core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
|
<core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
|
||||||
</div>
|
</div>
|
||||||
</core-loading>
|
|
||||||
<ion-buttons padding end class="core-course-section-nav-buttons" *ngIf="displaySectionSelector && sections && sections.length">
|
|
||||||
<button *ngIf="previousSection" ion-button color="light" icon-only (click)="sectionChanged(previousSection)" title="{{ 'core.previous' | translate }}">
|
|
||||||
<ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
|
|
||||||
<core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name"></core-format-text>
|
|
||||||
</button>
|
|
||||||
<button *ngIf="nextSection" ion-button icon-only (click)="sectionChanged(nextSection)" title="{{ 'core.next' | translate }}">
|
|
||||||
<core-format-text class="accesshide" [text]="nextSection.formattedName || nextSection.name"></core-format-text>
|
|
||||||
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
|
|
||||||
</button>
|
|
||||||
</ion-buttons>
|
|
||||||
|
|
||||||
|
<ion-buttons padding end class="core-course-section-nav-buttons" *ngIf="displaySectionSelector && sections && sections.length">
|
||||||
|
<button *ngIf="previousSection" ion-button color="light" icon-only (click)="sectionChanged(previousSection)" title="{{ 'core.previous' | translate }}">
|
||||||
|
<ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
|
||||||
|
<core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name"></core-format-text>
|
||||||
|
</button>
|
||||||
|
<button *ngIf="nextSection" ion-button icon-only (click)="sectionChanged(nextSection)" title="{{ 'core.next' | translate }}">
|
||||||
|
<core-format-text class="accesshide" [text]="nextSection.formattedName || nextSection.name"></core-format-text>
|
||||||
|
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
|
||||||
|
</button>
|
||||||
|
</ion-buttons>
|
||||||
|
</core-loading>
|
||||||
</core-dynamic-component>
|
</core-dynamic-component>
|
||||||
</core-block-course-blocks>
|
</core-block-course-blocks>
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
<core-loading [hideUntil]="dataLoaded">
|
<core-loading [hideUntil]="dataLoaded" class="core-loading-center">
|
||||||
<core-compile-html [text]="content" [javascript]="javascript" [jsData]="jsData" [forceCompile]="forceCompile" #compile></core-compile-html>
|
<core-compile-html [text]="content" [javascript]="javascript" [jsData]="jsData" [forceCompile]="forceCompile" #compile></core-compile-html>
|
||||||
</core-loading>
|
</core-loading>
|
||||||
|
|
Loading…
Reference in New Issue