diff options
| author | Pytal <24800714+Pytal@users.noreply.github.com> | 2022-07-18 10:43:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-18 10:43:36 -0700 |
| commit | 42bcbe269f09bac30251ac102f202fc0091602c9 (patch) | |
| tree | 774f169cd76509f3796bf372509e08c28f3a67ee | |
| parent | d07b78635e9cfe0f1c5219cef48d4506f4b43314 (diff) | |
| parent | 3f63724c2d2d019ebdeedc80006615f96cc866d5 (diff) | |
| download | nextcloud-server-42bcbe269f09bac30251ac102f202fc0091602c9.tar.gz nextcloud-server-42bcbe269f09bac30251ac102f202fc0091602c9.zip | |
Merge pull request #33246 from nextcloud/bugfix/noid/dark-primary-light
| -rw-r--r-- | apps/theming/lib/Themes/DarkTheme.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php index 1241d1d42c3..bcf4bf695d4 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -56,8 +56,9 @@ class DarkTheme extends DefaultTheme implements ITheme { $colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground)); $colorBoxShadow = $this->util->darken($colorMainBackground, 70); $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow)); + $colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80); - return array_merge($defaultVariables, [ + return array_merge($defaultVariables, [ '--color-main-text' => $colorMainText, '--color-main-background' => $colorMainBackground, '--color-main-background-rgb' => $colorMainBackgroundRGB, @@ -70,7 +71,8 @@ class DarkTheme extends DefaultTheme implements ITheme { '--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 20), '--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60), - '--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, -80), + '--color-primary-light' => $colorPrimaryLight, + '--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90), '--color-primary-element' => $this->util->elementColor($this->primaryColor, false), '--color-primary-element-hover' => $this->util->mix($this->util->elementColor($this->primaryColor, false), $colorMainBackground, 80), '--color-primary-element-light' => $this->util->lighten($this->util->elementColor($this->primaryColor, false), 15), |