From 9d4d95a94c5f6f5c51d0e422f05a0cbc349358c3 Mon Sep 17 00:00:00 2001 From: szaimen Date: Thu, 29 Sep 2022 19:18:08 +0200 Subject: [PATCH 1/2] fix the tertiary button text Signed-off-by: szaimen --- apps/theming/lib/Themes/CommonThemeTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/theming/lib/Themes/CommonThemeTrait.php b/apps/theming/lib/Themes/CommonThemeTrait.php index a7f7b407d2f..631879ea832 100644 --- a/apps/theming/lib/Themes/CommonThemeTrait.php +++ b/apps/theming/lib/Themes/CommonThemeTrait.php @@ -45,7 +45,7 @@ trait CommonThemeTrait { '--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', '--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60), '--color-primary-light' => $colorPrimaryLight, - '--color-primary-light-text' => $this->primaryColor, + '--color-primary-light-text' => $this->util->mix($this->primaryColor, $this->util->invertTextColor($colorPrimaryLight) ? '#000000' : '#ffffff', -20), '--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90), '--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7), @@ -54,7 +54,7 @@ trait CommonThemeTrait { '--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', '--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60), '--color-primary-element-light' => $colorPrimaryElementLight, - '--color-primary-element-light-text' => $colorPrimaryElement, + '--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20), '--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90), '--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7), From da48143de74099e70f1a56ae5852e484ef1e900b Mon Sep 17 00:00:00 2001 From: szaimen Date: Fri, 30 Sep 2022 19:01:51 +0200 Subject: [PATCH 2/2] fix test Signed-off-by: szaimen --- apps/theming/css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 559aedd6614..e7403ee69cc 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -57,14 +57,14 @@ --color-primary-text: #ffffff; --color-primary-hover: #329bd3; --color-primary-light: #e5f2f9; - --color-primary-light-text: #0082c9; + --color-primary-light-text: #003450; --color-primary-light-hover: #dbe7ee; --color-primary-text-dark: #ededed; --color-primary-element: #0082c9; --color-primary-element-text: #ffffff; --color-primary-element-hover: #329bd3; --color-primary-element-light: #e5f2f9; - --color-primary-element-light-text: #0082c9; + --color-primary-element-light-text: #003450; --color-primary-element-light-hover: #dbe7ee; --color-primary-element-text-dark: #ededed; --gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%);