From 8e177a61b50ed0d0052f67ee68ea9dc906c1ff39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Wed, 22 May 2019 23:35:35 +0200
Subject: [PATCH] Final fixes
---
src/app/components/shared/comment/comment.component.scss | 6 +++++-
src/theme/dark-Theme/darkTheme.const.ts | 6 ++----
src/theme/default-Theme/defaultTheme.const.ts | 6 ++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index fcd961e08..9e2cb8116 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -75,7 +75,11 @@ h2 {
}
.highlighted {
- background-color: var(--highlighted)!important;
+ background-color: var(--secondary)!important;
transition: background-color 1s linear;
}
+.highlighted * {
+ color: var(--on-secondary)!important;
+}
+
diff --git a/src/theme/dark-Theme/darkTheme.const.ts b/src/theme/dark-Theme/darkTheme.const.ts
index 797bdf77e..68b61d0d4 100644
--- a/src/theme/dark-Theme/darkTheme.const.ts
+++ b/src/theme/dark-Theme/darkTheme.const.ts
@@ -8,6 +8,7 @@ export const dark = {
'--background': '#424242',
'--surface': '#212121',
+ '--dialog': '#78909c',
'--on-primary': '#212121',
'--on-secondary': '#212121',
@@ -19,8 +20,5 @@ export const dark = {
'--yellow': '#FFD54F',
'--blue': '#1E88E5',
'--grey': '#BDBDBD',
- '--grey-light': '#9E9E9E',
-
- '--dialog': '#78909c',
- '--highlighted' : '#005F63'
+ '--grey-light': '#9E9E9E'
};
diff --git a/src/theme/default-Theme/defaultTheme.const.ts b/src/theme/default-Theme/defaultTheme.const.ts
index 8d837240f..30c85dab7 100644
--- a/src/theme/default-Theme/defaultTheme.const.ts
+++ b/src/theme/default-Theme/defaultTheme.const.ts
@@ -8,6 +8,7 @@ export const defaultTheme = {
'--background': '#b2dfdb',
'--surface': '#0288d1',
+ '--dialog': '#B2DFDB',
'--on-primary': '#212121',
'--on-secondary': '#212121',
@@ -19,8 +20,5 @@ export const defaultTheme = {
'--yellow': '#FFD54F',
'--blue': '#1E88E5',
'--grey': '#BDBDBD',
- '--grey-light': '#EEEEEE',
-
- '--dialog': '#B2DFDB',
- '--highlighted' : '#FFE082'
+ '--grey-light': '#EEEEEE'
};
--
GitLab