From a0266d1b1668fb2751c78057ffcfacca6f4b2ae8 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Tue, 22 Nov 2022 01:54:07 +0000 Subject: [PATCH] Fix border color contrast Signed-off-by: Christopher Ng --- apps/theming/css/default.css | 24 +++++++++---------- .../theming/lib/Service/BackgroundService.php | 2 +- apps/theming/lib/Themes/DarkTheme.php | 4 ++-- apps/theming/lib/Themes/DefaultTheme.php | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 0d3f3402fce..d028364ec7b 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -30,8 +30,8 @@ --color-loading-dark: #444444; --color-box-shadow-rgb: 77,77,77; --color-box-shadow: rgba(var(--color-box-shadow-rgb), 0.5); - --color-border: #ededed; - --color-border-dark: #dbdbdb; + --color-border: #949494; + --color-border-dark: #808080; --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; @@ -58,21 +58,21 @@ --image-background-default: url('/core/img/app-background.jpg'); --color-background-plain: #0082c9; --primary-invert-if-bright: no; - --color-primary: #00639a; + --color-primary: #006aa3; --color-primary-default: #0082c9; --color-primary-text: #ffffff; - --color-primary-hover: #3282ae; - --color-primary-light: #e5eff4; - --color-primary-light-text: #00273d; - --color-primary-light-hover: #dbe4e9; + --color-primary-hover: #3287b5; + --color-primary-light: #e5f0f5; + --color-primary-light-text: #002a41; + --color-primary-light-hover: #dbe5ea; --color-primary-text-dark: #ededed; - --color-primary-element: #00639a; + --color-primary-element: #006aa3; --color-primary-element-default-hover: #329bd3; --color-primary-element-text: #ffffff; - --color-primary-element-hover: #3282ae; - --color-primary-element-light: #e5eff4; - --color-primary-element-light-text: #00273d; - --color-primary-element-light-hover: #dbe4e9; + --color-primary-element-hover: #3287b5; + --color-primary-element-light: #e5f0f5; + --color-primary-element-light-text: #002a41; + --color-primary-element-light-hover: #dbe5ea; --color-primary-element-text-dark: #ededed; --gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%); } diff --git a/apps/theming/lib/Service/BackgroundService.php b/apps/theming/lib/Service/BackgroundService.php index 3daac7e7215..d49878b11b0 100644 --- a/apps/theming/lib/Service/BackgroundService.php +++ b/apps/theming/lib/Service/BackgroundService.php @@ -46,7 +46,7 @@ class BackgroundService { // true when the background is bright and need dark icons public const THEMING_MODE_DARK = 'dark'; public const DEFAULT_COLOR = '#0082c9'; - public const DEFAULT_ACCESSIBLE_COLOR = '#00639a'; + public const DEFAULT_ACCESSIBLE_COLOR = '#006aa3'; public const SHIPPED_BACKGROUNDS = [ 'anatoly-mikhaltsov-butterfly-wing-scale.jpg' => [ diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php index ecd4c7d3fd6..e43d0c04e98 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -89,8 +89,8 @@ class DarkTheme extends DefaultTheme implements ITheme { '--color-box-shadow' => $colorBoxShadow, '--color-box-shadow-rgb' => $colorBoxShadowRGB, - '--color-border' => $this->util->lighten($colorMainBackground, 7), - '--color-border-dark' => $this->util->lighten($colorMainBackground, 14), + '--color-border' => $this->util->lighten($colorMainBackground, 30), + '--color-border-dark' => $this->util->lighten($colorMainBackground, 38), '--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..85e437a82e5 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -155,8 +155,8 @@ class DefaultTheme implements ITheme { '--color-box-shadow-rgb' => $colorBoxShadowRGB, '--color-box-shadow' => "rgba(var(--color-box-shadow-rgb), 0.5)", - '--color-border' => $this->util->darken($colorMainBackground, 7), - '--color-border-dark' => $this->util->darken($colorMainBackground, 14), + '--color-border' => $this->util->darken($colorMainBackground, 42), + '--color-border-dark' => $this->util->darken($colorMainBackground, 50), '--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