GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

MOBILE-3149 style: Add spacers

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2022-02-25 16:39:08 +01:00
parent 3a11cdbfe2
commit 521d4cec4b
8 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/addons/mod/feedback/pages/form/form.html
View File

@ -12,9 +12,9 @@
</ion-toolbar>
</ion-header>
<ion-content>
<core-loading [hideUntil]="feedbackLoaded">
<core-loading [hideUntil]="feedbackLoaded" class="has-spacer">
<ng-container *ngIf="items && items.length">
<ion-list class="ion-no-margin">
<ion-list class="ion-no-margin has-spacer">
<ion-item class="ion-text-wrap">
<ion-label>
<h2>{{ 'addon.mod_feedback.mode' | translate }}</h2>
@ -110,7 +110,7 @@
</ng-container>
</ng-container>
<ion-row class="ion-align-items-center" *ngIf="!preview">
<ion-row class="ion-align-items-center spacer-top" *ngIf="!preview">
<ion-col *ngIf="hasPrevPage">
<ion-button expand="block" fill="outline" (click)="gotoPage(true)" class="ion-text-wrap">
<ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>

4
src/addons/mod/quiz/pages/player/player.html
View File

@ -31,7 +31,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<core-loading [hideUntil]="loaded">
<core-loading [hideUntil]="loaded" class="has-spacer">
<!-- Button to start attempting. -->
<ion-button *ngIf="!attempt" expand="block" class="ion-margin" (click)="start()">
{{ 'addon.mod_quiz.startattempt' | translate }}
@ -67,7 +67,7 @@
</form>
<!-- Go to next or previous page. -->
<ion-row *ngIf="questions.length && !quizAborted && !showSummary">
<ion-row *ngIf="questions.length && !quizAborted && !showSummary" class="spacer-top">
<ion-col *ngIf="previousPage >= 0">
<ion-button expand="block" fill="outline" (click)="changePage(previousPage)" class="ion-text-wrap">
<ion-icon name="fas-chevron-left" slot="start" aria-hidden="true"></ion-icon>

6
src/core/components/loading/loading.scss
View File

@ -75,6 +75,12 @@
height: 100%;
}
&.has-spacer .core-loading-content {
min-height: 100%;
display: flex;
flex-direction: column;
}
&.safe-area-padding:not(.core-loading-inline) .core-loading-content,
&.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content {
@include safe-area-padding-horizontal(0px, 0px);

3
src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
View File

@ -1,3 +1,4 @@
<div class="has-spacer">
<ion-card class="core-danger-card">
<ion-item>
<ion-icon name="fas-exclamation-triangle" slot="start" aria-hidden="true"></ion-icon>
@ -11,6 +12,7 @@
</ion-label>
</ion-item>
</ion-card>
<div class="spacer"></div>
<ion-item lines="none" class="ion-text-wrap" *ngIf="module?.url && module?.uservisible">
<ion-label>
<p>{{ 'core.course.useactivityonbrowser' | translate }}</p>
@ -20,3 +22,4 @@
</ion-button>
</ion-label>
</ion-item>
</div>

3
src/core/features/course/components/unsupported-module/unsupported-module.scss Normal file
View File

@ -0,0 +1,3 @@
:host {
display: contents;
}

1
src/core/features/course/components/unsupported-module/unsupported-module.ts
View File

@ -23,6 +23,7 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
@Component({
selector: 'core-course-unsupported-module',
templateUrl: 'core-course-unsupported-module.html',
styleUrls: ['unsupported-module.scss'],
})
export class CoreCourseUnsupportedModuleComponent implements OnInit {

2
src/core/features/course/pages/module-preview/module-preview.html
View File

@ -22,7 +22,7 @@
<ion-refresher slot="fixed" [disabled]="!loaded" (ionRefresh)="doRefresh($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher>
<core-loading [hideUntil]="loaded">
<core-loading [hideUntil]="loaded" class="has-spacer">
<core-course-module-info [module]="module" [courseId]="courseId" [description]="module.description" [component]="module.modname"
[componentId]="module.id" [expandDescription]="true" [showAvailabilityInfo]="true">
<div class="core-module-additional-info" title>

15
src/theme/theme.base.scss
View File

@ -1581,3 +1581,18 @@ body.core-iframe-fullscreen ion-content {
}
.has-spacer {
display: flex;
flex-direction: column;
min-height: 100%;
flex-grow: 1;
.spacer-top {
flex-grow: 1;
align-content: flex-end;
}
.spacer {
flex-grow: 1;
}
}