diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-10-25 16:29:26 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-10-27 12:56:23 +0200 |
| commit | 3378a73e99171ac31860ccca81b1b3197e63417f (patch) | |
| tree | 79fb304d411e43b6c25cfcd880355889e54bf273 | |
| parent | 3676295f7b13852ec328e32f510aefd4c7b709c7 (diff) | |
| download | nextcloud-server-3378a73e99171ac31860ccca81b1b3197e63417f.tar.gz nextcloud-server-3378a73e99171ac31860ccca81b1b3197e63417f.zip | |
fix(theming): Make changes on primary color less invasiv
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
| -rw-r--r-- | apps/theming/css/default.css | 20 | ||||
| -rw-r--r-- | apps/theming/lib/Service/BackgroundService.php | 2 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/CommonThemeTrait.php | 2 | ||||
| -rw-r--r-- | cypress/e2e/theming/themingUtils.ts | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 8cc3eb2de32..3e36e03f894 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -68,20 +68,20 @@ --background-invert-if-bright: invert(100%); --background-image-invert-if-bright: no; --primary-invert-if-bright: no; - --color-primary: #006889; + --color-primary: #00679e; --color-primary-default: #0082c9; --color-primary-text: #ffffff; - --color-primary-hover: #3286a0; - --color-primary-light: #e5eff3; - --color-primary-light-text: #002936; - --color-primary-light-hover: #dbe4e8; - --color-primary-element: #006889; - --color-primary-element-hover: #187694; + --color-primary-hover: #3285b1; + --color-primary-light: #e5eff5; + --color-primary-light-text: #00293f; + --color-primary-light-hover: #dbe4ea; + --color-primary-element: #00679e; + --color-primary-element-hover: #1674a6; --color-primary-element-text: #ffffff; --color-primary-element-text-dark: #f0f0f0; - --color-primary-element-light: #e5eff3; - --color-primary-element-light-hover: #dbe4e8; - --color-primary-element-light-text: #002936; + --color-primary-element-light: #e5eff5; + --color-primary-element-light-hover: #dbe4ea; + --color-primary-element-light-text: #00293f; --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'); --color-background-plain: #0082c9; diff --git a/apps/theming/lib/Service/BackgroundService.php b/apps/theming/lib/Service/BackgroundService.php index 3886bf855c4..c385bc7b072 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 = '#006889'; + public const DEFAULT_ACCESSIBLE_COLOR = '#00679e'; public const BACKGROUND_SHIPPED = 'shipped'; public const BACKGROUND_CUSTOM = 'custom'; diff --git a/apps/theming/lib/Themes/CommonThemeTrait.php b/apps/theming/lib/Themes/CommonThemeTrait.php index 3460c7e68eb..66775500f65 100644 --- a/apps/theming/lib/Themes/CommonThemeTrait.php +++ b/apps/theming/lib/Themes/CommonThemeTrait.php @@ -64,7 +64,7 @@ trait CommonThemeTrait { // used for buttons, inputs... '--color-primary-element' => $colorPrimaryElement, - '--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 81), + '--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 82), '--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', // mostly used for disabled states '--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 6), diff --git a/cypress/e2e/theming/themingUtils.ts b/cypress/e2e/theming/themingUtils.ts index 088c58dda45..532cee46911 100644 --- a/cypress/e2e/theming/themingUtils.ts +++ b/cypress/e2e/theming/themingUtils.ts @@ -22,7 +22,7 @@ import { colord } from 'colord' export const defaultPrimary = '#0082c9' -export const defaultAccessiblePrimary = '#006889' +export const defaultAccessiblePrimary = '#00679e' export const defaultBackground = 'kamil-porembinski-clouds.jpg' /** |