Commit 557e0c51 authored by Tom Käsler's avatar Tom Käsler

Fix merge

parent c3643095
Pipeline #31864 passed with stages
in 8 minutes and 56 seconds
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
{{ 'room-page.moderators' | translate}} {{ 'room-page.moderators' | translate}}
</button> </button>
</mat-menu> </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-button class="corner-icons" [matMenuTriggerFor]="settingsMenu" aria-labelledby="settings">
<mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon> <mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon>
</button> </button>
...@@ -52,7 +53,6 @@ ...@@ -52,7 +53,6 @@
</p> </p>
</mat-card-content> </mat-card-content>
<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px"> <div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px">
<mat-grid-list cols="{{viewModuleCount}}" rowHeight="1:1" *ngIf="viewModuleCount > 1">
<span class="fill-remaining-space"></span> <span class="fill-remaining-space"></span>
<mat-grid-list cols="{{viewModuleCount}}" rowHeight="2:1"> <mat-grid-list cols="{{viewModuleCount}}" rowHeight="2:1">
<mat-grid-tile> <mat-grid-tile>
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<mat-icon matBadge="{{commentCounter}}" class="main-icon" <mat-icon matBadge="{{commentCounter}}" class="main-icon"
[ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer</mat-icon> [ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer</mat-icon>
<h2>{{ 'room-page.comments' | translate}}</h2> <h2>{{ 'room-page.comments' | translate}}</h2>
<h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.comments' | translate}}</h3>
</button> </button>
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile *ngIf="moderationEnabled"> <mat-grid-tile *ngIf="moderationEnabled">
...@@ -76,31 +75,31 @@ ...@@ -76,31 +75,31 @@
</mat-grid-list> </mat-grid-list>
<span class="fill-remaining-space"></span> <span class="fill-remaining-space"></span>
</div> </div>
<div fxLayout="row"> <div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px">
<span class="fill-remaining-space"></span> <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> <mat-grid-tile>
<button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer"> <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
<mat-icon class="smallerIcon" [ngClass]="{'desktop' : deviceType === 'desktop'}">thumbs_up_down <mat-icon class="smallerIcon" [ngClass]="{'desktop' : deviceType === 'desktop'}">thumbs_up_down
</mat-icon> </mat-icon>
<h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.live-feedback' | translate}}</h3> <h2>{{ 'room-page.live-feedback' | translate}}</h2>
</button> </button>
</mat-grid-tile> --> </mat-grid-tile>
</mat-grid-list> <mat-grid-tile>
<mat-grid-tile> <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/create-content">
<button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/create-content"> <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">note_add</mat-icon>
<mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">note_add</mat-icon> <h2>{{ 'room-page.create-content' | translate}}</h2>
<h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3> </button>
</button> </mat-grid-tile>
<button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics"> <mat-grid-tile>
<mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">insert_chart</mat-icon> <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics">
<h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.answer-statistics' | translate}}</h3> <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">insert_chart</mat-icon>
</button> <h2>{{ 'room-page.answer-statistics' | translate}}</h2>
</mat-grid-tile> </button>
</mat-grid-list> </mat-grid-tile>
</mat-grid-list>
<span class="fill-remaining-space"></span> <span class="fill-remaining-space"></span>
</div> </div>
</div>
<app-content-groups *ngIf="room && room.contentGroups" [contentGroups]="room.contentGroups"></app-content-groups> <app-content-groups *ngIf="room && room.contentGroups" [contentGroups]="room.contentGroups"></app-content-groups>
</mat-card> </mat-card>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
mat-card { mat-card {
width: 100%; width: 100%;
max-width: 800px; max-width: 800px;
min-height: 350px; min-height: 650px;
max-height: 600px; max-height: 800px;
background-color: var(--surface)!important; background-color: var(--surface)!important;
margin-top: 7%; margin-top: 7%;
} }
...@@ -64,6 +64,7 @@ mat-card-content > :first-child { ...@@ -64,6 +64,7 @@ mat-card-content > :first-child {
mat-grid-list { mat-grid-list {
margin-top: 0; margin-top: 0;
max-height: 50%!important; max-height: 50%!important;
margin-bottom: 5px !important;
} }
.second { .second {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment