Merge pull request #2869 from dpalou/MOBILE-3320

Mobile 3320
main
Pau Ferrer Ocaña 2021-07-05 11:27:23 +02:00 committed by GitHub
commit 85d730791c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 13 deletions

View File

@ -23,10 +23,10 @@ before_install:
- npm --version - npm --version
- nvm --version - nvm --version
- npm ci - npm ci
- npm install npm@^6 gulp -g - npm install npm@^6 -g
before_script: before_script:
- gulp - npx gulp
script: script:
- scripts/build.sh - scripts/build.sh

6
package-lock.json generated
View File

@ -538,9 +538,9 @@
} }
}, },
"@angular/animations": { "@angular/animations": {
"version": "11.0.1", "version": "10.0.14",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.0.1.tgz", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz",
"integrity": "sha512-RS2ZsO3yidn/dMAllR+V0EX5BOQLQDi5s2kvd4wANHYAkU/yVXWKl09nbe8LTwLVH+iOYX7AAcAUUokQPEEHxQ==", "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }

View File

@ -37,7 +37,7 @@
"ionic:build:before": "gulp" "ionic:build:before": "gulp"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "11.0.1", "@angular/animations": "10.0.14",
"@angular/common": "10.0.14", "@angular/common": "10.0.14",
"@angular/core": "10.0.14", "@angular/core": "10.0.14",
"@angular/forms": "10.0.14", "@angular/forms": "10.0.14",

View File

@ -33,7 +33,7 @@
</ion-note> </ion-note>
</p> </p>
<p> <p>
<ion-note class="ion-float-end ion-padding-start ion-text-end"> <ion-note class="ion-float-end ion-text-end">
{{entry.created | coreDateDayOrTime}} {{entry.created | coreDateDayOrTime}}
</ion-note> </ion-note>
{{entry.user && entry.user!.fullname}} {{entry.user && entry.user!.fullname}}

View File

@ -18,7 +18,7 @@
</core-navbar-buttons> </core-navbar-buttons>
<!-- Content. --> <!-- Content. -->
<core-loading [hideUntil]="loaded" class="safe-area-page"> <core-loading [hideUntil]="loaded" class="safe-area-page core-loading-fullheight">
<!-- Activity info. --> <!-- Activity info. -->
<core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true" <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"

View File

@ -13,7 +13,7 @@
</core-navbar-buttons> </core-navbar-buttons>
<!-- Content. --> <!-- Content. -->
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded" class="core-loading-fullheight">
<!-- Activity info. --> <!-- Activity info. -->
<core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true" <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"

View File

@ -38,7 +38,7 @@
<p class="item-heading">{{ notification.subject }}</p> <p class="item-heading">{{ notification.subject }}</p>
<p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p> <p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p>
</ion-label> </ion-label>
<ion-note slot="end" class="ion-float-end ion-padding-start ion-text-end"> <ion-note slot="end" class="ion-float-end ion-text-end">
{{ notification.timecreated | coreDateDayOrTime }} {{ notification.timecreated | coreDateDayOrTime }}
<span *ngIf="!notification.timeread"> <span *ngIf="!notification.timeread">
<ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon> <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>

View File

@ -43,7 +43,7 @@
<ng-container *ngFor="let item of customItems"> <ng-container *ngFor="let item of customItems">
<ion-item button *ngIf="item.type != 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link <ion-item button *ngIf="item.type != 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
[capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true" [capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true"
[detailIcon]="item.type == 'browser' ? 'open-outline' : null"> [detailIcon]="item.type == 'browser' ? 'open-outline' : 'chevron-forward'">
<ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon> <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
<ion-label> <ion-label>
<p class="item-heading">{{item.label}}</p> <p class="item-heading">{{item.label}}</p>

View File

@ -17,7 +17,7 @@
<h2>{{ rating.userfullname }}</h2> <h2>{{ rating.userfullname }}</h2>
<p>{{ rating.rating }}</p> <p>{{ rating.rating }}</p>
</ion-label> </ion-label>
<ion-note slot="end" class="ion-padding-start" *ngIf="rating.timemodified"> <ion-note slot="end" *ngIf="rating.timemodified">
{{ rating.timemodified | coreDateDayOrTime }} {{ rating.timemodified | coreDateDayOrTime }}
</ion-note> </ion-note>
</ion-item> </ion-item>

View File

@ -7,7 +7,7 @@
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<core-loading [hideUntil]="finalUrl"> <core-loading [hideUntil]="finalUrl" class="core-loading-fullheight">
<core-iframe *ngIf="finalUrl" [src]="finalUrl"></core-iframe> <core-iframe *ngIf="finalUrl" [src]="finalUrl"></core-iframe>
</core-loading> </core-loading>
</ion-content> </ion-content>