matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-31 13:44:28 +03:00
Code Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

Browse Source
This commit is contained in:
Michael Telatynski
2021-09-16 10:05:20 +01:00
parent 554c8ba74e 8921e25815
commit e17318a364
52 changed files with 1571 additions and 1266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/css/structures/_SpacePanel.scss
View File

@ -149,7 +149,6 @@ $activeBorderColor: $secondary-content;
&:not(.mx_SpaceButton_narrow) {
.mx_SpaceButton_selectionWrapper {
width: 100%;
padding-right: 16px;
overflow: hidden;
}
}
@ -161,7 +160,6 @@ $activeBorderColor: $secondary-content;
display: block;
text-overflow: ellipsis;
overflow: hidden;
padding-right: 8px;
font-size: $font-14px;
line-height: $font-18px;
}
@ -230,8 +228,7 @@ $activeBorderColor: $secondary-content;
margin-top: auto;
margin-bottom: auto;
display: none;
position: absolute;
right: 4px;
position: relative;
&::before {
top: 2px;
@ -250,8 +247,6 @@ $activeBorderColor: $secondary-content;
}
.mx_SpacePanel_badgeContainer {
position: absolute;
// Create a flexbox to make aligning dot badges easier
display: flex;
align-items: center;
@ -269,6 +264,7 @@ $activeBorderColor: $secondary-content;
&.collapsed {
.mx_SpaceButton {
.mx_SpacePanel_badgeContainer {
position: absolute;
right: 0;
top: 0;
@ -298,19 +294,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;
}