From 2e68e8e8b5a60e5b50eab7cf2ab1b9e9115e84db Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Fri, 2 Dec 2022 00:58:08 +0000 Subject: [PATCH] Add new border color variable for increased contrast Signed-off-by: Christopher Ng (cherry picked from commit 24ffe328452e0e247017894ea9d49944470fd2bc) --- apps/theming/css/default.css | 1 + apps/theming/lib/Themes/DarkTheme.php | 1 + apps/theming/lib/Themes/DefaultTheme.php | 1 + 3 files changed, 3 insertions(+) diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 0d3f3402fce..5e8cd6b985d 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -32,6 +32,7 @@ --color-box-shadow: rgba(var(--color-box-shadow-rgb), 0.5); --color-border: #ededed; --color-border-dark: #dbdbdb; + --color-border-maxcontrast: #949494; --font-face: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; --default-font-size: 15px; --animation-quick: 100ms; diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php index ecd4c7d3fd6..588f8f5a8a6 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -91,6 +91,7 @@ class DarkTheme extends DefaultTheme implements ITheme { '--color-border' => $this->util->lighten($colorMainBackground, 7), '--color-border-dark' => $this->util->lighten($colorMainBackground, 14), + '--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 30), '--background-invert-if-dark' => 'invert(100%)', '--background-invert-if-bright' => 'no', diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 94b71eb9d12..167b3c05f62 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -157,6 +157,7 @@ class DefaultTheme implements ITheme { '--color-border' => $this->util->darken($colorMainBackground, 7), '--color-border-dark' => $this->util->darken($colorMainBackground, 14), + '--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 42), '--font-face' => "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'", '--default-font-size' => '15px', -- 2.39.5