Skip to content

Commit cd32db6

Browse files
authored
Merge pull request #42283 from nextcloud/fix/maxcontrast-blur
fix: Ensure correct max contrast color is used when blurred background is used
2 parents 5d7b6f1 + 016afb7 commit cd32db6

18 files changed

Lines changed: 32 additions & 18 deletions

apps/dashboard/src/DashboardApp.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@ export default {
485485
}
486486
487487
.panel, .panels > div {
488+
// Ensure the maxcontrast color is set for the background
489+
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
490+
488491
width: 320px;
489492
max-width: 100%;
490493
margin: 16px;
@@ -591,6 +594,9 @@ export default {
591594
.edit-panels,
592595
.statuses ::v-deep .action-item .action-item__menutoggle,
593596
.statuses ::v-deep .action-item.action-item--open .action-item__menutoggle {
597+
// Ensure the maxcontrast color is set for the background
598+
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
599+
594600
background-color: var(--color-main-background-blur);
595601
-webkit-backdrop-filter: var(--filter-background-blur);
596602
backdrop-filter: var(--filter-background-blur);

apps/user_status/src/UserStatus.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ export default {
176176
177177
<style lang="scss" scoped>
178178
.user-status-menu-item {
179+
// Ensure the maxcontrast color is set for the background
180+
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
181+
179182
width: auto;
180183
min-width: 44px;
181184
height: 44px;

core/css/apps.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/apps.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/apps.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ kbd {
121121
#app-navigation:not(.vue) {
122122
// We use fixed variable for the pill style as we have larger containers around nested list entries
123123
--border-radius-pill: calc(var(--default-clickable-area) / 2);
124+
// Ensure the maxcontrast color is set for the background
125+
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
124126

125127
width: variables.$navigation-width;
126128
z-index: 500;

0 commit comments

Comments
 (0)