Skip to content

Commit 9cb4819

Browse files
Merge pull request #3513 from dpalou/MOBILE-4081
Mobile 4081
2 parents b49aa35 + 665f3a4 commit 9cb4819

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

src/addons/mod/quiz/pages/player/player.html

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h2 *ngIf="!question.number" class="inline">{{ 'core.question.information' | tra
5252
<div *ngIf="question.status || question.readableMark" slot="end"
5353
class="ion-text-wrap ion-margin-horizontal addon-mod_quiz-question-note">
5454
<p *ngIf="question.status" class="block">{{question.status}}</p>
55-
<p *ngIf="question.readableMark">{{ question.readableMark }}</p>
55+
<p *ngIf="question.readableMark" [innerHTML]="question.readableMark"></p>
5656
</div>
5757
</ion-item-divider>
5858

@@ -149,19 +149,20 @@ <h3 class="item-heading">{{ 'addon.mod_quiz.cannotsubmitquizdueto' | translate }
149149
</ion-button>
150150
</ion-card>
151151

152-
<div collapsible-footer appearOnBottom *ngIf="!quizAborted && showSummary && summaryQuestions.length && loaded" slot="fixed"
153-
class="list-item-limited-width">
154-
<ion-button *ngIf="preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap" [href]="moduleUrl" core-link
155-
[showBrowserWarning]="false">
156-
{{ 'core.openinbrowser' | translate }}
157-
<ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
158-
</ion-button>
152+
<div collapsible-footer appearOnBottom *ngIf="!quizAborted && showSummary && summaryQuestions.length && loaded" slot="fixed">
153+
<div class="list-item-limited-width">
154+
<ion-button *ngIf="preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap" [href]="moduleUrl"
155+
core-link [showBrowserWarning]="false">
156+
{{ 'core.openinbrowser' | translate }}
157+
<ion-icon name="fas-external-link-alt" slot="end" aria-hidden="true"></ion-icon>
158+
</ion-button>
159159

160-
<!-- Button to submit the quiz. -->
161-
<ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block" class="ion-margin ion-text-wrap"
162-
(click)="finishAttempt(true)">
163-
{{ 'addon.mod_quiz.submitallandfinish' | translate }}
164-
</ion-button>
160+
<!-- Button to submit the quiz. -->
161+
<ion-button *ngIf="!attempt!.finishedOffline && !preventSubmitMessages.length" expand="block"
162+
class="ion-margin ion-text-wrap" (click)="finishAttempt(true)">
163+
{{ 'addon.mod_quiz.submitallandfinish' | translate }}
164+
</ion-button>
165+
</div>
165166
</div>
166167
</core-loading>
167168
</ion-content>

src/addons/mod/quiz/pages/player/player.scss

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ $quiz-timer-iterations: 15 !default;
1313
border-bottom: 1px solid var(--stroke);
1414
}
1515

16-
core-timer .core-timer {
17-
// Make the timer go red when it's reaching 0.
18-
@for $i from 0 through $quiz-timer-iterations {
19-
&.core-timer-timeleft-#{$i} {
20-
background-color: rgba($quiz-timer-warn-color, 1 - ($i / $quiz-timer-iterations)) !important;
16+
core-timer ::ng-deep {
17+
.core-timer {
18+
// Make the timer go red when it's reaching 0.
19+
@for $i from 0 through $quiz-timer-iterations {
20+
&.core-timer-timeleft-#{$i} {
21+
background-color: rgba($quiz-timer-warn-color, 1 - ($i / $quiz-timer-iterations)) !important;
2122

22-
@if $i <= $quiz-timer-iterations / 2 {
23-
label, span, ion-icon {
24-
color: var(--white);
23+
@if $i <= $quiz-timer-iterations / 2 {
24+
label, span, ion-icon {
25+
color: var(--white);
26+
}
2527
}
2628
}
2729
}

src/addons/mod/quiz/pages/review/review.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ <h2 *ngIf="!question.number">{{ 'core.question.information' | translate }}</h2>
9292
<div class="ion-text-wrap ion-margin-horizontal addon-mod_quiz-question-note" slot="end"
9393
*ngIf="question.status || question.readableMark">
9494
<p *ngIf="question.status">{{question.status}}</p>
95-
<p *ngIf="question.readableMark">{{question.readableMark}}</p>
95+
<p *ngIf="question.readableMark" [innerHTML]="question.readableMark"></p>
9696
</div>
9797
</ion-item-divider>
9898

0 commit comments

Comments
 (0)