diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html index c32a98968be0287e5e98eab5f4897d06c0b1e8bb..0d494c82069bae8d6a245a4ab50d7d3783bcb8bc 100644 --- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html +++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html @@ -1,7 +1,6 @@ <div *ngIf="editRoom"> - <mat-card class="header" fxLayoutAlign="center"> - <mat-card-title class="title" fxLayoutAlign="center">{{'room-page.general' | translate}}</mat-card-title> - </mat-card> + <h2>{{'room-page.general' | translate }}</h2> + <mat-divider></mat-divider> <div fxLayout="column"> <mat-form-field class="input-block"> <input [(ngModel)]="editRoom.name" matInput placeholder="{{ 'session.session-name' | translate}}" @@ -14,12 +13,12 @@ </textarea> </mat-form-field> <div fxLayoutAlign="center center"> - <button mat-raised-button class="delete" (click)="openDeletionRoomDialog()"><mat-icon>delete</mat-icon>Session löschen</button> + <button mat-raised-button class="delete" (click)="openDeletionRoomDialog()"> + <mat-icon>delete</mat-icon>{{ 'room-page.delete-room' | translate }}</button> </div> </div> - <mat-card class="header" fxLayoutAlign="center"> - <mat-card-title class="title" fxLayoutAlign="center">{{'room-page.comments' | translate}}</mat-card-title> - </mat-card> + <h2>{{'room-page.comments' | translate }}</h2> + <mat-divider></mat-divider> <div fxLayout="column"> <div fxLayout="row"> <h3>{{ 'room-page.threshold' | translate}}</h3> @@ -29,11 +28,11 @@ color="accent" [(ngModel)]="commentThreshold" (input)="onSliderChange($event)"></mat-slider> </div> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px"> - <button (click)="dialogRef.close('abort')" mat-button color="primary"> - {{ 'room-page.abort' | translate}} + <button mat-raised-button color="accent" (click)="dialogRef.close('abort')"> + {{ 'room-page.abort' | translate }} </button> - <button (click)="dialogRef.close(commentThreshold)" mat-raised-button color="primary"> - {{ 'room-page.update' | translate}} + <button mat-raised-button color="primary" (click)="dialogRef.close(commentThreshold)"> + {{ 'room-page.update' | translate }} </button> </div> </div> diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss index 1c5d943580c400870d05205f57d0d87c9c23b4c2..483bd4ba53041ba035ff1462dc7d8a41dc0cbed2 100644 --- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss +++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss @@ -1,14 +1,3 @@ -@import '../../../../../styles'; - -.header { - background-color: mat-color($arsnova-primary,200); - margin: 0 0 10px 0; -} - -.title { - // color: ; -} - #commentSlider { width: 100%; } @@ -17,10 +6,20 @@ margin-bottom: 20px; min-width: 170px; width: 60%; - background-color: mat-color($arsnova-warn,300); + background-color: var(--red); } mat-icon { margin-right: 10px; } +h2 { + margin: 10px 0 10px 0; + color: var(--text-1); +} + +mat-divider { + margin-bottom: 10px; + color: var(--text-1) !important; +} + diff --git a/src/theme/dark-Theme/darkTheme.const.ts b/src/theme/dark-Theme/darkTheme.const.ts index e1264499221262b81123d7d857d5da5eefa41aad..2e7e842972959f27af2a474333fd4e8b6338ed5a 100644 --- a/src/theme/dark-Theme/darkTheme.const.ts +++ b/src/theme/dark-Theme/darkTheme.const.ts @@ -10,7 +10,7 @@ export const dark = { '--card': '#bdbdbd', '--green': '#AED581', - '--red': '#FF8A65', + '--red': '#FF8A80', '--yellow': '#FFD54F', '--blue': '#1E88E5', '--grey': '#E0E0E0', diff --git a/src/theme/default-Theme/defaultTheme.const.ts b/src/theme/default-Theme/defaultTheme.const.ts index b12428a946c1da534f4526d6af96b590c37a8d74..8628823c5105dfc1b00133c0e97eb1cb1bec146f 100644 --- a/src/theme/default-Theme/defaultTheme.const.ts +++ b/src/theme/default-Theme/defaultTheme.const.ts @@ -10,7 +10,7 @@ export const defaultTheme = { '--card': '#fff8e1', '--green': '#AED581', - '--red': '#FF8A65', + '--red': '#FF8A80', '--yellow': '#FFD54F', '--blue': '#1E88E5', '--grey': '#BDBDBD',