Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Use compound colours for verification badges (#9794)
Browse files Browse the repository at this point in the history
* update e2e colour variables to compound colours

* use e2e colour vars for e2e icons
  • Loading branch information
Kerry authored Dec 20, 2022
1 parent 0485b74 commit d3ab119
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion res/css/structures/_ToastContainer.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ limitations under the License.

&::after {
mask-image: url("$(res)/img/e2e/warning.svg");
background-color: $alert;
background-color: $e2e-warning-color;
}
}

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/messages/_common_CryptoEvent.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ limitations under the License.

&.mx_cryptoEvent_icon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg");
background-color: $alert;
background-color: $e2e-warning-color;
}

.mx_cryptoEvent_state,
Expand Down
4 changes: 2 additions & 2 deletions res/css/views/right_panel/_RoomSummaryCard.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ limitations under the License.
}

.mx_RoomSummaryCard_e2ee_verified {
background-color: #0dbd8b;
background-color: #$e2e-verified-color;
&::before {
mask-image: url("$(res)/img/e2e/verified.svg");
}
}

.mx_RoomSummaryCard_e2ee_warning {
background-color: #ff5b55;
background-color: $e2e-warning-color;
&::before {
mask-image: url("$(res)/img/e2e/warning.svg");
}
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 @@ -29,7 +29,7 @@ limitations under the License.
width: 24px;
height: 24px;
mask-image: url("$(res)/img/e2e/decryption-failure.svg");
background-color: $alert;
background-color: $e2e-warning-color;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
Expand Down
4 changes: 2 additions & 2 deletions res/css/views/rooms/_E2EIcon.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ limitations under the License.

.mx_E2EIcon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg");
background-color: $alert;
background-color: $e2e-warning-color;
}

.mx_E2EIcon_normal::after {
Expand All @@ -76,5 +76,5 @@ limitations under the License.

.mx_E2EIcon_verified::after {
mask-image: url("$(res)/img/e2e/verified.svg");
background-color: $accent;
background-color: $e2e-verified-color;
}
2 changes: 1 addition & 1 deletion res/css/views/rooms/_EventTile.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ $left-gutter: 64px;

&.mx_EventTile_e2eIcon_warning::after {
mask-image: url("$(res)/img/e2e/warning.svg");
background-color: $alert;
background-color: $e2e-warning-color;
}

&.mx_EventTile_e2eIcon_normal::after {
Expand Down
4 changes: 2 additions & 2 deletions res/themes/legacy-light/css/_legacy-light.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ $event-timestamp-color: #acacac;
$copy-button-url: "$(res)/img/element-icons/copy.svg";

/* e2e */
$e2e-verified-color: #76cfa5; /* N.B. *NOT* the same as $accent */
$e2e-verified-color: #0dbd8b;
$e2e-unknown-color: #e8bf37;
$e2e-unverified-color: #e8bf37;
$e2e-warning-color: #ba6363;
$e2e-warning-color: #ff5b55;
$e2e-verified-color-light: rgba($e2e-verified-color, 0.06);
$e2e-warning-color-light: rgba($e2e-warning-color, 0.06);

Expand Down
4 changes: 2 additions & 2 deletions res/themes/light/css/_light.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ $roomtile-default-badge-bg-color: $muted-fg-color;

/* e2e */
/* ******************** */
$e2e-verified-color: #76cfa5; /* N.B. *NOT* the same as $accent */
$e2e-verified-color: #0dbd8b;
$e2e-unknown-color: #e8bf37;
$e2e-unverified-color: #e8bf37;
$e2e-warning-color: #ba6363;
$e2e-warning-color: #ff5b55;
$e2e-verified-color-light: rgba($e2e-verified-color, 0.06);
$e2e-warning-color-light: rgba($e2e-warning-color, 0.06);
/* ******************** */
Expand Down

0 comments on commit d3ab119

Please sign in to comment.