Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve homeserver dropdown dialog styling #8850

Merged
merged 7 commits into from
Jun 17, 2022
Merged

Improve homeserver dropdown dialog styling #8850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5614b53
Improve homeserver dropdown dialog styling
justjanne Jun 15, 2022
c17e84c
Improve colors of dividers and adornments in dropdowns
justjanne Jun 15, 2022
0dd0edf
Merge remote-tracking branch 'origin/develop' into justjanne/fix/2255…
justjanne Jun 17, 2022
feafe84
Attempt #1 for bad hover state: use regular contextmenu color
justjanne Jun 17, 2022
10380e5
Merge branch 'develop' into justjanne/fix/22552-homeserver-dropdown-ui
justjanne Jun 17, 2022
a8db9bf
ci: empty commit to force CI to run again
justjanne Jun 17, 2022
5ef8d1a
Merge remote-tracking branch 'origin/develop' into justjanne/fix/2255…
justjanne Jun 17, 2022
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
4 changes: 2 additions & 2 deletions res/css/structures/_GenericDropdownMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
36 changes: 34 additions & 2 deletions res/css/views/directory/_NetworkDropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -28,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;
Expand Down