From 5614b53abe9158e6f02031f4ff3ca681f69d43b8 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Wed, 15 Jun 2022 16:16:02 +0200 Subject: [PATCH 1/4] Improve homeserver dropdown dialog styling --- res/css/views/directory/_NetworkDropdown.scss | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss index b5d5a8ed9ee..10e41507b91 100644 --- a/res/css/views/directory/_NetworkDropdown.scss +++ b/res/css/views/directory/_NetworkDropdown.scss @@ -15,7 +15,39 @@ limitations under the License. */ .mx_NetworkDropdown_wrapper .mx_ContextualMenu { - min-width: 200px; + .mx_GenericDropdownMenu_Option { + &.mx_GenericDropdownMenu_Option--header { + padding-top: $spacing-12; + padding-bottom: $spacing-4; + min-width: 160px; + } + + &.mx_GenericDropdownMenu_Option--item { + padding-top: $spacing-4; + padding-bottom: $spacing-4; + + > .mx_GenericDropdownMenu_Option--label span:first-child { + font-weight: normal; + } + } + + > .mx_GenericDropdownMenu_Option--label { + flex-direction: row; + align-items: baseline; + align-content: baseline; + color: $primary-content; + + span:not(:first-child) { + margin-left: $spacing-4; + color: $secondary-content; + } + } + } + + .mx_GenericDropdownMenu_divider { + margin-top: $spacing-4; + margin-bottom: $spacing-4; + } } .mx_NetworkDropdown_addServer { From c17e84c8998707a2625d655c5ead4334078a6812 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Wed, 15 Jun 2022 16:58:46 +0200 Subject: [PATCH 2/4] Improve colors of dividers and adornments in dropdowns --- res/css/structures/_GenericDropdownMenu.scss | 2 +- res/css/views/directory/_NetworkDropdown.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/structures/_GenericDropdownMenu.scss b/res/css/structures/_GenericDropdownMenu.scss index dda8a615406..49b0c33c2f1 100644 --- a/res/css/structures/_GenericDropdownMenu.scss +++ b/res/css/structures/_GenericDropdownMenu.scss @@ -72,7 +72,7 @@ limitations under the License. height: 0; margin-left: 4px; margin-right: 19px; - border-top: 1px solid $system; + border-top: 1px solid $quinary-content; } .mx_GenericDropdownMenu_Option { diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss index 10e41507b91..8dbd7f020db 100644 --- a/res/css/views/directory/_NetworkDropdown.scss +++ b/res/css/views/directory/_NetworkDropdown.scss @@ -60,7 +60,7 @@ limitations under the License. display: inline-block; width: 16px; height: 16px; - background: $system; + background: $quinary-content; border-radius: 8px; text-align: center; line-height: 16px; From feafe84265b61d6d805895405ec5b6e52d518c81 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Fri, 17 Jun 2022 13:23:57 +0200 Subject: [PATCH 3/4] Attempt #1 for bad hover state: use regular contextmenu color --- res/css/structures/_GenericDropdownMenu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/structures/_GenericDropdownMenu.scss b/res/css/structures/_GenericDropdownMenu.scss index 49b0c33c2f1..e56ddbcefc8 100644 --- a/res/css/structures/_GenericDropdownMenu.scss +++ b/res/css/structures/_GenericDropdownMenu.scss @@ -102,7 +102,7 @@ limitations under the License. &.mx_GenericDropdownMenu_Option--item { &:hover { - background-color: $event-selected-color; + background-color: $menu-selected-color; } &[aria-checked="true"]::before { From a8db9bfce0d36a47f458f26f50632fdbdc95eea6 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Fri, 17 Jun 2022 14:37:47 +0200 Subject: [PATCH 4/4] ci: empty commit to force CI to run again