fix(theming): replace elementColor dark value with better contrast `#…

…8c8c8c` Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
nextcloud · May 4, 2023 · 4c71d8f · 4c71d8f
1 parent b603a3e
commit 4c71d8f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
@@ -63,14 +63,12 @@
   --color-primary-light: #e5f0f5;
   --color-primary-light-text: #002a41;
   --color-primary-light-hover: #dbe5ea;
-  --color-primary-element-text-dark: #ededed;
   --color-primary-element: #006aa3;
-  --color-primary-element-default-hover: #329bd3;
-  --color-primary-element-text: #ffffff;
   --color-primary-element-hover: #3287b5;
+  --color-primary-element-text: #ffffff;
   --color-primary-element-light: #e5f0f5;
-  --color-primary-element-light-text: #002a41;
   --color-primary-element-light-hover: #dbe5ea;
+  --color-primary-element-light-text: #002a41;
   --color-primary-element-text-dark: #ededed;
   --gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%);
   --image-background-default: url('/apps/theming/img/background/kamil-porembinski-clouds.jpg');

diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
@@ -91,7 +91,7 @@ public function elementColor($color, bool $brightBackground = true) {
 
 		if (!$brightBackground && $luminance < 0.2) {
 			// If the color is too dark in dark mode, we fall back to a brighter gray
-			return '#555555';
+			return '#8c8c8c';
 		}
 
 		return $color;

diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
@@ -111,7 +111,7 @@ public function dataGetCapabilities() {
 				'color-text' => '#ffffff',
 				'color-element' => '#000000',
 				'color-element-bright' => '#000000',
-				'color-element-dark' => '#555555',
+				'color-element-dark' => '#8c8c8c',
 				'logo' => 'http://localhost/logo5',
 				'background' => '#000000',
 				'background-plain' => true,
@@ -127,7 +127,7 @@ public function dataGetCapabilities() {
 				'color-text' => '#ffffff',
 				'color-element' => '#000000',
 				'color-element-bright' => '#000000',
-				'color-element-dark' => '#555555',
+				'color-element-dark' => '#8c8c8c',
 				'logo' => 'http://localhost/logo5',
 				'background' => '#000000',
 				'background-plain' => true,

diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
@@ -112,7 +112,7 @@ public function testElementColorDefault() {
 
 	public function testElementColorOnDarkBackground() {
 		$elementColor = $this->util->elementColor("#000000", false);
-		$this->assertEquals('#555555', $elementColor);
+		$this->assertEquals('#8c8c8c', $elementColor);
 	}
 
 	public function testElementColorOnBrightBackground() {