Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions res/css/structures/_ToastContainer.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@ Please see LICENSE files in the repository root for full details.
}

&.mx_Toast_icon_verification::after {
mask-image: url("$(res)/img/e2e/normal.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
background-color: $primary-content;
}

&.mx_Toast_icon_verification_warning {
/* white infill for the hollow svg mask */
&::before {
background-color: #ffffff;
mask-image: url("$(res)/img/e2e/normal.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
mask-size: 80%;
}

&::after {
mask-image: url("$(res)/img/e2e/warning.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
background-color: $e2e-warning-color;
}
}
Expand Down
4 changes: 2 additions & 2 deletions res/css/views/dialogs/_InviteDialog.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ Please see LICENSE files in the repository root for full details.
}

.mx_InviteDialog_userDirectoryIcon::before {
mask-image: url("$(res)/img/voip/tab-userdirectory.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg");
}

.mx_InviteDialog_dialPadIcon::before {
mask-image: url("$(res)/img/voip/tab-dialpad.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/dial-pad.svg");
}

.mx_InviteDialog_tile {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
padding-bottom: 10px;

&::before {
mask: url("$(res)/img/e2e/lock-warning-filled.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/error.svg");
mask-repeat: no-repeat;
background-color: $primary-content;
content: "";
Expand Down
4 changes: 2 additions & 2 deletions res/css/views/messages/_LegacyCallEvent.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ Please see LICENSE files in the repository root for full details.
}

.mx_LegacyCallEvent_silence::before {
mask-image: url("$(res)/img/voip/silence.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/volume-on-solid.svg");
}

.mx_LegacyCallEvent_unSilence::before {
mask-image: url("$(res)/img/voip/un-silence.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/volume-off-solid.svg");
}

&.mx_LegacyCallEvent_voice {
Expand Down
8 changes: 4 additions & 4 deletions res/css/views/messages/_common_CryptoEvent.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ Please see LICENSE files in the repository root for full details.
/* white infill for the transparency */
&.mx_cryptoEvent_icon::before {
background-color: #ffffff;
mask-image: url("$(res)/img/e2e/normal.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
mask-repeat: no-repeat;
mask-position: center;
mask-size: 80%;
}

&.mx_cryptoEvent_icon::after {
mask-image: url("$(res)/img/e2e/normal.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
background-color: $header-panel-text-primary-color;
}

&.mx_cryptoEvent_icon_verified::after {
mask-image: url("$(res)/img/e2e/verified.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/shield.svg");
background-color: $accent;
}

&.mx_cryptoEvent_icon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
background-color: $e2e-warning-color;
}

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_DecryptionFailureBar.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Please see LICENSE files in the repository root for full details.
.mx_DecryptionFailureBar_start_status_icon {
min-width: var(--size-icon);
height: var(--size-icon);
mask-image: url("$(res)/img/e2e/decryption-failure.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
background-color: $e2e-warning-color;
mask-repeat: no-repeat;
mask-position: center;
Expand Down
8 changes: 4 additions & 4 deletions res/css/views/rooms/_E2EIcon.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Please see LICENSE files in the repository root for full details.

/* transparent-looking border surrounding the shield for when overlain over avatars */
.mx_E2EIcon_bordered {
mask-image: url("$(res)/img/e2e/normal.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
background-color: $header-panel-bg-color;
mask-size: 100%;

Expand All @@ -50,12 +50,12 @@ Please see LICENSE files in the repository root for full details.
}

.mx_E2EIcon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
background-color: $e2e-warning-color;
}

.mx_E2EIcon_normal::after {
mask-image: url("$(res)/img/e2e/normal.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
background-color: var(--cpd-color-icon-tertiary);
}

Expand All @@ -67,6 +67,6 @@ Please see LICENSE files in the repository root for full details.
}

.mx_E2EIcon_verified::after {
mask-image: url("$(res)/img/e2e/verified.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/shield.svg");
background-color: $e2e-verified-color;
}
6 changes: 3 additions & 3 deletions res/css/views/rooms/_EventTile.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -849,17 +849,17 @@ $left-gutter: 64px;
}

&.mx_EventTile_e2eIcon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg"); /* (!) in a shield */
mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
background-color: $e2e-warning-color; /* red */
}

&.mx_EventTile_e2eIcon_normal::after {
mask-image: url("$(res)/img/e2e/normal.svg"); /* regular shield */
mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg");
background-color: var(--cpd-color-icon-tertiary); /* grey */
}

&.mx_EventTile_e2eIcon_decryption_failure::after {
mask-image: url("$(res)/img/e2e/decryption-failure.svg"); /* key in a circle */
mask-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
background-color: var(--cpd-color-icon-tertiary);
}
}
Expand Down
4 changes: 2 additions & 2 deletions res/css/views/toasts/_IncomingLegacyCallToast.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ Please see LICENSE files in the repository root for full details.
}

.mx_IncomingLegacyCallToast_silence::before {
mask-image: url("$(res)/img/voip/silence.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/volume-on-solid.svg");
}

.mx_IncomingLegacyCallToast_unSilence::before {
mask-image: url("$(res)/img/voip/un-silence.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/volume-off-solid.svg");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Please see LICENSE files in the repository root for full details.

/* Stateless buttons */
&.mx_LegacyCallViewButtons_dialpad::before {
mask-image: url("$(res)/img/voip/call-view/dialpad.svg");
mask-image: url("@vector-im/compound-design-tokens/icons/dial-pad.svg");
}

&.mx_LegacyCallViewButtons_button_hangup {
Expand Down
3 changes: 0 additions & 3 deletions res/img/e2e/decryption-failure.svg

This file was deleted.

1 change: 0 additions & 1 deletion res/img/e2e/lock-warning-filled.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/e2e/normal.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/e2e/verified-deprecated.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/e2e/verified.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/e2e/warning-deprecated.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/e2e/warning.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/voip/call-view/dialpad.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/voip/silence.svg

This file was deleted.

3 changes: 0 additions & 3 deletions res/img/voip/tab-dialpad.svg

This file was deleted.

Loading
Loading