diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 4cb9b85a293b9..da9ad6e97deea 100644 --- 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 index e856802cb05e0..f5321dada67dc 100644 --- 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 index 1de439a70e94a..1c968383d53d2 100644 --- 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 index 8f6d972a2fc99..789107d9fdfb8 100644 --- 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() {