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

Commit d3ab119

Browse files
author
Kerry
authored
Use compound colours for verification badges (#9794)
* update e2e colour variables to compound colours * use e2e colour vars for e2e icons
1 parent 0485b74 commit d3ab119

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

res/css/structures/_ToastContainer.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ limitations under the License.
7777

7878
&::after {
7979
mask-image: url("$(res)/img/e2e/warning.svg");
80-
background-color: $alert;
80+
background-color: $e2e-warning-color;
8181
}
8282
}
8383

res/css/views/messages/_common_CryptoEvent.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ limitations under the License.
3838

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

4444
.mx_cryptoEvent_state,

res/css/views/right_panel/_RoomSummaryCard.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ limitations under the License.
7575
}
7676

7777
.mx_RoomSummaryCard_e2ee_verified {
78-
background-color: #0dbd8b;
78+
background-color: #$e2e-verified-color;
7979
&::before {
8080
mask-image: url("$(res)/img/e2e/verified.svg");
8181
}
8282
}
8383

8484
.mx_RoomSummaryCard_e2ee_warning {
85-
background-color: #ff5b55;
85+
background-color: $e2e-warning-color;
8686
&::before {
8787
mask-image: url("$(res)/img/e2e/warning.svg");
8888
}

res/css/views/rooms/_DecryptionFailureBar.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ limitations under the License.
2929
width: 24px;
3030
height: 24px;
3131
mask-image: url("$(res)/img/e2e/decryption-failure.svg");
32-
background-color: $alert;
32+
background-color: $e2e-warning-color;
3333
mask-repeat: no-repeat;
3434
mask-position: center;
3535
mask-size: contain;

res/css/views/rooms/_E2EIcon.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ limitations under the License.
6666

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

7272
.mx_E2EIcon_normal::after {
@@ -76,5 +76,5 @@ limitations under the License.
7676

7777
.mx_E2EIcon_verified::after {
7878
mask-image: url("$(res)/img/e2e/verified.svg");
79-
background-color: $accent;
79+
background-color: $e2e-verified-color;
8080
}

res/css/views/rooms/_EventTile.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ $left-gutter: 64px;
678678

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

684684
&.mx_EventTile_e2eIcon_normal::after {

res/themes/legacy-light/css/_legacy-light.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ $event-timestamp-color: #acacac;
215215
$copy-button-url: "$(res)/img/element-icons/copy.svg";
216216

217217
/* e2e */
218-
$e2e-verified-color: #76cfa5; /* N.B. *NOT* the same as $accent */
218+
$e2e-verified-color: #0dbd8b;
219219
$e2e-unknown-color: #e8bf37;
220220
$e2e-unverified-color: #e8bf37;
221-
$e2e-warning-color: #ba6363;
221+
$e2e-warning-color: #ff5b55;
222222
$e2e-verified-color-light: rgba($e2e-verified-color, 0.06);
223223
$e2e-warning-color-light: rgba($e2e-warning-color, 0.06);
224224

res/themes/light/css/_light.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ $roomtile-default-badge-bg-color: $muted-fg-color;
183183

184184
/* e2e */
185185
/* ******************** */
186-
$e2e-verified-color: #76cfa5; /* N.B. *NOT* the same as $accent */
186+
$e2e-verified-color: #0dbd8b;
187187
$e2e-unknown-color: #e8bf37;
188188
$e2e-unverified-color: #e8bf37;
189-
$e2e-warning-color: #ba6363;
189+
$e2e-warning-color: #ff5b55;
190190
$e2e-verified-color-light: rgba($e2e-verified-color, 0.06);
191191
$e2e-warning-color-light: rgba($e2e-warning-color, 0.06);
192192
/* ******************** */

0 commit comments

Comments
 (0)