From 6583f574f094da0993e7b2baae9988c774abe2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Mon, 17 Jun 2019 16:57:29 +0200
Subject: [PATCH] Adjust dark theme
---
.../creator/content-list/content-list.component.html | 2 +-
.../creator/content-list/content-list.component.scss | 7 ++++++-
.../components/home/home-page/home-page.component.scss | 2 +-
.../shared/room-list/room-list.component.scss | 2 +-
src/theme/dark-theme/darkTheme.const.ts | 10 +++++-----
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/app/components/creator/content-list/content-list.component.html b/src/app/components/creator/content-list/content-list.component.html
index e6dc728ee..8d84de4ee 100644
--- a/src/app/components/creator/content-list/content-list.component.html
+++ b/src/app/components/creator/content-list/content-list.component.html
@@ -1,4 +1,4 @@
-<div fxLayout="row" fxLayoutGap="20px" fxLayoutAlign="center">
+ <div fxLayout="row" fxLayoutGap="20px" fxLayoutAlign="center">
<mat-card>
<mat-card-header>
<mat-card-title>
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 d48250df0..b18bfd992 100644
--- a/src/app/components/creator/content-list/content-list.component.scss
+++ b/src/app/components/creator/content-list/content-list.component.scss
@@ -40,7 +40,7 @@ mat-expansion-panel-header {
h2 {
font-size: larger;
- color: var(--on-surface) !important;
+ color: var(--on-surface);
}
.actionButton {
@@ -80,3 +80,8 @@ mat-tooltip-component {
mat-progress-spinner {
margin-top: 10px;
}
+
+h3 {
+ font-size: larger;
+ color: var(--on-surface);
+}
diff --git a/src/app/components/home/home-page/home-page.component.scss b/src/app/components/home/home-page/home-page.component.scss
index d20082412..bb9dd76b9 100644
--- a/src/app/components/home/home-page/home-page.component.scss
+++ b/src/app/components/home/home-page/home-page.component.scss
@@ -10,7 +10,7 @@
font-weight: bold;
text-align: center;
letter-spacing: 10px;
- color: var(--secondary);
+ color: var(--on-surface);
animation: moveInLeft 2s ease-out;
padding-top: 10px;
}
diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
index 66f62efcb..73265ef94 100644
--- a/src/app/components/shared/room-list/room-list.component.scss
+++ b/src/app/components/shared/room-list/room-list.component.scss
@@ -1,6 +1,6 @@
button {
margin-right: 10px;
- color: var(--primary);
+ color: var(--secondary);
}
.mat-expansion-panel-header-description {
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index a5557f2fe..d31e4f3de 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -1,16 +1,16 @@
export const dark = {
- '--primary' : '#004d40',
- '--primary-variant': '#39796b',
+ '--primary' : '#4db6ac',
+ '--primary-variant': '#80cbc4',
- '--secondary': '#bdbdbd',
- '--secondary-variant': '#efefef',
+ '--secondary': '#3949ab',
+ '--secondary-variant': '#6f74dd',
'--background': '#424242',
'--surface': '#212121',
'--dialog': '#757575',
- '--on-primary': '#FFFFFF',
+ '--on-primary': '#000000',
'--on-secondary': '#000000',
'--on-background': '#FFFFFF',
'--on-surface': '#FFFFFF',
--
GitLab