From d9b77bc2eb16c9c718e0590989b7154ad7d51f62 Mon Sep 17 00:00:00 2001 From: John Molakvoæ Date: Tue, 26 Apr 2022 08:29:43 +0200 Subject: Fix dark theme primary mix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- apps/theming/lib/Themes/DarkTheme.php | 5 +++++ core/css/apps.scss | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php index f0cacfc1696..e09cc99f728 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -69,6 +69,11 @@ class DarkTheme extends DefaultTheme implements ITheme { '--color-placeholder-light' => $this->util->lighten($colorMainBackground, 10), '--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 20), + '--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 80), + '--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, 10), + '--color-primary-element-hover' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 80), + '--color-primary-element-lighter' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 15), + '--color-text-maxcontrast' => $this->util->darken($colorMainText, 30), '--color-text-light' => $this->util->darken($colorMainText, 10), '--color-text-lighter' => $this->util->darken($colorMainText, 20), diff --git a/core/css/apps.scss b/core/css/apps.scss index 84179a94633..8d753eb8d23 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -166,7 +166,6 @@ kbd { &, > a { background-color: var(--color-primary-light); - color: var(--color-primary-text); } } -- cgit v1.2.3