Merge pull request #45430 from nextcloud/fix/stable-background-color

[stable29] Fix header menu icon color
nextcloud · May 28, 2024 · 2a61d2b · 2a61d2b
2 parents 04790e9 + fc113c8
commit 2a61d2b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 4 deletions.
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
@@ -68,6 +68,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
@@ -113,6 +113,7 @@ protected function generateGlobalBackgroundVariables(): array {
 			$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 @@ protected function generateUserBackgroundVariables(): array {
 					'--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 @@ protected function generateUserBackgroundVariables(): array {
 					// --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 @@ protected function generateUserBackgroundVariables(): array {
 					'--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
@@ -211,6 +211,7 @@ public function getCSSVariables(): array {
 			'--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.css b/core/css/header.css
diff --git a/core/css/header.css.map b/core/css/header.css.map
diff --git 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);

diff --git a/core/css/server.css b/core/css/server.css