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

[stable25] fix(theming): fix header primary invert if background disabled
nextcloud · Jun 12, 2023 · cf20825 · cf20825
2 parents f0467b0 + 328fa18
commit cf20825
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/apps/theming/lib/Themes/CommonThemeTrait.php b/apps/theming/lib/Themes/CommonThemeTrait.php
@@ -87,13 +87,15 @@ protected function generateGlobalBackgroundVariables(): array {
 		$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 @@ protected function generateUserBackgroundVariables(): array {
 			if ($globalBackgroundDeleted) {
 				return [
 					'--image-background-plain' => 'true',
+					'--background-image-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no',
 				];
 			}
 		}