Merge pull request #2072 from nextcloud/backport/2069/stable23

[stable23] Adapt branding css variables
nextcloud-releases · Feb 28, 2022 · 38dac07 · 38dac07
2 parents 3473730 + 1ebf4a3
commit 38dac07
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/helpers/coolParameters.js b/src/helpers/coolParameters.js
@@ -59,8 +59,6 @@ const generateCSSVarTokens = () => {
 		'--color-border': '--co-border',
 		'--color-border-dark': '--co-border-dark',
 		'--border-radius-pill': '--co-border-radius-pill',
-		'--font-face': '--loleaflet-font:--mobile-font:--vex-font:--jquery-ui-font:--docs-font',
-		'--image-logoheader': '--co-image-logo',
 	}
 	let str = ''
 	try {
@@ -73,7 +71,7 @@ const generateCSSVarTokens = () => {
 			if (!cStyle) continue // skip if it is not set
 			const varNames = cssVarMap[cssVarKey].split(':')
 			for (let i = 0; i < varNames.length; ++i) {
-				str += varNames[i] + '=' + cStyle + ';'
+				str += varNames[i] + '=' + cStyle.trim() + ';'
 			}
 		}
 	} catch (e) {
@@ -82,7 +80,7 @@ const generateCSSVarTokens = () => {
 
 	const customLogo = loadState('richdocuments', 'theming-customLogo', false)
 	if (customLogo) {
-		str += ';--co-image-logo=url(' + customLogo.replace('?useSvg=1&', '?') + ');'
+		str += ';--nc-custom-logo=' + window.OCA?.Theming?.cacheBuster ?? 0 + ';'
 	}
 	return str
 }