Browse Source

fix(theming): Make changes on primary color less invasiv

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
pull/40773/head
Ferdinand Thiessen 2 years ago
parent
commit
3378a73e99
No known key found for this signature in database GPG Key ID: 45FAE7268762B400
  1. 20
      apps/theming/css/default.css
  2. 2
      apps/theming/lib/Service/BackgroundService.php
  3. 2
      apps/theming/lib/Themes/CommonThemeTrait.php
  4. 2
      cypress/e2e/theming/themingUtils.ts

20
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;

2
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';

2
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),

2
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'
/**

Loading…
Cancel
Save