From 4140d46ee06cdb43f636b82f0d3c4c4429cc5e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Mon, 10 Jun 2019 23:36:30 +0200
Subject: [PATCH] Change default theme and theme order
---
.../components/shared/header/header.component.html | 12 +++++-------
src/theme/dark-theme/darkTheme.const.ts | 2 +-
src/theme/theme.directive.ts | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 75e17bba2..a283efc5d 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -9,17 +9,15 @@
<mat-menu class="color-menu" #themeMenu="matMenu" [overlapTrigger]="false">
<mat-grid-list cols="2">
<mat-grid-tile>
- <button mat-icon-button class="default color-button" (click)="changeTheme('arsnova')">
- <mat-icon class="color-icon">
- lens
- <mat-icon *ngIf="themeClass === 'arsnova'" class="check">check_circle</mat-icon>
- </mat-icon>
+ <button mat-icon-button class="dark color-button" (click)="changeTheme('dark')">
+ <mat-icon class="color-icon">lens</mat-icon>
+ <mat-icon *ngIf="themeClass === 'dark'" class="check">check_circle</mat-icon>
</button>
</mat-grid-tile>
<mat-grid-tile>
- <button mat-icon-button class="dark color-button" (click)="changeTheme('dark')">
+ <button mat-icon-button class="default color-button" (click)="changeTheme('arsnova')">
<mat-icon class="color-icon">lens</mat-icon>
- <mat-icon *ngIf="themeClass === 'dark'" class="check">check_circle</mat-icon>
+ <mat-icon *ngIf="themeClass === 'arsnova'" class="check">check_circle</mat-icon>
</button>
</mat-grid-tile>
<mat-grid-tile>
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index 192c87683..e4f182d9e 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -20,7 +20,7 @@ export const dark = {
'--yellow': '#FFD54F',
'--blue': '#3f51b5',
'--purple': '#9c27b0',
- '--mint': '#80ba24',
+ '--light-green': '#80ba24',
'--grey': '#BDBDBD',
'--grey-light': '#9E9E9E',
'--black': '#212121'
diff --git a/src/theme/theme.directive.ts b/src/theme/theme.directive.ts
index e9903558f..40d08c6e9 100644
--- a/src/theme/theme.directive.ts
+++ b/src/theme/theme.directive.ts
@@ -10,7 +10,7 @@ import { Subscription } from 'rxjs';
export class ThemeDirective implements OnInit, OnDestroy {
- private themeName = 'arsnova';
+ private themeName = 'dark';
private themServiceSubscription: Subscription;
constructor(private elementRef: ElementRef,
--
GitLab