diff options
| author | Christopher Ng <chrng8@gmail.com> | 2023-06-05 17:28:19 -0700 |
|---|---|---|
| committer | Christopher Ng <chrng8@gmail.com> | 2023-06-06 08:47:56 -0700 |
| commit | 27ebaea10c3b7868379150d0e44e17baefb3eb00 (patch) | |
| tree | a319c3eb169e3b25719061e5885f29621f24a8c1 | |
| parent | fd7d0e2fd2d8e6ed52b41cd782f98a473de21b01 (diff) | |
| download | nextcloud-server-27ebaea10c3b7868379150d0e44e17baefb3eb00.tar.gz nextcloud-server-27ebaea10c3b7868379150d0e44e17baefb3eb00.zip | |
enh(theming): Error contrast
Signed-off-by: Christopher Ng <chrng8@gmail.com>
| -rw-r--r-- | apps/theming/css/default.css | 1 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DarkTheme.php | 7 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index e97e4e98216..a305faba543 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -20,6 +20,7 @@ --color-error: #e9322d; --color-error-rgb: 233,50,45; --color-error-hover: #ed5a56; + --color-error-text: #e7201b; --color-warning: #eca700; --color-warning-rgb: 236,167,0; --color-warning-hover: #efb832; diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php index 588f8f5a8a6..6c90c8e5aa5 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -59,6 +59,8 @@ class DarkTheme extends DefaultTheme implements ITheme { $colorBoxShadow = $this->util->darken($colorMainBackground, 70); $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow)); + $colorError = '#e9322d'; + return array_merge( $defaultVariables, $this->generatePrimaryVariables($colorMainBackground, $colorMainText), @@ -82,6 +84,11 @@ class DarkTheme extends DefaultTheme implements ITheme { '--color-text-light' => $this->util->darken($colorMainText, 10), '--color-text-lighter' => $this->util->darken($colorMainText, 20), + '--color-error' => $colorError, + '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)), + '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 60), + '--color-error-text' => $this->util->lighten($colorError, 3), + // used for the icon loading animation '--color-loading-light' => '#777', '--color-loading-dark' => '#CCC', diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 3fcaa7cf58f..3df6ce081f1 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -109,6 +109,8 @@ class DefaultTheme implements ITheme { $colorBoxShadow = $this->util->darken($colorMainBackground, 70); $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow)); + $colorError = '#e9322d'; + $variables = [ '--color-main-background' => $colorMainBackground, '--color-main-background-rgb' => $colorMainBackgroundRGB, @@ -137,10 +139,11 @@ class DefaultTheme implements ITheme { '--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)', - // info/warning/success feedback colours - '--color-error' => '#e9322d', - '--color-error-rgb' => join(',', $this->util->hexToRGB('#e9322d')), - '--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 60), + // error/warning/success/info feedback colours + '--color-error' => $colorError, + '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)), + '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 60), + '--color-error-text' => $this->util->darken($colorError, 4), '--color-warning' => '#eca700', '--color-warning-rgb' => join(',', $this->util->hexToRGB('#eca700')), '--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 60), |