From 557e0c5110df2d3a0691e8c4275103f17a0b5e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Thu, 3 Oct 2019 14:03:12 +0200
Subject: [PATCH] Fix merge
---
.../room-creator-page.component.html | 45 +++++++++----------
.../room-creator-page.component.scss | 5 ++-
2 files changed, 25 insertions(+), 25 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 a3a5c1f87..6704419a7 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
@@ -36,7 +36,8 @@
{{ 'room-page.moderators' | translate}}
</button>
</mat-menu>
- <button id="settings-menu"
+ <div fxLayout="column">
+ <button id="settings-menu"
mat-icon-button class="corner-icons" [matMenuTriggerFor]="settingsMenu" aria-labelledby="settings">
<mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon>
</button>
@@ -52,7 +53,6 @@
</p>
</mat-card-content>
<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px">
- <mat-grid-list cols="{{viewModuleCount}}" rowHeight="1:1" *ngIf="viewModuleCount > 1">
<span class="fill-remaining-space"></span>
<mat-grid-list cols="{{viewModuleCount}}" rowHeight="2:1">
<mat-grid-tile>
@@ -61,7 +61,6 @@
<mat-icon matBadge="{{commentCounter}}" class="main-icon"
[ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer</mat-icon>
<h2>{{ 'room-page.comments' | translate}}</h2>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.comments' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile *ngIf="moderationEnabled">
@@ -76,31 +75,31 @@
</mat-grid-list>
<span class="fill-remaining-space"></span>
</div>
- <div fxLayout="row">
+ <div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px">
<span class="fill-remaining-space"></span>
- <mat-grid-list cols="2" rowHeight="2:1" class="second">
+ <mat-grid-list cols="3" rowHeight="2:1" class="second">
<mat-grid-tile>
<button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
- <mat-icon class="smallerIcon" [ngClass]="{'desktop' : deviceType === 'desktop'}">thumbs_up_down
- </mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.live-feedback' | translate}}</h3>
- </button>
- </mat-grid-tile> -->
- </mat-grid-list>
- <mat-grid-tile>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/create-content">
- <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">note_add</mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3>
- </button>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics">
- <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">insert_chart</mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.answer-statistics' | translate}}</h3>
- </button>
- </mat-grid-tile>
- </mat-grid-list>
+ <mat-icon class="smallerIcon" [ngClass]="{'desktop' : deviceType === 'desktop'}">thumbs_up_down
+ </mat-icon>
+ <h2>{{ 'room-page.live-feedback' | translate}}</h2>
+ </button>
+ </mat-grid-tile>
+ <mat-grid-tile>
+ <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/create-content">
+ <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">note_add</mat-icon>
+ <h2>{{ 'room-page.create-content' | translate}}</h2>
+ </button>
+ </mat-grid-tile>
+ <mat-grid-tile>
+ <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics">
+ <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">insert_chart</mat-icon>
+ <h2>{{ 'room-page.answer-statistics' | translate}}</h2>
+ </button>
+ </mat-grid-tile>
+ </mat-grid-list>
<span class="fill-remaining-space"></span>
</div>
- </div>
<app-content-groups *ngIf="room && room.contentGroups" [contentGroups]="room.contentGroups"></app-content-groups>
</mat-card>
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
index 3153ffac5..540b92c32 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
@@ -3,8 +3,8 @@
mat-card {
width: 100%;
max-width: 800px;
- min-height: 350px;
- max-height: 600px;
+ min-height: 650px;
+ max-height: 800px;
background-color: var(--surface)!important;
margin-top: 7%;
}
@@ -64,6 +64,7 @@ mat-card-content > :first-child {
mat-grid-list {
margin-top: 0;
max-height: 50%!important;
+ margin-bottom: 5px !important;
}
.second {
--
GitLab