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

Simplify Space Panel layout and fix some edge cases #6800

Merged
merged 1 commit into from
Sep 14, 2021
Merged

Simplify Space Panel layout and fix some edge cases #6800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 2 additions & 13 deletions res/css/structures/_SpacePanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ $activeBorderColor: $secondary-content;
&:not(.mx_SpaceButton_narrow) {
.mx_SpaceButton_selectionWrapper {
width: 100%;
padding-right: 16px;
overflow: hidden;
}
}
Expand All @@ -151,7 +150,6 @@ $activeBorderColor: $secondary-content;
display: block;
text-overflow: ellipsis;
overflow: hidden;
padding-right: 8px;
font-size: $font-14px;
line-height: $font-18px;
}
Expand Down Expand Up @@ -225,8 +223,7 @@ $activeBorderColor: $secondary-content;
margin-top: auto;
margin-bottom: auto;
display: none;
position: absolute;
right: 4px;
position: relative;

&::before {
top: 2px;
Expand All @@ -245,8 +242,6 @@ $activeBorderColor: $secondary-content;
}

.mx_SpacePanel_badgeContainer {
position: absolute;

// Create a flexbox to make aligning dot badges easier
display: flex;
align-items: center;
Expand All @@ -264,6 +259,7 @@ $activeBorderColor: $secondary-content;
&.collapsed {
.mx_SpaceButton {
.mx_SpacePanel_badgeContainer {
position: absolute;
right: 0;
top: 0;

Expand Down Expand Up @@ -293,19 +289,12 @@ $activeBorderColor: $secondary-content;
}

&:not(.collapsed) {
.mx_SpacePanel_badgeContainer {
position: absolute;
right: 4px;
}

.mx_SpaceButton:hover,
.mx_SpaceButton:focus-within,
.mx_SpaceButton_hasMenuOpen {
&:not(.mx_SpaceButton_invite) {
// Hide the badge container on hover because it'll be a menu button
.mx_SpacePanel_badgeContainer {
width: 0;
height: 0;
display: none;
}

Expand Down