From b288ae03f59f633242b44e543bded232bb598aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Wed, 31 Jul 2019 21:57:18 +0200
Subject: [PATCH] Fix icon size in room-view for moderators and creators
---
.../room-creator-page.component.html | 6 +++---
.../room-moderator-page.component.html | 7 +++----
.../room-moderator-page.component.scss | 21 +++++--------------
3 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
index 5faa92d3c..2f4a3ffbf 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html
@@ -42,18 +42,18 @@
{{ room.description.trim() }}
</h4>
</mat-card-content>
- <mat-grid-list cols="{{viewModuleCount}}" rowHeight="2:1">
+ <mat-grid-list cols="{{viewModuleCount}}" rowHeight="1:1">
<mat-grid-tile>
<button mat-icon-button
routerLink="/creator/room/{{ room.shortId }}/comments">
- <mat-icon matBadge="{{commentCounter}}" matBadgeColor="primary" class="main-icon"
+ <mat-icon matBadge="{{commentCounter}}" class="main-icon"
[ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer</mat-icon>
<h3>{{ 'room-page.comments' | translate}}</h3> <!-- *ngIf="deviceType === 'desktop'" -->
</button>
</mat-grid-tile>
<mat-grid-tile *ngIf="moderationEnabled">
<button mat-icon-button routerLink="/moderator/room/{{ room.shortId }}/moderator/comments">
- <mat-icon matBadge="{{moderatorCommentCounter}}" matBadgeColor="primary"
+ <mat-icon matBadge="{{moderatorCommentCounter}}" class="main-icon"
[ngClass]="{'desktop' : deviceType === 'desktop'}">gavel
</mat-icon>
<h3>{{ 'room-page.moderating-stream' | translate}}</h3> <!-- *ngIf="deviceType === 'desktop'" -->
diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html
index a08b44fca..f0e63e789 100644
--- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html
+++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html
@@ -20,10 +20,10 @@
<mat-card-content *ngIf="room.description" fxLayoutAlign="center">
<h4>{{room.description.trim()}}</h4>
</mat-card-content>
- <mat-grid-list cols="{{viewModuleCount}}" rowHeight="2:1">
+ <mat-grid-list cols="{{viewModuleCount}}" rowHeight="1:1">
<mat-grid-tile>
<button mat-icon-button routerLink="/moderator/room/{{ room.shortId }}/comments">
- <mat-icon matBadge="{{commentCounter}}" matBadgeColor="primary"
+ <mat-icon matBadge="{{commentCounter}}" class="main-icon"
[ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer
</mat-icon>
<h3>{{ 'room-page.public-stream' | translate}}</h3> <!-- *ngIf="deviceType === 'desktop'" -->
@@ -31,7 +31,7 @@
</mat-grid-tile>
<mat-grid-tile *ngIf="moderationEnabled">
<button mat-icon-button routerLink="/moderator/room/{{ room.shortId }}/moderator/comments">
- <mat-icon matBadge="{{moderatorCommentCounter}}" matBadgeColor="primary"
+ <mat-icon matBadge="{{moderatorCommentCounter}}" class="main-icon"
[ngClass]="{'desktop' : deviceType === 'desktop'}">gavel
</mat-icon>
<h3>{{ 'room-page.moderating-stream' | translate}}</h3> <!-- *ngIf="deviceType === 'desktop'" -->
@@ -50,4 +50,3 @@
</div>
</div>
-
\ No newline at end of file
diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss
index c321c4e16..c6d07eff1 100644
--- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss
+++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss
@@ -18,12 +18,12 @@ mat-card-content>:first-child {
color: var(--primary)!important;
}
-/*mat-icon {
- font-size: 60px;
- height: 60px;
- width: 60px;
+.main-icon {
+ font-size: 80px;
+ height: 80px;
+ width: 80px;
line-height: 100%!important;
-}*/
+}
mat-icon {
font-size: 80px;
@@ -92,14 +92,3 @@ mat-grid-tile {
height: 100%!important;
padding: 2%!important;
}
-
-#settings {
- width: 10%;
- max-width: 40px;
-}
-
-#settings-icon {
- font-size: 35px;
- height: 35px;
- width: 35px;
-}
--
GitLab