From 8119e9388128cc7cd5a6ba11717ad710272c9744 Mon Sep 17 00:00:00 2001 From: srenault Date: Fri, 10 Jul 2026 14:23:26 +0200 Subject: [PATCH 1/2] fix: page background default now reflects actual branding value - EXIP-88511 The page-properties drawer read a CSS var (--allPagesLightGrey) that is never actually set by the branding admin page. The real value the admin configures is exposed as --allPagesBackgroundColor, so non-customized pages silently ignored the branding default. Also normalize the read value to an 8-digit hex so the color picker keeps its alpha/transparency support when the branding value has no alpha channel. --- .../common-layout/components/drawer/EditPageDrawer.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue index 5f2eda727..02b6a1e21 100644 --- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue +++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue @@ -219,8 +219,11 @@ export default { }, created() { this.$root.$on('layout-page-properties-open', this.open); - if (document.body.computedStyleMap && document.body.computedStyleMap().get('--allPagesLightGrey')) { - this.defaultBackgroundColor = document.body.computedStyleMap().get('--allPagesLightGrey')[0] || this.defaultBackgroundColor; + if (document.body.computedStyleMap && document.body.computedStyleMap().get('--allPagesBackgroundColor')) { + const backgroundColor = document.body.computedStyleMap().get('--allPagesBackgroundColor')[0]?.trim?.(); + if (backgroundColor) { + this.defaultBackgroundColor = backgroundColor.length === 7 ? `${backgroundColor}FF` : backgroundColor; + } } }, beforeDestroy() { From 3cea9b4cbb8608e333c5fb042d4ec54d43a3cd6a Mon Sep 17 00:00:00 2001 From: srenault Date: Fri, 10 Jul 2026 15:12:07 +0200 Subject: [PATCH 2/2] fix: page drawer preview shows default background without customizing - EXIP-88511 The small page-preview thumbnail in the page-properties drawer computed its style straight from pageContainer.backgroundColor, which is null when not customized, so the preview fell back to Vuetify's default card color instead of the branding default - only becoming correct once the user toggled "Global Page Background" on (which writes the default into storage). Fall back to defaultBackgroundColor for the preview only, without touching the stored value. --- .../common-layout/components/drawer/EditPageDrawer.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue index 02b6a1e21..aff14a5df 100644 --- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue +++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditPageDrawer.vue @@ -202,7 +202,10 @@ export default { }), computed: { cssStyle() { - return this.$applicationUtils.getStyle(this.pageContainer, { + return this.$applicationUtils.getStyle({ + ...this.pageContainer, + backgroundColor: this.pageContainer?.backgroundColor || this.defaultBackgroundColor, + }, { onlyBackgroundStyle: true, }); },