From 61f8ea3fe37b16717162fa0165a55fe83a4a2e97 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 14 Dec 2023 17:31:12 +0100
Subject: [PATCH] fix(core): Make sure correct colors are used on blurred
 background

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 apps/dashboard/src/DashboardApp.vue | 6 ++++++
 apps/user_status/src/UserStatus.vue | 3 +++
 core/css/apps.scss                  | 2 ++
 core/css/guest.scss                 | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue
index 21c6088f36fac..33a2e90cc5019 100644
--- a/apps/dashboard/src/DashboardApp.vue
+++ b/apps/dashboard/src/DashboardApp.vue
@@ -485,6 +485,9 @@ export default {
 }
 
 .panel, .panels > div {
+	// Ensure the maxcontrast color is set for the background
+	--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
+
 	width: 320px;
 	max-width: 100%;
 	margin: 16px;
@@ -591,6 +594,9 @@ export default {
 .edit-panels,
 .statuses ::v-deep .action-item .action-item__menutoggle,
 .statuses ::v-deep .action-item.action-item--open .action-item__menutoggle {
+	// Ensure the maxcontrast color is set for the background
+	--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
+
 	background-color: var(--color-main-background-blur);
 	-webkit-backdrop-filter: var(--filter-background-blur);
 	backdrop-filter: var(--filter-background-blur);
diff --git a/apps/user_status/src/UserStatus.vue b/apps/user_status/src/UserStatus.vue
index 77a8b6c3bc9d3..2ec5e05acd428 100644
--- a/apps/user_status/src/UserStatus.vue
+++ b/apps/user_status/src/UserStatus.vue
@@ -176,6 +176,9 @@ export default {
 
 <style lang="scss" scoped>
 .user-status-menu-item {
+	// Ensure the maxcontrast color is set for the background
+	--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
+
 	width: auto;
 	min-width: 44px;
 	height: 44px;
diff --git a/core/css/apps.scss b/core/css/apps.scss
index f688ab0513955..f047e7dae43e7 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -121,6 +121,8 @@ kbd {
 #app-navigation:not(.vue) {
 	// We use fixed variable for the pill style as we have larger containers around nested list entries
 	--border-radius-pill: calc(var(--default-clickable-area) / 2);
+	// Ensure the maxcontrast color is set for the background
+	--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
 
 	width: variables.$navigation-width;
 	z-index: 500;
diff --git a/core/css/guest.scss b/core/css/guest.scss
index be352135de4e8..56784daa65c26 100644
--- a/core/css/guest.scss
+++ b/core/css/guest.scss
@@ -802,6 +802,9 @@ a.legal {
 }
 
 .guest-box, .body-login-container {
+	// Ensure the maxcontrast color is set for the background
+	--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
+
 	color: var(--color-main-text);
 	background-color: var(--color-main-background-blur);
 	padding: $guest-container-padding;