Skip to content

Commit bef8fb8

Browse files
authored
Merge pull request #4287 from crazyserver/MOBILE-4736
Mobile 4736
2 parents fb8f3a8 + 5c1e71d commit bef8fb8

File tree

12 files changed

+45
-20
lines changed

12 files changed

+45
-20
lines changed

moodle.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
"student": {
7373
"url": "https://school.moodledemo.net",
7474
"username": "student",
75-
"password": "moodle2024"
75+
"password": "moodle25"
7676
},
7777
"teacher": {
7878
"url": "https://school.moodledemo.net",
7979
"username": "teacher",
80-
"password": "moodle2024"
80+
"password": "moodle25"
8181
}
8282
},
8383
"defaultZoomLevel": "none",

src/addons/mod/scorm/services/scorm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const STATUSES = {
6262
};
6363
const STATUS_TO_ICON = {
6464
asset: '', // Empty to show an space.
65-
browsed: 'fas-book',
65+
browsed: 'moodle-browsed',
6666
completed: 'fas-check',
6767
failed: 'fas-xmark',
6868
incomplete: 'fas-pen-to-square',

src/addons/qtype/ordering/component/ordering.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class AddonQtypeOrderingComponent extends CoreQuestionBaseComponent<Addon
7676
const itemContentEl = element.querySelector<HTMLElement>('[data-itemcontent]');
7777
itemContentEl?.querySelector(
7878
'.icon.fa-check, .icon.fa-remove, .icon.fa-check-square, .icon.fa-circle-check, .icon.fa-xmark, ' +
79-
'.icon.fa-circle-xmark, .icon.fa-square-check, .icon.circle-half-stroke',
79+
'.icon.fa-circle-xmark, .icon.fa-square-check, .icon.circle-half-stroke, img.icon[src*="grade_partiallycorrect"]',
8080
)?.remove();
8181

8282
return {

src/assets/fonts/moodle/font-awesome/arrow-turn-down-right.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/core/features/policy/pages/acceptances/acceptances.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ <h1>{{ 'core.policy.policiesagreements' | translate }}</h1>
6666
<ng-template #policyTabletTemplate let-policy="policy" let-isPreviousVersion="isPreviousVersion">
6767
<tr [class.core-policy-previous-version]="isPreviousVersion">
6868
<td class="core-policy-title">
69-
<ion-icon *ngIf="isPreviousVersion" name="fam-arrow-turn-down-right" aria-hidden="true" />
69+
<ion-icon *ngIf="isPreviousVersion" name="moodle-level" aria-hidden="true" />
7070
<ion-icon *ngIf="!isPreviousVersion && policy.previousVersions.length" name="fas-chevron-right" flip-rtl
7171
(ariaButtonClick)="toggle($event, policy)" class="expandable-status-icon"
7272
[class.expandable-status-icon-expanded]="policy.expanded" [attr.aria-expanded]="policy.expanded"
7373
[attr.aria-label]="(policy.expanded ? 'core.collapse' : 'core.expand') | translate" />
74-
<ion-icon *ngIf="!isPreviousVersion && !policy.previousVersions.length" name="fas-circle" color="secondary"
74+
<ion-icon *ngIf="!isPreviousVersion && !policy.previousVersions.length" name="moodle-item" color="secondary"
7575
class="core-policy-icon-bullet" aria-hidden="true" />
7676

7777
<a href="#" (click)="viewFullPolicy($event, policy)">{{ policy.name }}</a>
@@ -180,7 +180,7 @@ <h1>{{ 'core.policy.policiesagreements' | translate }}</h1>
180180
<ng-template #policyMobileTemplate let-policy="policy" let-isPreviousVersion="isPreviousVersion">
181181
<ion-item class="ion-text-wrap core-policy-title">
182182
<div slot="start">
183-
<ion-icon *ngIf="isPreviousVersion" name="fam-arrow-turn-down-right" aria-hidden="true" />
183+
<ion-icon *ngIf="isPreviousVersion" name="moodle-level" aria-hidden="true" />
184184
<ion-icon name="fas-chevron-right" flip-rtl (ariaButtonClick)="toggle($event, policy)" class="expandable-status-icon"
185185
[class.expandable-status-icon-expanded]="policy.expanded" [attr.aria-expanded]="policy.expanded"
186186
[attr.aria-label]="(policy.expanded ? 'core.collapse' : 'core.expand') | translate"

src/core/features/policy/pages/acceptances/acceptances.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@
103103
font-size: 1.125rem;
104104
padding: 13px;
105105
margin: 3px;
106-
107-
&.core-policy-icon-bullet {
108-
font-size: #{dynamic-font(6px)};
109-
width: 18px;
110-
}
111106
}
112107

113108
}

0 commit comments

Comments
 (0)