From 56c9eebb2b3dc6d8ee89506c09c660a31aa7abd8 Mon Sep 17 00:00:00 2001 From: Klaus Quibeldey-Cirkel <klaus.quibeldey-cirkel@mni.thm.de> Date: Sun, 23 Aug 2020 13:44:46 +0200 Subject: [PATCH] room numbers also on mobiles --- src/app/components/shared/header/header.component.html | 6 +++--- src/app/components/shared/header/header.component.scss | 4 ++++ .../components/shared/room-list/room-list.component.html | 2 +- src/assets/i18n/creator/en.json | 2 +- src/assets/i18n/participant/en.json | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html index 57fbdde0d..cadf96b40 100644 --- a/src/app/components/shared/header/header.component.html +++ b/src/app/components/shared/header/header.component.html @@ -52,15 +52,15 @@ <span *ngIf="user.isGuest" svgIcon="meeting_room">{{'header.visited-sessions' | translate}}</span> </button> <button mat-menu-item *ngIf="user" (click)="openUserBonusTokenDialog()" tabindex="0"> - <mat-icon color="warn">grade</mat-icon> + <mat-icon>grade</mat-icon> <span>{{'header.user-bonus-token' | translate}}</span> </button> <button mat-menu-item *ngIf="user && !user.isGuest" (click)="openDeleteUserDialog()" tabindex="0"> - <mat-icon color="warn">delete</mat-icon> + <mat-icon class="color-warn">delete</mat-icon> <span>{{'header.delete-account' | translate}}</span> </button> <button mat-menu-item (click)="logout()" tabindex="0"> - <mat-icon color="warn">exit_to_app</mat-icon> + <mat-icon class="color-warn">exit_to_app</mat-icon> <span>{{ 'header.logout' | translate }}</span> </button> </mat-menu> diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss index 79f4c1822..993892fb2 100644 --- a/src/app/components/shared/header/header.component.scss +++ b/src/app/components/shared/header/header.component.scss @@ -63,3 +63,7 @@ svg { .question-focus-btn-txt{ padding-left:6px; } + +.color-warn { + color: red; +} diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html index c28e393f9..b035d2767 100644 --- a/src/app/components/shared/room-list/room-list.component.html +++ b/src/app/components/shared/room-list/room-list.component.html @@ -32,7 +32,7 @@ </th> <td mat-cell class="clickable" *matCellDef="let room" (click)="setCurrentRoom(room.shortId)" routerLink="/{{ roleToString((room.role)) }}/room/{{ room.shortId }}"> - <span matBadge="{{room.commentCount > 0 ? room.commentCount : null}}" matBadgeOverlap="false"> + <span matBadge="{{room.commentCount > 0 ? room.commentCount : null}}" matBadgePosition="before" matBadgeSize="small" matBadgeOverlap="false"> »{{room.name}}« </span> </td> diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json index ca5bf1905..6b070d226 100644 --- a/src/assets/i18n/creator/en.json +++ b/src/assets/i18n/creator/en.json @@ -106,7 +106,7 @@ "mark-read": "Discussed by you in full screen mode on the projector", "mark-wrong": "Mark as wrong", "new-comment": "A new question with the content, {{ comment }}, has been asked.", - "no-comments": "No questions present", + "no-comments": "No questions at present", "reject": "Remove inappropriate question from the list", "search-box-input-description": "Here you can search for questions.", "semicolon": "CSV format (.csv)", diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json index 23264ed6c..bf4cd7df2 100644 --- a/src/assets/i18n/participant/en.json +++ b/src/assets/i18n/participant/en.json @@ -96,7 +96,7 @@ "mark-not-wrong": "Marked as wrong by the professor", "mark-read": "Already discussed by the professor", "new-comment": "A new question with the content, {{ comment }}, has been asked.", - "no-comments": "No questions present", + "no-comments": "No questions at present", "search-box-input-description": "Here you can search for questions.", "send": "Send", "send-description": "Send question", -- GitLab