upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-25 10:51:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #38433 from nextcloud/fix/theming-invert-25

Browse source 
[stable25] fix(theming): fix header primary invert if background disabled
This commit is contained in:
Simon L 2023-06-12 15:20:27 +02:00 committed by GitHub
commit cf20825a71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/theming/lib/Themes/CommonThemeTrait.php
View file

@ -87,13 +87,15 @@ trait CommonThemeTrait {
$hasCustomLogoHeader = $this->util->isLogoThemed();
$variables = [];
$defaultColorPrimary = $this->themingDefaults->getDefaultColorPrimary();
// If primary as background has been request or if we have a custom primary colour
// let's not define the background image
if ($backgroundDeleted) {
$variables['--color-background-plain'] = $this->themingDefaults->getColorPrimary();
$variables['--color-background-plain'] = $defaultColorPrimary;
if ($this->themingDefaults->isUserThemingDisabled() || $user === null) {
$variables['--image-background-plain'] = 'true';
$variables['--background-image-invert-if-bright'] = $this->util->invertTextColor($defaultColorPrimary) ? 'invert(100%)' : 'no';
}
}
@ -164,6 +166,7 @@ trait CommonThemeTrait {
if ($globalBackgroundDeleted) {
return [
'--image-background-plain' => 'true',
'--background-image-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no',
];
}
}