Merge pull request #42294 from nextcloud/backport/42283/stable28

[stable28] fix: Ensure correct max contrast color is used when blurred background is used
nextcloud · Dec 15, 2023 · 42793ca · 42793ca
2 parents cccac2a + 8d1d5f3
commit 42793ca
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 9 deletions.
diff --git 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.css b/core/css/apps.css
diff --git a/core/css/apps.css.map b/core/css/apps.css.map
diff --git 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;