Fix transparent verification checkmark in dark mode (#30235)
* Fix transparent verification checkmark in dark mode Fixes Issue https://github.com/element-hq/element-web/issues/28285 * Add white background to E2E Warning Icon Also adapted the testcases to the new background.
This commit is contained in:
@@ -59,3 +59,10 @@ Please see LICENSE files in the repository root for full details.
|
|||||||
mask-image: url("$(res)/img/e2e/verified.svg");
|
mask-image: url("$(res)/img/e2e/verified.svg");
|
||||||
background-color: $e2e-verified-color;
|
background-color: $e2e-verified-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// When using the "normal" icon as a background for verified or warning icon,
|
||||||
|
// it should be slightly smaller than the foreground icon
|
||||||
|
.mx_E2EIcon_verified, .mx_E2EIcon_warning .mx_E2EIcon_normal::after {
|
||||||
|
mask-size: 90%;
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
|||||||
@@ -76,7 +76,17 @@ const E2EIcon: React.FC<Props> = ({
|
|||||||
if (onClick) {
|
if (onClick) {
|
||||||
content = <AccessibleButton onClick={onClick} className={classes} style={style} />;
|
content = <AccessibleButton onClick={onClick} className={classes} style={style} />;
|
||||||
} else {
|
} else {
|
||||||
content = <div className={classes} style={style} />;
|
// Verified and warning icon have a transparent cutout, so add a white background.
|
||||||
|
// The normal icon already has the correct shape and size, so reuse that.
|
||||||
|
if (status === E2EStatus.Verified || status === E2EStatus.Warning) {
|
||||||
|
content = (
|
||||||
|
<div className={classes} style={style}>
|
||||||
|
<div className="mx_E2EIcon_normal" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
content = <div className={classes} style={style} />;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!e2eTitle || hideTooltip) {
|
if (!e2eTitle || hideTooltip) {
|
||||||
|
|||||||
@@ -1809,7 +1809,11 @@ exports[`RoomView should not display the timeline when the room encryption is lo
|
|||||||
<div
|
<div
|
||||||
aria-labelledby="«r3e»"
|
aria-labelledby="«r3e»"
|
||||||
class="mx_E2EIcon mx_E2EIcon_verified mx_MessageComposer_e2eIcon"
|
class="mx_E2EIcon mx_E2EIcon_verified mx_MessageComposer_e2eIcon"
|
||||||
/>
|
>
|
||||||
|
<div
|
||||||
|
class="mx_E2EIcon_normal"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -23,7 +23,11 @@ exports[`<UntrustedDeviceDialog /> should display the dialog for the device of a
|
|||||||
<div
|
<div
|
||||||
class="mx_E2EIcon mx_E2EIcon_warning"
|
class="mx_E2EIcon mx_E2EIcon_warning"
|
||||||
style="width: 24px; height: 24px;"
|
style="width: 24px; height: 24px;"
|
||||||
/>
|
>
|
||||||
|
<div
|
||||||
|
class="mx_E2EIcon_normal"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
Not Trusted
|
Not Trusted
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
@@ -97,7 +101,11 @@ exports[`<UntrustedDeviceDialog /> should display the dialog for the device of t
|
|||||||
<div
|
<div
|
||||||
class="mx_E2EIcon mx_E2EIcon_warning"
|
class="mx_E2EIcon mx_E2EIcon_warning"
|
||||||
style="width: 24px; height: 24px;"
|
style="width: 24px; height: 24px;"
|
||||||
/>
|
>
|
||||||
|
<div
|
||||||
|
class="mx_E2EIcon_normal"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
Not Trusted
|
Not Trusted
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user