Merge pull request #3840 from nextcloud/fix/logo-visibility

fix: Allow passing css var to change Collabora logo color
nextcloud · Jul 30, 2024 · d4f0c2c · d4f0c2c
2 parents 0269a5c + 719a124
commit d4f0c2c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/helpers/coolParameters.js b/src/helpers/coolParameters.js
@@ -140,8 +140,17 @@ const generateCSSVarTokens = () => {
 	darkElement.remove()
 	const customLogo = loadState('richdocuments', 'theming-customLogo', false)
 	if (customLogo) {
-		str += ';--nc-custom-logo=' + window.OCA?.Theming?.cacheBuster ?? 0 + ';'
+		str += '--nc-custom-logo=' + window.OCA?.Theming?.cacheBuster ?? 0 + ';'
 	}
+
+	const rootEl = document.querySelector(':root')
+
+	const logoBgColor = window.getComputedStyle(rootEl).getPropertyValue('--nc-logo-background')
+	str += '--nc-logo-background=' + (logoBgColor === '' ? 'transparent' : logoBgColor) + ';'
+
+	const logoDisplay = window.getComputedStyle(rootEl).getPropertyValue('--nc-logo-display')
+	str += '--nc-logo-display=' + (logoDisplay === '' ? 'block' : logoDisplay) + ';'
+
 	return str.replace(/["']/g, '\\\'')
 }