From 4f5d30095eb718bcdbf113eb3366e5728e0df7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Tue, 16 Oct 2018 00:37:10 +0200
Subject: [PATCH] Set up new desing
---
.../dialogs/room-create/room-create.component.html | 2 +-
.../content-groups/content-groups.component.html | 2 +-
.../fragments/header/header.component.html | 4 ++--
.../fragments/room-list/room-list.component.html | 2 +-
.../home-creator-page.component.html | 2 +-
.../room-creator-page.component.html | 12 ++++++------
.../room-creator-page.component.scss | 4 ++++
src/assets/i18n/de.json | 4 ++--
src/assets/i18n/en.json | 6 +++---
src/theme/_variables.scss | 4 ++--
10 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/app/components/dialogs/room-create/room-create.component.html b/src/app/components/dialogs/room-create/room-create.component.html
index 18cbf3c04..0e1e29b76 100644
--- a/src/app/components/dialogs/room-create/room-create.component.html
+++ b/src/app/components/dialogs/room-create/room-create.component.html
@@ -20,7 +20,7 @@
<mat-icon>close</mat-icon>
</button>
</mat-form-field>
- <button mat-raised-button color="primary" type="submit">{{ 'session.create-session' | translate}}
+ <button mat-raised-button color="accent" type="submit">{{ 'session.create-session' | translate}}
</button>
</div>
</form>
diff --git a/src/app/components/fragments/content-groups/content-groups.component.html b/src/app/components/fragments/content-groups/content-groups.component.html
index 3f2e3642d..b23bd887c 100644
--- a/src/app/components/fragments/content-groups/content-groups.component.html
+++ b/src/app/components/fragments/content-groups/content-groups.component.html
@@ -3,7 +3,7 @@
<mat-divider></mat-divider>
<mat-card-header>
<mat-card-title>
- <h4>{{contentGroup.name}}<mat-icon matBadge="{{contentGroup.contentIds.length}}" matBadgePosition="after"></mat-icon></h4>
+ <h4>{{contentGroup.name}}<mat-icon color="accent" matBadge="{{contentGroup.contentIds.length}}" matBadgePosition="after" matBadgeColor="accent"></mat-icon></h4>
</mat-card-title>
</mat-card-header>
</mat-card>
diff --git a/src/app/components/fragments/header/header.component.html b/src/app/components/fragments/header/header.component.html
index 2463b3a1d..6364a9ae1 100644
--- a/src/app/components/fragments/header/header.component.html
+++ b/src/app/components/fragments/header/header.component.html
@@ -17,12 +17,12 @@
<mat-menu #appMenu="matMenu" [overlapTrigger]="false">
<button mat-menu-item (click)="logout()">
- <mat-icon>exit_to_app</mat-icon>
+ <mat-icon color="warn">exit_to_app</mat-icon>
<span>{{ 'header.logout' | translate }}</span>
</button>
</mat-menu>
<button *ngIf="user" mat-button [matMenuTriggerFor]="appMenu">
- <mat-icon>account_box</mat-icon>
+ <mat-icon color="accent">account_box</mat-icon>
<span *ngIf="user.isGuest; else elseBlock">{{ 'header.guest' | translate }}</span>
<ng-template #elseBlock>{{user.loginId}}</ng-template>
</button>
diff --git a/src/app/components/fragments/room-list/room-list.component.html b/src/app/components/fragments/room-list/room-list.component.html
index d0729809d..676f769d9 100644
--- a/src/app/components/fragments/room-list/room-list.component.html
+++ b/src/app/components/fragments/room-list/room-list.component.html
@@ -4,7 +4,7 @@
</div>
<mat-expansion-panel *ngFor="let room of rooms">
<mat-expansion-panel-header>
- <button mat-button color="primary" routerLink="/{{ baseUrl }}/room/{{ room.shortId }}">
+ <button mat-button color="accent" routerLink="/{{ baseUrl }}/room/{{ room.shortId }}">
<mat-icon>input</mat-icon>
</button>
<mat-panel-title>
diff --git a/src/app/components/pages/home-creator-page/home-creator-page.component.html b/src/app/components/pages/home-creator-page/home-creator-page.component.html
index 5b22e036f..f0aa3bc03 100644
--- a/src/app/components/pages/home-creator-page/home-creator-page.component.html
+++ b/src/app/components/pages/home-creator-page/home-creator-page.component.html
@@ -1,6 +1,6 @@
<div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
- <button mat-raised-button color="primary" (click)="openCreateRoomDialog()">{{ 'home-page.create-session' | translate }}</button>
+ <button mat-raised-button color="accent" (click)="openCreateRoomDialog()">{{ 'home-page.create-session' | translate }}</button>
</div>
<div fxLayout="row" fxLayoutAlign="center">
<app-room-list></app-room-list>
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.html b/src/app/components/pages/room-creator-page/room-creator-page.component.html
index fa439d978..ced52251d 100644
--- a/src/app/components/pages/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/pages/room-creator-page/room-creator-page.component.html
@@ -20,26 +20,26 @@
</mat-card-content>
<mat-divider></mat-divider>
<mat-card-actions>
- <button mat-button color="primary" fxFlex="33%"
+ <button mat-button color="primary" background-color="accent"
routerLink="/creator/room/{{ room.shortId }}/create-content">
{{ 'room-page.create-content' | translate }}
</button>
- <button mat-button color="primary" fxFlex="33%"
+ <button mat-button color="primary"
routerLink="/creator/room/{{ room.shortId }}/comments">
{{ 'room-page.comments' | translate }}
</button>
- <button mat-button color="primary" fxFlex="33%"
+ <button mat-button color="primary"
routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
{{ 'room-page.live-feedback' | translate }}
</button>
- <button mat-button color="primary" fxFlex="33%"
+ <button mat-button color="primary"
routerLink="/creator/room/{{ room.shortId }}/statistics">
{{ 'room-page.answer-statistics' | translate }}
</button>
- <button *ngIf="!modify" fxFlex="33%" (click)="showEditDialog()" mat-button color="primary">
+ <button mat-button *ngIf="!modify" (click)="showEditDialog()" color="primary">
{{ 'room-page.edit-room' | translate }}
</button>
- <button mat-button color="warn" fxFlex="33%" (click)="openDeletionRoomDialog()">
+ <button mat-button color="warn" (click)="openDeletionRoomDialog()">
{{ 'room-page.delete-room' | translate }}
</button>
</mat-card-actions>
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.scss b/src/app/components/pages/room-creator-page/room-creator-page.component.scss
index 6bf53eb81..67d05a431 100644
--- a/src/app/components/pages/room-creator-page/room-creator-page.component.scss
+++ b/src/app/components/pages/room-creator-page/room-creator-page.component.scss
@@ -6,3 +6,7 @@ mat-card-content > :first-child {
margin-top: 16px;
margin-bottom: 16px;
}
+
+button {
+ margin: 5px;
+}
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index b0c14fe1b..d0f3daa4c 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -49,7 +49,7 @@
},
"home-page": {
"create-session": "Neue Session erstellen",
- "join-demo-session": "Demo-Session beitreten",
+ "join-demo-session": "Demo-Session betreten",
"session-id": "Session-Id",
"no-room-found": "Es wurde keine Session mit dieser ID gefunden.",
"please-enter": "Bitte geben Sie eine Session-ID ein.",
@@ -63,7 +63,7 @@
"give-feedback": "Feedback geben",
"create-content": "Frage erstellen",
"live-feedback": "Live Feedback",
- "answer-statistics": "Antwortstatistiken",
+ "answer-statistics": "Statistiken",
"edit-room": "Session bearbeiten",
"delete-room": "Session löschen"
},
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 79509f2d9..9b87db31c 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1,9 +1,9 @@
{
"header": {
"english": "English",
- "german": "Deutsch",
+ "german": "German",
"logout": "Logout",
- "guest:": "Guest"
+ "guest": "Guest"
},
"login-page": {
"creator": "Creator",
@@ -61,7 +61,7 @@
"give-feedback": "Give feedback",
"create-content": "Create content",
"live-feedback": "Live feedback",
- "answer-statistics": "Answer-statistics",
+ "answer-statistics": "Statistics",
"edit-room": "Edit session",
"delete-room": "Delete session"
},
diff --git a/src/theme/_variables.scss b/src/theme/_variables.scss
index e77658e95..f319d7821 100644
--- a/src/theme/_variables.scss
+++ b/src/theme/_variables.scss
@@ -2,8 +2,8 @@
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://www.google.com/design/spec/style/color.html
-$arsnova-primary: mat-palette($mat-teal);
-$arsnova-accent: mat-palette($mat-blue-gray, A200, A100, A400);
+$arsnova-primary: mat-palette($mat-indigo,500);
+$arsnova-accent: mat-palette($mat-amber, 500); //$mat-blue-gray, A200, A100, A400);
// The warn palette is optional (defaults to red).
$arsnova-warn: mat-palette($mat-red);
--
GitLab