OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5319 from matrix-org/t3chguy/fix/null-avatar 

Fix background-image: url(null) for backdrop filter
pull/21833/head
Michael Telatynski 2020-10-15 17:48:51 +01:00 committed by GitHub
parent 5c79f35cc5 6a82a1f3c7
commit 0c87df4957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/themes/light/css/_mods.scss
View File

@ -6,7 +6,7 @@
@supports (backdrop-filter: none) { @supports (backdrop-filter: none) {
.mx_LeftPanel { .mx_LeftPanel {
background-image: var(--avatar-url); background-image: var(--avatar-url, unset);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
background-position: left top; background-position: left top;

5
src/components/structures/LeftPanel.tsx
View File

@ -119,8 +119,11 @@ export default class LeftPanel extends React.Component<IProps, IState> {
if (settingBgMxc) { if (settingBgMxc) {
avatarUrl = MatrixClientPeg.get().mxcUrlToHttp(settingBgMxc, avatarSize, avatarSize); avatarUrl = MatrixClientPeg.get().mxcUrlToHttp(settingBgMxc, avatarSize, avatarSize);
} }
const avatarUrlProp = `url(${avatarUrl})`; const avatarUrlProp = `url(${avatarUrl})`;
if (document.body.style.getPropertyValue("--avatar-url") !== avatarUrlProp) { if (!avatarUrl) {
document.body.style.removeProperty("--avatar-url");
} else if (document.body.style.getPropertyValue("--avatar-url") !== avatarUrlProp) {
document.body.style.setProperty("--avatar-url", avatarUrlProp); document.body.style.setProperty("--avatar-url", avatarUrlProp);
} }
}; };