diff options
| author | John Molakvoæ <skjnldsv@protonmail.com> | 2023-05-04 12:51:02 +0200 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2023-05-04 14:41:19 +0200 |
| commit | 4c71d8f8a418c1b2a2a1679b1f0fb2b8e221f651 (patch) | |
| tree | c8b4eb5f8ccbe456ad1aad6e5afa85e2be1f919b | |
| parent | b603a3eac7962dde4e34abc54980cdff02f02b53 (diff) | |
| download | nextcloud-server-4c71d8f8a418c1b2a2a1679b1f0fb2b8e221f651.tar.gz nextcloud-server-4c71d8f8a418c1b2a2a1679b1f0fb2b8e221f651.zip | |
fix(theming): replace elementColor dark value with better contrast `#8c8c8c`
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/theming/css/default.css | 6 | ||||
| -rw-r--r-- | apps/theming/lib/Util.php | 2 | ||||
| -rw-r--r-- | apps/theming/tests/CapabilitiesTest.php | 4 | ||||
| -rw-r--r-- | apps/theming/tests/UtilTest.php | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 4cb9b85a293..da9ad6e97de 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 e856802cb05..f5321dada67 100644 --- a/apps/theming/lib/Util.php +++ b/apps/theming/lib/Util.php @@ -91,7 +91,7 @@ class Util { 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 1de439a70e9..1c968383d53 100644 --- a/apps/theming/tests/CapabilitiesTest.php +++ b/apps/theming/tests/CapabilitiesTest.php @@ -111,7 +111,7 @@ class CapabilitiesTest extends TestCase { '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 @@ class CapabilitiesTest extends TestCase { '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 8f6d972a2fc..789107d9fdf 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -112,7 +112,7 @@ class UtilTest extends TestCase { public function testElementColorOnDarkBackground() { $elementColor = $this->util->elementColor("#000000", false); - $this->assertEquals('#555555', $elementColor); + $this->assertEquals('#8c8c8c', $elementColor); } public function testElementColorOnBrightBackground() { |