From 5cfeec8f5d52547ba231349577c8198ad2f5cca9 Mon Sep 17 00:00:00 2001 From: Simon L Date: Mon, 28 Nov 2022 11:23:16 +0100 Subject: [PATCH 1/2] Revert "[stable25] Fix border color contrast" Signed-off-by: Simon L --- 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 d028364ec7bd2..0d3f3402fce87 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: #949494; - --color-border-dark: #808080; + --color-border: #ededed; + --color-border-dark: #dbdbdb; --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: #006aa3; + --color-primary: #00639a; --color-primary-default: #0082c9; --color-primary-text: #ffffff; - --color-primary-hover: #3287b5; - --color-primary-light: #e5f0f5; - --color-primary-light-text: #002a41; - --color-primary-light-hover: #dbe5ea; + --color-primary-hover: #3282ae; + --color-primary-light: #e5eff4; + --color-primary-light-text: #00273d; + --color-primary-light-hover: #dbe4e9; --color-primary-text-dark: #ededed; - --color-primary-element: #006aa3; + --color-primary-element: #00639a; --color-primary-element-default-hover: #329bd3; --color-primary-element-text: #ffffff; - --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-hover: #3282ae; + --color-primary-element-light: #e5eff4; + --color-primary-element-light-text: #00273d; + --color-primary-element-light-hover: #dbe4e9; --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 d49878b11b020..3daac7e7215dc 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 = '#006aa3'; + public const DEFAULT_ACCESSIBLE_COLOR = '#00639a'; 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 e43d0c04e98d6..ecd4c7d3fd69a 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -89,8 +89,8 @@ public function getCSSVariables(): array { '--color-box-shadow' => $colorBoxShadow, '--color-box-shadow-rgb' => $colorBoxShadowRGB, - '--color-border' => $this->util->lighten($colorMainBackground, 30), - '--color-border-dark' => $this->util->lighten($colorMainBackground, 38), + '--color-border' => $this->util->lighten($colorMainBackground, 7), + '--color-border-dark' => $this->util->lighten($colorMainBackground, 14), '--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 85e437a82e59a..94b71eb9d12a8 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -155,8 +155,8 @@ public function getCSSVariables(): array { '--color-box-shadow-rgb' => $colorBoxShadowRGB, '--color-box-shadow' => "rgba(var(--color-box-shadow-rgb), 0.5)", - '--color-border' => $this->util->darken($colorMainBackground, 42), - '--color-border-dark' => $this->util->darken($colorMainBackground, 50), + '--color-border' => $this->util->darken($colorMainBackground, 7), + '--color-border-dark' => $this->util->darken($colorMainBackground, 14), '--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', From 5137af7293fb61e3e2d7ff3f1b106ffd515e8e5c Mon Sep 17 00:00:00 2001 From: Simon L Date: Mon, 28 Nov 2022 11:26:18 +0100 Subject: [PATCH 2/2] Revert "[stable25] Fix theming tests" Signed-off-by: Simon L --- tests/acceptance/features/app-theming.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/features/app-theming.feature b/tests/acceptance/features/app-theming.feature index 7b734f7f3183b..7a660ed52da1f 100644 --- a/tests/acceptance/features/app-theming.feature +++ b/tests/acceptance/features/app-theming.feature @@ -9,11 +9,11 @@ Feature: app-theming # The "eventually" part is not really needed here, as the colour is not # being animated at this point, but there is no need to create a specific # step just for this. - And I see that the primary color is eventually "#006aa3" + And I see that the primary color is eventually "#00639a" And I see that the non-plain background color variable is eventually "#0082c9" When I set the "Color" parameter in the Theming app to "#C9C9C9" Then I see that the parameters in the Theming app are eventually saved - And I see that the primary color is eventually "#006aa3" + And I see that the primary color is eventually "#00639a" And I see that the non-plain background color variable is eventually "#C9C9C9" Scenario: resetting the color updates the primary color @@ -23,9 +23,9 @@ Feature: app-theming And I see that the color selector in the Theming app has loaded And I set the "Color" parameter in the Theming app to "#C9C9C9" And I see that the parameters in the Theming app are eventually saved - And I see that the primary color is eventually "#006aa3" + And I see that the primary color is eventually "#00639a" And I see that the non-plain background color variable is eventually "#C9C9C9" When I reset the "Color" parameter in the Theming app to its default value Then I see that the parameters in the Theming app are eventually saved - And I see that the primary color is eventually "#006aa3" + And I see that the primary color is eventually "#00639a" And I see that the non-plain background color variable is eventually "#0082c9"