diff options
| -rw-r--r-- | apps/theming/css/default.css | 1 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/CommonThemeTrait.php | 4 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 1 | ||||
| -rw-r--r-- | core/css/header.scss | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index dafa5370192..f8c9cd6c316 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -67,6 +67,7 @@ --background-invert-if-dark: no; --background-invert-if-bright: invert(100%); --background-image-invert-if-bright: no; + --background-image-color-text: #ffffff; --primary-invert-if-bright: no; --primary-invert-if-dark: invert(100%); --color-primary: #00679e; diff --git a/apps/theming/lib/Themes/CommonThemeTrait.php b/apps/theming/lib/Themes/CommonThemeTrait.php index dd5b25e1a29..e55448758ca 100644 --- a/apps/theming/lib/Themes/CommonThemeTrait.php +++ b/apps/theming/lib/Themes/CommonThemeTrait.php @@ -113,6 +113,7 @@ trait CommonThemeTrait { $variables['--image-background'] = 'no'; // If no background image is set, we need to check against the shown primary colour $variables['--background-image-invert-if-bright'] = $isPrimaryBright ? 'invert(100%)' : 'no'; + $variables['--background-image-color-text'] = $isPrimaryBright ? '#000000' : '#ffffff'; } if ($hasCustomLogoHeader) { @@ -143,6 +144,7 @@ trait CommonThemeTrait { '--color-background-plain' => $this->primaryColor, // If no background image is set, we need to check against the shown primary colour '--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no', + '--background-image-color-text' => $isPrimaryBright ? '#000000' : '#ffffff', ]; } @@ -161,6 +163,7 @@ trait CommonThemeTrait { // --image-background is not defined in this case '--color-background-plain' => $this->primaryColor, '--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no', + '--background-image-color-text' => $isPrimaryBright ? '#000000' : '#ffffff', ]; } @@ -170,6 +173,7 @@ trait CommonThemeTrait { '--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')", '--color-background-plain' => $this->primaryColor, '--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no', + '--background-image-color-text' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? '#000000' : '#ffffff', ]; } } diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 3dfa89f8d3a..1908d68433c 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -206,6 +206,7 @@ class DefaultTheme implements ITheme { '--background-invert-if-dark' => 'no', '--background-invert-if-bright' => 'invert(100%)', '--background-image-invert-if-bright' => 'no', + '--background-image-color-text' => '#ffffff', ]; // Primary variables diff --git a/core/css/header.scss b/core/css/header.scss index 56e8ca3c151..4047563c83a 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -93,6 +93,7 @@ #header { /* Header menu */ $header-menu-entry-height: 44px; + --color-primary-text: var(--background-image-color-text, #ffffff); .header-right > div > .menu { background-color: var(--color-main-background); |