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 3ee60dbbe863b05b87b707e6d13274afc1466e76..2f15fed9f6bfc0fc9d6fd66583640ee583d52f46 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 d242af83aa7e540bf7b9a4c4a8d96911bd22c8f8..06d08210693c27ccb1718becc5f9bb3f434d078e 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 e12c461abd84156066c3fb6cfcb9db80d38e824c..c54319eef7fb56c18e241c69427d4e2b46f9f5d9 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 16599afe763f0c8876d09feff4a10ed9cc6a93e7..aebdb24b52c9ff78858817e02630b086ae6c0d7d 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 0d494c82069bae8d6a245a4ab50d7d3783bcb8bc..3dddc875d66c25254ceea7e7a0c0046e3b91af5a 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 483bd4ba53041ba035ff1462dc7d8a41dc0cbed2..b389ce2e907078b499bd499e561b5f4bb18a7ec5 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 d0c3bef729c69f04e798c2b4272084c65b1a7276..236216731a7d7ac9545b3039f07b15926ea9693f 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 075e8c1803e4fda825d752629d141216840d5917..3f9eb37ee4d2b7d61c2a7cbfd6064820db3da36e 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 a79b6e01b407a1aa384d5cf3c90647b3bb7221d4..feecd6014a4e081262bc1b1d7620f747210417cb 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 61c83cf9a7dcb9f05e26748ee573a817780f1d63..4b6e92c0b8df802c07e7c0f5988113e281894fd1 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 0bc0bfa469125ed02391d45fe03b8cc8b8ac7ed5..5945fe3f55e871158a8f1f210c2c534949c681a3 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 57541136c3a813bed4e71b72a37f3d360d6d05d7..7a4fee85c491b654387fae7f9d2a178fb9d774d6 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 60a77b90de30c8aaff2bd295e8b4561c609fa404..d9a776aea364e5547a90dccf135fbab779022769 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 687e7d96c8ae5f81676b91d911abedb0790ac2f9..3eb278fae9f3ee459aff8278e0a0df2bb128711d 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 839c16c1c8ae2a1904012fc677cba2ddd5d22c60..dd2647f880e0105e06eaa1463d44677e487973c0 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 687e7d96c8ae5f81676b91d911abedb0790ac2f9..3eb278fae9f3ee459aff8278e0a0df2bb128711d 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 f0aa3bc03ac579756904a41101e3b1ea4369be42..b6d80569da72ba0f390b1cd7f604548eaf1940f8 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 e41d2f8e71267ae6bbf57136c28f1b516b0b9464..d3d6bf63ddf152611588ef169190f05a7056f9cb 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 848b1e6b8c742db7af908ff2ff88f8eb5057506b..129b1836d01ef4b50969e7863f621725ff3a235a 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 450ebd8a027dca1d699b68eb4ca127a2af87e2c7..4404a3f5090fd5201500c97c1ecdbb4a4b9f3475 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 7eae850eaed7c04d88ccb0b1b6d5cdd61e7fc077..946e8873e489d39768f0d5bac1625d7c49e51b5b 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 78777d0a839395d1f7c866668df3246e9357287b..e892ecccc0cbebcc2a402c5887bb794d52b495d9 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 b3e1ce6e59fddc64432aaca9b7f224f71d684957..d908bc36736e07e45f4c8e0252898aa8027951f1 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f7a8134c25177fea3c40a712136c99684806aa9a 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 98683e222c0faf29ea01c830232ec7f3d47bffab..137d1da26b1ce13fb400438f11dd0b51406c48e9 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 3b05a842c9d3f73239168909ba5984345bcea37c..e57356072db4227fcc127ed8a23fee5aee8947f8 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 12f631a965bf22c774e601f4a425209f5ca04fe9..fbb2409f2c08531e1687fb52a0713f12fe0a4be6 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 c5da79c4d7d18c011755063278d8ea80fa893a81..1aa4a4900a597ad0dae7e994774ba677fc185059 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 055c6116efc7da46d691af798b4cbf498c27a8bb..9a0f95a8867a7adbf76e9652d480f1ff2bafb1a8 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 979c20185f30306a2ad7c51b03a80c348936bd6a..a4ed6de83dd549954b342f6a725c773228af5139 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 bd1d3126aae699186995bf5d099836853f3efd67..3170fa3be5eb90a047b2b7eb45fae665d1e33e23 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 a06f2d7d82cc4e494e8918e1c9dd655d6e1753a5..45dba96f16cd0b60ff370fcb8d9200f2cda7173d 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 0eff89b6bddb5d506b2124d12df54cb72627d410..e1b08831e46b488a82bc9619acac630caf489925 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 7ecc8110a20f00ea2a2ba1de7dc3fecccad66f45..1aa1290dfd7d7fce424c201c68004e895774562c 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 a70bf2a2934a159336414ddc1abfa676b44b67f3..ed8104d90df9abcc8d35e7d0e7bbccec99269266 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 6aa4c582e58ee1f5cded0c675a093cbd0fb2422a..6fa819ab9399575d54889346f967429018b1244c 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 27d001ede101145f93c0f35baf6ea9ff5eb74197..0ad7a77cf7ab691c4f859abe9d5e6a86e323a727 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 56c14f57720e0f9a0cccfe28c2b009cd55b9c35f..56f74641ba0054326395c50262ee02ab59405130 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',