From 7b76e468683aafcee660e2e3915e0629fd232c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Sat, 25 May 2019 23:23:12 +0200
Subject: [PATCH] Several theme fixes
---
.../comment-export/comment-export.component.html | 2 +-
.../comment-export/comment-export.component.scss | 7 ++++++-
.../content-edit/content-edit.component.html | 4 ++--
.../content-edit/content-edit.component.scss | 5 +++++
.../_dialogs/room-edit/room-edit.component.html | 4 ++--
.../_dialogs/room-edit/room-edit.component.scss | 14 ++++++++++++--
.../content-choice-creator.component.html | 12 ++++++------
.../content-choice-creator.component.scss | 13 ++++++++++++-
.../content-likert-creator.component.html | 2 +-
.../content-likert-creator.component.scss | 5 +++++
.../content-list/content-list.component.scss | 12 +++++++-----
.../content-presentation.component.scss | 2 +-
.../content-text-creator.component.html | 2 +-
.../content-text-creator.component.scss | 5 +++++
.../content-yes-no-creator.component.html | 2 +-
.../content-yes-no-creator.component.scss | 5 +++++
.../home-creator-page.component.html | 2 +-
.../home-creator-page.component.scss | 5 +++++
.../home/new-landing/new-landing.component.scss | 6 +++---
.../home/new-landing/new-landing.component.ts | 3 ---
.../create-comment/create-comment.component.html | 2 +-
.../create-comment/create-comment.component.scss | 5 +++++
.../room-create/room-create.component.html | 2 +-
.../room-create/room-create.component.scss | 4 ++++
.../comment-list/comment-list.component.html | 7 +++----
.../comment-list/comment-list.component.scss | 5 ++++-
.../components/shared/footer/footer.component.scss | 4 ++--
.../components/shared/header/header.component.html | 4 ++--
.../components/shared/login/login.component.html | 8 ++++----
.../components/shared/login/login.component.scss | 7 +++++++
src/app/components/shared/login/login.component.ts | 1 -
.../shared/room-join/room-join.component.scss | 4 ++--
.../shared/room-join/room-join.component.ts | 10 +---------
.../shared/statistic/statistic.component.scss | 4 ++--
src/theme/blue-theme/blueTheme.const.ts | 10 +++++-----
src/theme/dark-theme/darkTheme.const.ts | 12 ++++++------
src/theme/default-theme/defaultTheme.const.ts | 8 ++++----
src/theme/purple-theme/purpleTheme.const.ts | 10 +++++-----
38 files changed, 139 insertions(+), 80 deletions(-)
diff --git a/src/app/components/creator/_dialogs/comment-export/comment-export.component.html b/src/app/components/creator/_dialogs/comment-export/comment-export.component.html
index 3ee60dbbe..2f15fed9f 100644
--- a/src/app/components/creator/_dialogs/comment-export/comment-export.component.html
+++ b/src/app/components/creator/_dialogs/comment-export/comment-export.component.html
@@ -8,7 +8,7 @@
</mat-radio-group>
<div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="20px">
<button mat-raised-button color="warn" (click)="onNoClick()">{{'comment-page.abort' | translate}}</button>
- <button mat-raised-button color="primary"
+ <button mat-raised-button class="export"
(click)="dialogRef.close(exportType)">{{'comment-page.export' | translate}}</button>
</div>
</div>
diff --git a/src/app/components/creator/_dialogs/comment-export/comment-export.component.scss b/src/app/components/creator/_dialogs/comment-export/comment-export.component.scss
index d242af83a..06d082106 100644
--- a/src/app/components/creator/_dialogs/comment-export/comment-export.component.scss
+++ b/src/app/components/creator/_dialogs/comment-export/comment-export.component.scss
@@ -4,9 +4,14 @@ button {
h3 {
font-size: large;
- color: var(--text-1);
+ color: var(--on-surface);
}
h4 {
margin: 15px 0 15px 0;
}
+
+.export {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
diff --git a/src/app/components/creator/_dialogs/content-edit/content-edit.component.html b/src/app/components/creator/_dialogs/content-edit/content-edit.component.html
index e12c461ab..c54319eef 100644
--- a/src/app/components/creator/_dialogs/content-edit/content-edit.component.html
+++ b/src/app/components/creator/_dialogs/content-edit/content-edit.component.html
@@ -23,10 +23,10 @@
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
- <button (click)="dialogRef.close('abort')" mat-button color="primary">
+ <button (click)="dialogRef.close('abort')" mat-button>
{{ 'room-page.abort' | translate }}
</button>
- <button (click)="updateContent()" mat-raised-button color="primary">
+ <button (click)="updateContent()" mat-raised-button>
{{ 'room-page.update' | translate }}
</button>
</div>
diff --git a/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss b/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss
index 16599afe7..aebdb24b5 100644
--- a/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss
+++ b/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss
@@ -23,3 +23,8 @@ mat-cell {
padding-left: 0!important;
padding-right: 10px!important;
}
+
+.mat-raised-button {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
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 0d494c820..3dddc875d 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
@@ -28,10 +28,10 @@
color="accent" [(ngModel)]="commentThreshold" (input)="onSliderChange($event)"></mat-slider>
</div>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
- <button mat-raised-button color="accent" (click)="dialogRef.close('abort')">
+ <button mat-raised-button class="abort" (click)="dialogRef.close('abort')">
{{ 'room-page.abort' | translate }}
</button>
- <button mat-raised-button color="primary" (click)="dialogRef.close(commentThreshold)">
+ <button mat-raised-button class="update" (click)="dialogRef.close(commentThreshold)">
{{ 'room-page.update' | translate }}
</button>
</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 483bd4ba5..b389ce2e9 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
@@ -15,11 +15,21 @@ mat-icon {
h2 {
margin: 10px 0 10px 0;
- color: var(--text-1);
+ color: var(--on-surface);
}
mat-divider {
margin-bottom: 10px;
- color: var(--text-1) !important;
+ color: var(--on-surface) !important;
+}
+
+.abort {
+ background-color: var(--secondary);
+ color: var(--on-secondary);
+}
+
+.update {
+ background-color: var(--primary);
+ color: var(--on-primary);
}
diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.html b/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
index d0c3bef72..236216731 100644
--- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
@@ -25,10 +25,10 @@
<mat-cell *matCellDef="let answer">
<button mat-icon-button
(click)="openAnswerModificationDialog($event, answer.answerOption.label, answer.answerOption.points, answer.correct)"
- color="primary" matTooltip="{{ 'content.edit-answer' | translate }}">
+ matTooltip="{{ 'content.edit-answer' | translate }}">
<mat-icon>edit</mat-icon>
</button>
- <button mat-icon-button color="primary" (click)="deleteAnswer($event, answer.answerOption.label)"
+ <button mat-icon-button (click)="deleteAnswer($event, answer.answerOption.label)"
matTooltip="{{ 'content.delete-answer' | translate }}">
<mat-icon>delete</mat-icon>
</button>
@@ -44,14 +44,14 @@
<input matInput #answerLabel [(ngModel)]="newAnswerOptionLabel" placeholder="{{ 'content.answer' | translate }}" name="answer">
</mat-form-field>
<button *ngIf="singleChoice" mat-icon-button class="addButton" (click)="addAnswer($event); answerLabel.value = '';">
- <mat-icon class="addIcon" color="primary">add_circle</mat-icon>
+ <mat-icon class="addIcon">add_circle</mat-icon>
</button>
<button *ngIf="!singleChoice" mat-icon-button (click)="addAnswer($event); answerLabel.value = '';">
- <mat-icon class="addIcon" color="primary">add_box</mat-icon>
+ <mat-icon class="addIcon">add_box</mat-icon>
</button>
</div>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="25px">
- <button mat-raised-button type="submit" color="accent">{{ 'content.create' | translate }}</button>
- <button mat-raised-button (click)="reset($event)" color="primary">{{ 'content.reset' | translate }}</button>
+ <button mat-raised-button class="create" type="submit">{{ 'content.create' | translate }}</button>
+ <button mat-raised-button class="reset" (click)="reset($event)">{{ 'content.reset' | translate }}</button>
</div>
</form>
diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss b/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss
index 075e8c180..3f9eb37ee 100644
--- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss
@@ -11,7 +11,7 @@ mat-row {
}
.mat-checkbox {
- color: var(--text-1) !important;
+ color: var(--on-surface) !important;
}
.addIcon {
@@ -19,6 +19,7 @@ mat-row {
height: 100% !important;
width: 100% !important;
font-size: 40px !important;
+ color: var(--primary);
}
.addButton {
@@ -36,3 +37,13 @@ mat-row {
mat-form-field {
width: 85%;
}
+
+.create {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
+
+.reset {
+ background-color: var(--secondary);
+ color: var(--on-secondary);
+}
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.html b/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
index a79b6e01b..feecd6014 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
@@ -11,6 +11,6 @@
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>
<div>
- <button mat-raised-button type="submit" color="accent">{{ 'content.create' | translate }}</button>
+ <button mat-raised-button type="submit"class="submit">{{ 'content.create' | translate }}</button>
</div>
</form>
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss b/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss
index 61c83cf9a..4b6e92c0b 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss
@@ -9,3 +9,8 @@ mat-header-cell {
mat-cell {
background-color: var(--primary);
}
+
+.submit {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
diff --git a/src/app/components/creator/content-list/content-list.component.scss b/src/app/components/creator/content-list/content-list.component.scss
index 0bc0bfa46..5945fe3f5 100644
--- a/src/app/components/creator/content-list/content-list.component.scss
+++ b/src/app/components/creator/content-list/content-list.component.scss
@@ -9,7 +9,7 @@ mat-card-content > :first-child {
}
mat-expansion-panel {
- background-color: var(--grey);
+ background-color: var(--primary-variant);
margin-bottom: 5px;
}
@@ -21,26 +21,26 @@ mat-panel-title {
}
mat-expansion-panel-header {
- background-color: var(--surface) !important;
+ background-color: var(--primary-variant) !important;
padding-left: 3%;
padding-right: 3%;
word-break: break-all;
}
.matPanel {
- background-color: var(--surface);
+ background-color: var(--primary-variant);
margin-bottom: 5px;
color: black!important;
}
.panelTitle {
width: 8% !important;
- color: black !important;
+ color: var(--on-primary) !important;
}
h2 {
font-size: larger;
- color: black !important;
+ color: var(--on-surface) !important;
}
.actionButton {
@@ -58,10 +58,12 @@ h2 {
.editButton {
width: 15%;
max-width: 60px;
+ color: var(--on-primary)
}
.deleteButton {
margin-right: 4%;
+ color: var(--red)
}
mat-tooltip-component {
diff --git a/src/app/components/creator/content-presentation/content-presentation.component.scss b/src/app/components/creator/content-presentation/content-presentation.component.scss
index 57541136c..7a4fee85c 100644
--- a/src/app/components/creator/content-presentation/content-presentation.component.scss
+++ b/src/app/components/creator/content-presentation/content-presentation.component.scss
@@ -16,7 +16,7 @@ mat-card {
h3 {
font-size: 150%;
- color: var(--text-1);
+ color: var(--on-surface);
}
h4 {
diff --git a/src/app/components/creator/content-text-creator/content-text-creator.component.html b/src/app/components/creator/content-text-creator/content-text-creator.component.html
index 60a77b90d..d9a776aea 100644
--- a/src/app/components/creator/content-text-creator/content-text-creator.component.html
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.html
@@ -1,5 +1,5 @@
<form (ngSubmit)="submitContent()">
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
- <button mat-raised-button type="submit" color="accent">{{'content.create' | translate}}</button>
+ <button mat-raised-button type="submit" class="submit">{{'content.create' | translate}}</button>
</div>
</form>
diff --git a/src/app/components/creator/content-text-creator/content-text-creator.component.scss b/src/app/components/creator/content-text-creator/content-text-creator.component.scss
index 687e7d96c..3eb278fae 100644
--- a/src/app/components/creator/content-text-creator/content-text-creator.component.scss
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.scss
@@ -1,3 +1,8 @@
form > button {
margin: 20px 0;
}
+
+.submit {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
diff --git a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
index 839c16c1c..dd2647f88 100644
--- a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
@@ -8,6 +8,6 @@
</mat-radio-button>
</mat-radio-group>
<div>
- <button mat-raised-button type="submit" color="accent">{{ 'content.create' | translate }}</button>
+ <button mat-raised-button type="submit" class="submit">{{ 'content.create' | translate }}</button>
</div>
</form>
diff --git a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.scss b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.scss
index 687e7d96c..3eb278fae 100644
--- a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.scss
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.scss
@@ -1,3 +1,8 @@
form > button {
margin: 20px 0;
}
+
+.submit {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
diff --git a/src/app/components/creator/home-creator-page/home-creator-page.component.html b/src/app/components/creator/home-creator-page/home-creator-page.component.html
index f0aa3bc03..b6d80569d 100644
--- a/src/app/components/creator/home-creator-page/home-creator-page.component.html
+++ b/src/app/components/creator/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="accent" (click)="openCreateRoomDialog()">{{ 'home-page.create-session' | translate }}</button>
+ <button mat-raised-button (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/creator/home-creator-page/home-creator-page.component.scss b/src/app/components/creator/home-creator-page/home-creator-page.component.scss
index e41d2f8e7..d3d6bf63d 100644
--- a/src/app/components/creator/home-creator-page/home-creator-page.component.scss
+++ b/src/app/components/creator/home-creator-page/home-creator-page.component.scss
@@ -2,3 +2,8 @@ app-room-list {
width: 100%;
max-width: 800px;
}
+
+.mat-raised-button {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
diff --git a/src/app/components/home/new-landing/new-landing.component.scss b/src/app/components/home/new-landing/new-landing.component.scss
index 848b1e6b8..129b1836d 100644
--- a/src/app/components/home/new-landing/new-landing.component.scss
+++ b/src/app/components/home/new-landing/new-landing.component.scss
@@ -4,13 +4,13 @@
border-radius: 32px;
margin-bottom: 5%;
font-size: large;
- background-color: var(--secondary);
- color: var(--on-secondary);
+ background-color: var(--primary);
+ color: var(--on-primary);
}
.add {
transform: scale(1.4);
padding-right: 5px;
padding-left: 5px;
- color: var(--on-secondary);
+ color: var(--on-primary);
}
diff --git a/src/app/components/home/new-landing/new-landing.component.ts b/src/app/components/home/new-landing/new-landing.component.ts
index 450ebd8a0..4404a3f50 100644
--- a/src/app/components/home/new-landing/new-landing.component.ts
+++ b/src/app/components/home/new-landing/new-landing.component.ts
@@ -8,7 +8,6 @@ import { AuthenticationService } from '../../../services/http/authentication.ser
import { User } from '../../../models/user';
import { UserRole } from '../../../models/user-roles.enum';
import { LoginComponent } from '../../shared/login/login.component';
-import { AppConfig } from '../../../app.config';
@Component({
selector: 'app-new-landing',
@@ -18,7 +17,6 @@ import { AppConfig } from '../../../app.config';
export class NewLandingComponent implements OnInit {
user: User;
- authentication = AppConfig.settings.authentication;
constructor(private router: Router,
public dialog: MatDialog,
@@ -53,7 +51,6 @@ export class NewLandingComponent implements OnInit {
});
dialogRef.componentInstance.role = UserRole.CREATOR;
dialogRef.componentInstance.isStandard = false;
- dialogRef.componentInstance.guestAllowed = this.authentication.lecturer.allowGuest;
dialogRef.afterClosed()
.subscribe(result => {
if (this.user) {
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
index 7eae850ea..946e8873e 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
@@ -7,7 +7,7 @@
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px">
<button mat-raised-button color="warn"
(click)="onNoClick()">{{ 'comment-page.abort' | translate}}</button>
- <button mat-raised-button color="accent"
+ <button mat-raised-button class="send"
(click)="closeDialog(commentBody.value)">{{ 'comment-page.send' | translate}}</button>
</div>
</div>
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
index 78777d0a8..e892ecccc 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
@@ -17,3 +17,8 @@ app-comment-list {
textarea {
line-height: 120%;
}
+
+.send {
+ color: var(--on-primary);
+ background-color: var(--primary);
+}
diff --git a/src/app/components/shared/_dialogs/room-create/room-create.component.html b/src/app/components/shared/_dialogs/room-create/room-create.component.html
index b3e1ce6e5..d908bc367 100644
--- a/src/app/components/shared/_dialogs/room-create/room-create.component.html
+++ b/src/app/components/shared/_dialogs/room-create/room-create.component.html
@@ -19,7 +19,7 @@
<mat-icon>close</mat-icon>
</button>
</mat-form-field>
- <button mat-raised-button color="accent" type="submit">{{ 'session.create-session' | translate}}
+ <button mat-raised-button type="submit">{{ 'session.create-session' | translate}}
</button>
</div>
</form>
diff --git a/src/app/components/shared/_dialogs/room-create/room-create.component.scss b/src/app/components/shared/_dialogs/room-create/room-create.component.scss
index e69de29bb..f7a8134c2 100644
--- a/src/app/components/shared/_dialogs/room-create/room-create.component.scss
+++ b/src/app/components/shared/_dialogs/room-create/room-create.component.scss
@@ -0,0 +1,4 @@
+.mat-raised-button {
+ background-color: var(--primary);
+ color: var(--on-primary);
+}
diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 98683e222..137d1da26 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -14,16 +14,15 @@
<div class="button-bar" fxLayoutAlign="center center">
<button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && userRole === 1 && comments.length > 0"
[matTooltip]="'Export comments'" (click)="openExportDialog()">
- <mat-icon class="searchBarIcon" color="accent">cloud_download</mat-icon>
+ <mat-icon class="searchBarIcon">cloud_download</mat-icon>
</button>
- <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value"
- color="accent" (click)="openCreateDialog()">
+ <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value" (click)="openCreateDialog()">
<mat-icon class="searchBarIcon">add_circle</mat-icon>
</button>
<button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && comments.length > 0"
- color="accent" [matMenuTriggerFor]="filterMenu">
+ [matMenuTriggerFor]="filterMenu">
<mat-icon class="searchBarIcon">sort</mat-icon>
</button>
</div>
diff --git a/src/app/components/shared/comment-list/comment-list.component.scss b/src/app/components/shared/comment-list/comment-list.component.scss
index 3b05a842c..e57356072 100644
--- a/src/app/components/shared/comment-list/comment-list.component.scss
+++ b/src/app/components/shared/comment-list/comment-list.component.scss
@@ -23,6 +23,7 @@ input {
min-height: 60px;
font-size: large;
border-radius: 5px;
+ color: var(--on-primary);
}
#search-container {
@@ -41,6 +42,7 @@ input {
text-align: center;
min-width: 50px;
margin: 0 2% 0 0;
+ color: var(--secondary);
}
.close {
@@ -52,6 +54,7 @@ input {
height: 45px;
width: 45px;
line-height: 100% !important;
+ color: var(--secondary);
}
.no-comments {
@@ -59,7 +62,7 @@ input {
}
h4 {
- color: var(--text-1);
+ color: var(--on-surface);
}
.button-bar {
diff --git a/src/app/components/shared/footer/footer.component.scss b/src/app/components/shared/footer/footer.component.scss
index 12f631a96..fbb2409f2 100644
--- a/src/app/components/shared/footer/footer.component.scss
+++ b/src/app/components/shared/footer/footer.component.scss
@@ -3,7 +3,7 @@ footer {
}
#footer-toolbar {
- background-color: var(--grey-light);
+ background-color: var(--primary-variant);
height: auto;
&:first-child {
@@ -18,7 +18,7 @@ footer {
.mat-button {
min-height: 28px;
font-size: 12px;
- color: var(--text-1);
+ color: var(--on-primary);
}
mat-icon {
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index c5da79c4d..1aa4a4900 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -68,11 +68,11 @@
<mat-menu #userMenu="matMenu" [overlapTrigger]="false">
<button mat-menu-item (click)=login(true)>
- <mat-icon color="primary">record_voice_over</mat-icon>
+ <mat-icon>record_voice_over</mat-icon>
<span>{{ 'login-page.creator' | translate }}</span>
</button>
<button mat-menu-item (click)=login(false)>
- <mat-icon color="primary">supervisor_account</mat-icon>
+ <mat-icon>supervisor_account</mat-icon>
<span>{{ 'login-page.participant' | translate }}</span>
</button>
</mat-menu>
diff --git a/src/app/components/shared/login/login.component.html b/src/app/components/shared/login/login.component.html
index 055c6116e..9a0f95a88 100644
--- a/src/app/components/shared/login/login.component.html
+++ b/src/app/components/shared/login/login.component.html
@@ -14,18 +14,18 @@
[formControl]="passwordFormControl" [errorStateMatcher]="matcher" name="password"/>
<mat-error *ngIf="passwordFormControl.hasError('required')">{{ 'login.password-required' | translate }}</mat-error>
</mat-form-field>
- <button mat-raised-button color="accent" (click)="login(userEmail.value, userPassword.value)">{{ 'login.login' | translate }}</button>
- <button mat-raised-button *ngIf="guestAllowed === true" color="primary" (click)="guestLogin()" type="button" class="guestButton">
+ <button mat-raised-button class="loginButton" (click)="login(userEmail.value, userPassword.value)">{{ 'login.login' | translate }}</button>
+ <button mat-raised-button *ngIf="role === 0"(click)="guestLogin()" type="button">
{{ 'login.guest-login' | translate }}
</button>
<div align="start">
- <button mat-button color="primary" class="pwReset" (click)="openPasswordDialog()">
+ <button mat-button class="pwReset" (click)="openPasswordDialog()">
{{ 'login-page.password-reset' | translate }}
</button>
</div>
<div fxLayout="row">
<p>{{ 'login-page.not-registered' | translate }}</p>
- <button mat-button color="primary" class="regButton" (click)="openRegisterDialog()">
+ <button mat-button class="regButton" (click)="openRegisterDialog()">
{{ 'login-page.register' | translate }}
</button>
</div>
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index 979c20185..a4ed6de83 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -1,10 +1,17 @@
.pwReset {
padding-left: 0;
+ color: var(--primary);
}
.regButton {
margin-top: 20px;
padding: 0;
+ color: var(--primary);
+}
+
+.loginButton {
+ background-color: var(--primary);
+ color: var(--on-primary);
}
p {
diff --git a/src/app/components/shared/login/login.component.ts b/src/app/components/shared/login/login.component.ts
index bd1d3126a..3170fa3be 100644
--- a/src/app/components/shared/login/login.component.ts
+++ b/src/app/components/shared/login/login.component.ts
@@ -28,7 +28,6 @@ export class LoginComponent implements OnInit, OnChanges {
username: string;
password: string;
isStandard = true;
- guestAllowed = true;
usernameFormControl = new FormControl('', [Validators.required, Validators.email]);
passwordFormControl = new FormControl('', [Validators.required]);
diff --git a/src/app/components/shared/room-join/room-join.component.scss b/src/app/components/shared/room-join/room-join.component.scss
index a06f2d7d8..45dba96f1 100644
--- a/src/app/components/shared/room-join/room-join.component.scss
+++ b/src/app/components/shared/room-join/room-join.component.scss
@@ -19,8 +19,8 @@ mat-error {
.mat-fab {
width: 65px;
height: 65px;
- background-color: var(--secondary);
- color: var(--on-secondary);
+ background-color: var(--primary);
+ color: var(--on-primary);
}
input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-inner-spin-button {
diff --git a/src/app/components/shared/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts
index 0eff89b6b..e1b08831e 100644
--- a/src/app/components/shared/room-join/room-join.component.ts
+++ b/src/app/components/shared/room-join/room-join.component.ts
@@ -3,21 +3,13 @@ import { Room } from '../../../models/room';
import { RoomService } from '../../../services/http/room.service';
import { Router } from '@angular/router';
import { RegisterErrorStateMatcher } from '../../home/_dialogs/register/register.component';
-import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { ErrorStateMatcher } from '@angular/material';
+import { FormControl, Validators } from '@angular/forms';
import { NotificationService } from '../../../services/util/notification.service';
import { TranslateService } from '@ngx-translate/core';
import { AuthenticationService } from '../../../services/http/authentication.service';
import { UserRole } from '../../../models/user-roles.enum';
import { User } from '../../../models/user';
-export class JoinErrorStateMatcher implements ErrorStateMatcher {
- isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
- const isSubmitted = form && form.submitted;
- return (control && control.invalid && (control.dirty || control.touched || isSubmitted));
- }
-}
-
@Component({
selector: 'app-room-join',
templateUrl: './room-join.component.html',
diff --git a/src/app/components/shared/statistic/statistic.component.scss b/src/app/components/shared/statistic/statistic.component.scss
index 7ecc8110a..1aa1290df 100644
--- a/src/app/components/shared/statistic/statistic.component.scss
+++ b/src/app/components/shared/statistic/statistic.component.scss
@@ -23,9 +23,9 @@ mat-icon {
}
h4 {
- color: var(--text-1);
+ color: var(--on-surface);
}
mat-list-item {
- color: var(--text-1)!important;
+ color: var(--on-surface)!important;
}
diff --git a/src/theme/blue-theme/blueTheme.const.ts b/src/theme/blue-theme/blueTheme.const.ts
index a70bf2a29..ed8104d90 100644
--- a/src/theme/blue-theme/blueTheme.const.ts
+++ b/src/theme/blue-theme/blueTheme.const.ts
@@ -3,17 +3,17 @@ export const blue = {
'--primary' : '#3f51b5',
'--primary-variant': '#757de8',
- '--secondary': '#3f51b5',
- '--secondary-variant': '#757de8',
+ '--secondary': '#ffca28',
+ '--secondary-variant': '#fff350',
'--background': '#f5f5f5',
'--surface': '#bdbdbd',
'--dialog': '#c2c2c2',
'--on-primary': '#FFFFFF',
- '--on-secondary': '#FFFFFF',
- '--on-background': '#212121',
- '--on-surface': '#212121',
+ '--on-secondary': '#000000',
+ '--on-background': '#000000',
+ '--on-surface': '#000000',
'--green': '#AED581',
'--red': '#FF8A80',
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index 6aa4c582e..6fa819ab9 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -1,17 +1,17 @@
export const dark = {
- '--primary' : '#00796b',
- '--primary-variant': '#455a64',
+ '--primary' : '#004d40',
+ '--primary-variant': '#39796b',
- '--secondary': '#004d40',
- '--secondary-variant': '#bdbdbd',
+ '--secondary': '#bdbdbd',
+ '--secondary-variant': '#efefef',
'--background': '#424242',
'--surface': '#212121',
'--dialog': '#78909c',
- '--on-primary': '#212121',
- '--on-secondary': '#FFFFFF',
+ '--on-primary': '#FFFFFF',
+ '--on-secondary': '#000000',
'--on-background': '#FFFFFF',
'--on-surface': '#FFFFFF',
diff --git a/src/theme/default-theme/defaultTheme.const.ts b/src/theme/default-theme/defaultTheme.const.ts
index 27d001ede..0ad7a77cf 100644
--- a/src/theme/default-theme/defaultTheme.const.ts
+++ b/src/theme/default-theme/defaultTheme.const.ts
@@ -10,10 +10,10 @@ export const arsnova = {
'--surface': '#0288d1',
'--dialog': '#B2DFDB',
- '--on-primary': '#212121',
- '--on-secondary': '#212121',
- '--on-background': '#212121',
- '--on-surface': '#212121',
+ '--on-primary': '#000000',
+ '--on-secondary': '#000000',
+ '--on-background': '#000000',
+ '--on-surface': '#000000',
'--green': '#AED581',
'--red': '#FF8A80',
diff --git a/src/theme/purple-theme/purpleTheme.const.ts b/src/theme/purple-theme/purpleTheme.const.ts
index 56c14f577..56f74641b 100644
--- a/src/theme/purple-theme/purpleTheme.const.ts
+++ b/src/theme/purple-theme/purpleTheme.const.ts
@@ -3,17 +3,17 @@ export const purple = {
'--primary' : '#9c27b0',
'--primary-variant': '#d05ce3',
- '--secondary': '#9c27b0',
- '--secondary-variant': '#d05ce3',
+ '--secondary': '#ffca28',
+ '--secondary-variant': '#fffd61',
'--background': '#f5f5f5',
'--surface': '#bdbdbd',
'--dialog': '#c2c2c2',
'--on-primary': '#FFFFFF',
- '--on-secondary': '#FFFFFF',
- '--on-background': '#212121',
- '--on-surface': '#212121',
+ '--on-secondary': '#000000',
+ '--on-background': '#000000',
+ '--on-surface': '#000000',
'--green': '#AED581',
'--red': '#FF8A80',
--
GitLab