From 00fdb7f56c245d52346d318e87394ffeede0ce7e Mon Sep 17 00:00:00 2001 From: Elizabeth Danzberger Date: Fri, 14 Feb 2025 00:00:04 +0100 Subject: [PATCH 1/2] feat: do not send logo css if value not provided Signed-off-by: Elizabeth Danzberger --- src/helpers/coolParameters.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/helpers/coolParameters.js b/src/helpers/coolParameters.js index dc0d53c576..63e4ca6236 100644 --- a/src/helpers/coolParameters.js +++ b/src/helpers/coolParameters.js @@ -157,7 +157,9 @@ const generateCSSVarTokens = () => { str += '--nc-logo-background=' + (logoBgColor === '' ? 'transparent' : logoBgColor) + ';' const logoDisplay = window.getComputedStyle(rootEl).getPropertyValue('--nc-logo-display') - str += '--nc-logo-display=' + (logoDisplay === '' ? 'block' : logoDisplay) + ';' + if (!logoDisplay) { + str += '--nc-logo-display=' + (logoDisplay === '' ? 'block' : logoDisplay) + ';' + } return str.replace(/["']/g, '\\\'') } From 168317243975997a566662b40b196df218410139 Mon Sep 17 00:00:00 2001 From: Elizabeth Danzberger Date: Wed, 19 Feb 2025 15:39:57 -0500 Subject: [PATCH 2/2] feat: hide logo in collabora if not given Do not pass the `--nc-logo-display` value to the Collabora branding if it is not provided by custom CSS Signed-off-by: Elizabeth Danzberger --- src/helpers/coolParameters.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/coolParameters.js b/src/helpers/coolParameters.js index 63e4ca6236..bc807a7d72 100644 --- a/src/helpers/coolParameters.js +++ b/src/helpers/coolParameters.js @@ -157,8 +157,8 @@ const generateCSSVarTokens = () => { str += '--nc-logo-background=' + (logoBgColor === '' ? 'transparent' : logoBgColor) + ';' const logoDisplay = window.getComputedStyle(rootEl).getPropertyValue('--nc-logo-display') - if (!logoDisplay) { - str += '--nc-logo-display=' + (logoDisplay === '' ? 'block' : logoDisplay) + ';' + if (logoDisplay) { + str += `--nc-logo-display=${logoDisplay};` } return str.replace(/["']/g, '\\\'')