Skip to content
Snippets Groups Projects
Commit a44ff792 authored by Tom Käsler's avatar Tom Käsler
Browse files

Merge branch '266-change-default-theme-do-dark-theme' into 'master'

Change default theme and theme order

Closes #266

See merge request !213
parents 8c8d1fc7 4140d46e
Branches
Tags
No related merge requests found
...@@ -9,17 +9,15 @@ ...@@ -9,17 +9,15 @@
<mat-menu class="color-menu" #themeMenu="matMenu" [overlapTrigger]="false"> <mat-menu class="color-menu" #themeMenu="matMenu" [overlapTrigger]="false">
<mat-grid-list cols="2"> <mat-grid-list cols="2">
<mat-grid-tile> <mat-grid-tile>
<button mat-icon-button class="default color-button" (click)="changeTheme('arsnova')"> <button mat-icon-button class="dark color-button" (click)="changeTheme('dark')">
<mat-icon class="color-icon"> <mat-icon class="color-icon">lens</mat-icon>
lens <mat-icon *ngIf="themeClass === 'dark'" class="check">check_circle</mat-icon>
<mat-icon *ngIf="themeClass === 'arsnova'" class="check">check_circle</mat-icon>
</mat-icon>
</button> </button>
</mat-grid-tile> </mat-grid-tile>
<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 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> </button>
</mat-grid-tile> </mat-grid-tile>
<mat-grid-tile> <mat-grid-tile>
......
...@@ -20,7 +20,7 @@ export const dark = { ...@@ -20,7 +20,7 @@ export const dark = {
'--yellow': '#FFD54F', '--yellow': '#FFD54F',
'--blue': '#3f51b5', '--blue': '#3f51b5',
'--purple': '#9c27b0', '--purple': '#9c27b0',
'--mint': '#80ba24', '--light-green': '#80ba24',
'--grey': '#BDBDBD', '--grey': '#BDBDBD',
'--grey-light': '#9E9E9E', '--grey-light': '#9E9E9E',
'--black': '#212121' '--black': '#212121'
......
...@@ -10,7 +10,7 @@ import { Subscription } from 'rxjs'; ...@@ -10,7 +10,7 @@ import { Subscription } from 'rxjs';
export class ThemeDirective implements OnInit, OnDestroy { export class ThemeDirective implements OnInit, OnDestroy {
private themeName = 'arsnova'; private themeName = 'dark';
private themServiceSubscription: Subscription; private themServiceSubscription: Subscription;
constructor(private elementRef: ElementRef, constructor(private elementRef: ElementRef,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment