summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@protonmail.com>2022-04-26 08:29:43 +0200
committerJohn Molakvoæ <skjnldsv@protonmail.com>2022-04-26 09:00:11 +0200
commitd9b77bc2eb16c9c718e0590989b7154ad7d51f62 (patch)
tree79ef4ad7536d11369b1877cc87d8054294ce5951
parent8bcba22d77cc56433a38be29e66692db94c2081a (diff)
downloadnextcloud-server-d9b77bc2eb16c9c718e0590989b7154ad7d51f62.tar.gz
nextcloud-server-d9b77bc2eb16c9c718e0590989b7154ad7d51f62.zip
Fix dark theme primary mix
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
-rw-r--r--apps/theming/lib/Themes/DarkTheme.php5
-rw-r--r--core/css/apps.scss1
2 files changed, 5 insertions, 1 deletions
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);
}
}