From 577f5647d250902c2c2dee44e3243b575c0a1f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Rodr=C3=ADguez?= Date: Sat, 7 Oct 2023 21:59:51 -0400 Subject: [PATCH 1/5] improve invite tile color --- res/css/views/dialogs/_InviteDialog.pcss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index f13e6b47246..39b515395e1 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -151,7 +151,7 @@ limitations under the License. margin-inline-end: $spacing-8; .mx_InviteDialog_userTile_pill { - background-color: $username-variant1-color; + background-color: var(--cpd-color-blue-800); border-radius: 12px; display: inline-block; height: 24px; From 6c545a14d627525fabae1f84bfc37b98f03ba66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Rodr=C3=ADguez?= Date: Sun, 8 Oct 2023 00:33:21 -0400 Subject: [PATCH 2/5] change checkmark color for consistency --- res/css/views/dialogs/_InviteDialog.pcss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index 39b515395e1..f37d31c1223 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -338,7 +338,7 @@ limitations under the License. .mx_InviteDialog_tile--room_selected { border-radius: 36px; - background-color: $username-variant1-color; + background-color: var(--cpd-color-blue-800); &::before { content: ""; From 4c9aea5d2ba7e2bfca840f90e8eb1806f782332c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Rodr=C3=ADguez?= Date: Mon, 9 Oct 2023 14:39:16 -0400 Subject: [PATCH 3/5] switch to cpd-color-text-info-primary --- res/css/views/dialogs/_InviteDialog.pcss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index f37d31c1223..2d207240f6e 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -151,7 +151,7 @@ limitations under the License. margin-inline-end: $spacing-8; .mx_InviteDialog_userTile_pill { - background-color: var(--cpd-color-blue-800); + background-color: var(--cpd-color-text-info-primary); border-radius: 12px; display: inline-block; height: 24px; @@ -338,7 +338,7 @@ limitations under the License. .mx_InviteDialog_tile--room_selected { border-radius: 36px; - background-color: var(--cpd-color-blue-800); + background-color: var(--cpd-color-text-info-primary); &::before { content: ""; From 46eb2cf5605af5e336fbfd92592375581ea4b2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Rodr=C3=ADguez?= Date: Mon, 9 Oct 2023 14:39:30 -0400 Subject: [PATCH 4/5] fix misaligned "x" --- res/css/views/dialogs/_InviteDialog.pcss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index 2d207240f6e..d6f239855bb 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -157,6 +157,7 @@ limitations under the License. height: 24px; line-height: $font-24px; padding-inline: $spacing-8; + vertical-align: middle; color: #ffffff; /* this is fine without a var because it's for both themes */ .mx_SearchResultAvatar { @@ -182,6 +183,7 @@ limitations under the License. .mx_InviteDialog_userTile_remove { display: inline-block; margin-inline-start: $spacing-4; + vertical-align: middle; } } From 5a8aa720a35c015d4a83b9b8d12e023935cfdc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Rodr=C3=ADguez?= Date: Wed, 11 Oct 2023 11:14:02 -0400 Subject: [PATCH 5/5] use --cpd-color-bg-success-subtle instead --- res/css/views/dialogs/_InviteDialog.pcss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index d6f239855bb..cd7abdf1d7d 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -151,14 +151,14 @@ limitations under the License. margin-inline-end: $spacing-8; .mx_InviteDialog_userTile_pill { - background-color: var(--cpd-color-text-info-primary); + background-color: var(--cpd-color-bg-success-subtle); border-radius: 12px; display: inline-block; height: 24px; line-height: $font-24px; padding-inline: $spacing-8; vertical-align: middle; - color: #ffffff; /* this is fine without a var because it's for both themes */ + color: $primary-content; .mx_SearchResultAvatar { border-radius: 20px; @@ -340,7 +340,7 @@ limitations under the License. .mx_InviteDialog_tile--room_selected { border-radius: 36px; - background-color: var(--cpd-color-text-info-primary); + background-color: var(--cpd-color-bg-success-subtle); &::before { content: ""; @@ -354,7 +354,7 @@ limitations under the License. position: absolute; top: 6px; /* 50% */ left: 6px; /* 50% */ - background-color: #ffffff; /* this is fine without a var because it's for both themes */ + background-color: $primary-content; } }