Skip to content

Commit

Permalink
Merge pull request #42283 from nextcloud/fix/maxcontrast-blur
Browse files Browse the repository at this point in the history
fix: Ensure correct max contrast color is used when blurred background is used
  • Loading branch information
Pytal authored Dec 14, 2023
2 parents 5d7b6f1 + 016afb7 commit cd32db6
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 18 deletions.
6 changes: 6 additions & 0 deletions apps/dashboard/src/DashboardApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions apps/user_status/src/UserStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/css/apps.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/apps.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions core/css/apps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit cd32db6

Please sign in to comment.