aboutsummaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2023-12-19 12:09:47 +0100
committerEduardo Morales <emoral435@gmail.com>2023-12-19 10:20:33 -0600
commitacfb8ef551291ba976f80a4aca88c5bebe67aef1 (patch)
treea84c8a115c1a10c0dfef9fb4994afae45fc9ca66 /apps/theming
parent74f6995bdb6fa85426048ac87cea7ed94902686f (diff)
downloadnextcloud-server-acfb8ef551291ba976f80a4aca88c5bebe67aef1.tar.gz
nextcloud-server-acfb8ef551291ba976f80a4aca88c5bebe67aef1.zip
fix(theming): Adjust `color-error` and `color-success` to work for input border colors
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/css/default.css8
-rw-r--r--apps/theming/lib/Themes/DarkTheme.php12
-rw-r--r--apps/theming/lib/Themes/DefaultTheme.php4
3 files changed, 12 insertions, 12 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
index 19d874e5a8e..157e28982c0 100644
--- a/apps/theming/css/default.css
+++ b/apps/theming/css/default.css
@@ -21,10 +21,10 @@
/** @deprecated use `--color-text-maxcontrast` instead */
--color-text-lighter: var(--color-text-maxcontrast);
--color-scrollbar: rgba(34,34,34, .15);
- --color-error: #C00505;
- --color-error-rgb: 192,5,5;
- --color-error-hover: #c72424;
- --color-error-text: #C00505;
+ --color-error: #DB0606;
+ --color-error-rgb: 219,6,6;
+ --color-error-hover: #df2525;
+ --color-error-text: #c20505;
--color-warning: #A37200;
--color-warning-rgb: 163,114,0;
--color-warning-hover: #8a6000;
diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php
index 0fed06e2225..4b038a8812c 100644
--- a/apps/theming/lib/Themes/DarkTheme.php
+++ b/apps/theming/lib/Themes/DarkTheme.php
@@ -52,17 +52,17 @@ class DarkTheme extends DefaultTheme implements ITheme {
public function getCSSVariables(): array {
$defaultVariables = parent::getCSSVariables();
- $colorMainText = '#D8D8D8';
+ $colorMainText = '#EBEBEB';
$colorMainBackground = '#171717';
$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
- $colorTextMaxcontrast = $this->util->darken($colorMainText, 28);
+ $colorTextMaxcontrast = $this->util->darken($colorMainText, 32);
$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
- $colorError = '#FF5252';
+ $colorError = '#FF3333';
$colorWarning = '#FFCC00';
- $colorSuccess = '#50BB50';
+ $colorSuccess = '#3B973B';
$colorInfo = '#00AEFF';
return array_merge(
@@ -92,7 +92,7 @@ class DarkTheme extends DefaultTheme implements ITheme {
'--color-error' => $colorError,
'--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
'--color-error-hover' => $this->util->lighten($colorError, 10),
- '--color-error-text' => $this->util->lighten($colorError, 10),
+ '--color-error-text' => $this->util->lighten($colorError, 15),
'--color-warning' => $colorWarning,
'--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)),
'--color-warning-hover' => $this->util->lighten($colorWarning, 10),
@@ -100,7 +100,7 @@ class DarkTheme extends DefaultTheme implements ITheme {
'--color-success' => $colorSuccess,
'--color-success-rgb' => join(',', $this->util->hexToRGB($colorSuccess)),
'--color-success-hover' => $this->util->lighten($colorSuccess, 10),
- '--color-success-text' => $colorSuccess,
+ '--color-success-text' => $this->util->lighten($colorSuccess, 15),
'--color-info' => $colorInfo,
'--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)),
'--color-info-hover' => $this->util->lighten($colorInfo, 10),
diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php
index 599c5ed58a9..d36feb000ae 100644
--- a/apps/theming/lib/Themes/DefaultTheme.php
+++ b/apps/theming/lib/Themes/DefaultTheme.php
@@ -111,7 +111,7 @@ class DefaultTheme implements ITheme {
$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
- $colorError = '#C00505';
+ $colorError = '#DB0606';
$colorWarning = '#A37200';
$colorSuccess = '#2d7b41';
$colorInfo = '#0071ad';
@@ -148,7 +148,7 @@ class DefaultTheme implements ITheme {
'--color-error' => $colorError,
'--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
'--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 75),
- '--color-error-text' => $colorError,
+ '--color-error-text' => $this->util->darken($colorError, 5),
'--color-warning' => $colorWarning,
'--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)),
'--color-warning-hover' => $this->util->darken($colorWarning, 5),