fix(theming): Adjust color-error and color-success to work for in…

…put border colors Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Dec 22, 2023 · afc1efa · afc1efa
1 parent 5df92fe
commit afc1efa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -52,17 +52,17 @@ public function getDescription(): string {
 	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,15 +92,15 @@ public function getCSSVariables(): array {
 				'--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),
 				'--color-warning-text' => $colorWarning,
 				'--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
@@ -111,7 +111,7 @@ public function getCSSVariables(): array {
 		$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 @@ public function getCSSVariables(): array {
 			'--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),