-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3731 from crazyserver/MOBILE-4283
MOBILE-4283 quiz: Allow students to hide timer
- Loading branch information
Showing
8 changed files
with
104 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,13 @@ | ||
:host ::ng-deep { | ||
:host { | ||
core-timer { | ||
display: block; | ||
|
||
.core-timer { | ||
&.core-timer-under-300 { | ||
background-color: var(--danger-tint); | ||
color: var(--danger-shade); | ||
} | ||
&.core-timer-under-300 { | ||
--timer-background: var(--danger-tint); | ||
--timer-text-color: var(--danger-shade); | ||
} | ||
|
||
&.core-timer-under-900 { | ||
background-color: var(--warning-tint); | ||
color: var(--warning-shade); | ||
} | ||
&.core-timer-under-900 { | ||
--timer-background: var(--warning-tint); | ||
--timer-text-color: var(--warning-shade); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,32 @@ | ||
<ion-item *ngIf="mode !== modeBasic" class="core-timer" role="timer" | ||
[ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}"> | ||
<ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon> | ||
<ion-label> | ||
<ng-container *ngIf="timeLeft !== undefined"> | ||
<ion-item *ngIf="mode !== modeBasic" class="core-timer" role="timer" [attr.aria-label]="timerText"> | ||
<ion-label class="ion-justify-content-{{align}}"> | ||
<ng-container *ngTemplateOutlet="timerTemplate"></ng-container> | ||
</ion-label> | ||
</ion-item> | ||
|
||
<div *ngIf="mode === modeBasic" class="core-timer ion-padding ion-justify-content-{{align}}" role="timer" [attr.aria-label]="timerText"> | ||
<ng-container *ngTemplateOutlet="timerTemplate"></ng-container> | ||
</ion-label> | ||
</ion-item> | ||
</div> | ||
|
||
<ng-template #timerTemplate> | ||
<ng-container *ngIf="timeLeft > 0"> | ||
<div class="ion-text-wrap"> | ||
<span *ngIf="timerText" class="core-timer-text">{{ timerText }}</span> | ||
<span *ngIf="showTimeLeft" class="core-timer-time-left"> | ||
{{ timeLeft | coreSecondsToHMS }} | ||
</span> | ||
</div> | ||
|
||
<div *ngIf="mode === modeBasic" class="core-timer ion-padding" role="timer" | ||
[ngClass]="{'ion-text-center': align == 'center', 'ion-text-end': align == 'right'}"> | ||
<ng-container *ngTemplateOutlet="timerTemplate"></ng-container> | ||
</div> | ||
<div *ngIf="hiddable" class="core-timer-visibility"> | ||
( <button class="as-link" *ngIf="showTimeLeft" (click)="toggleTimeLeftVisibility()">{{ 'core.hide' | translate }}</button> | ||
<button class="as-link" *ngIf="!showTimeLeft" (click)="toggleTimeLeftVisibility()">{{ 'core.show' | translate }}</button> ) | ||
</div> | ||
</ng-container> | ||
|
||
<ng-template #timerTemplate> | ||
<span *ngIf="timerText" class="core-timer-text">{{ timerText }}</span> | ||
<span *ngIf="timeLeft && timeLeft > 0" class="core-timer-time-left">{{ timeLeft | coreSecondsToHMS }}</span> | ||
<span class="core-timesup" *ngIf="timeLeft !== undefined && timeLeft <= 0"> | ||
<ng-container *ngIf="timeUpText">{{ timeUpText }}</ng-container> | ||
<ng-container *ngIf="!timeUpText">{{ 'core.timesup' | translate }}</ng-container> | ||
</span> | ||
</ng-template> | ||
<div class="core-timesup" *ngIf="timeLeft <= 0"> | ||
<ng-container *ngIf="timeUpText">{{ timeUpText }}</ng-container> | ||
<ng-container *ngIf="!timeUpText">{{ 'core.timesup' | translate }}</ng-container> | ||
</div> | ||
</ng-template> | ||
</ng-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,40 @@ | ||
:host { | ||
.core-timer { | ||
--background: transparent !important; | ||
border-radius: var(--big-radius); | ||
--timer-background: transparent; | ||
|
||
.core-timer { | ||
.core-timer-time-left, .core-timesup { | ||
font-weight: bold; | ||
} | ||
|
||
span { | ||
margin-right: 5px; | ||
.core-timesup { | ||
flex-grow: 1; | ||
text-align: center; | ||
} | ||
} | ||
|
||
ion-item.core-timer { | ||
--background: var(--timer-background); | ||
--color: var(--timer-text-color, var(--text-color)); | ||
} | ||
|
||
div.core-timer { | ||
background: var(--timer-background); | ||
color: var(--timer-text-color, var(--text-color)); | ||
border-radius: var(--big-radius); | ||
} | ||
|
||
button { | ||
color: var(--timer-text-color, var(--core-link-color)); | ||
} | ||
|
||
ion-item.core-timer ion-label, | ||
div.core-timer { | ||
display: flex; | ||
align-items: center; | ||
|
||
.core-timer-visibility { | ||
flex-grow: 1; | ||
text-align: end; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters