Merge branch 'develop' into gsouquet/switch-rooms

This commit is contained in:
Germain Souquet
2021-05-26 09:51:27 +01:00
89 changed files with 2555 additions and 1232 deletions
+2 -2
View File
@@ -18,8 +18,8 @@ limitations under the License.
margin: 40px 0 48px 64px;
.mx_MiniAvatarUploader_hasAvatar:not(.mx_MiniAvatarUploader_busy):not(:hover) {
&::before, &::after {
content: unset;
.mx_MiniAvatarUploader_indicator {
display: none;
}
}
+1 -2
View File
@@ -61,8 +61,7 @@ limitations under the License.
&.mx_RoomSublist_headerContainer_sticky {
position: fixed;
height: 32px; // to match the header container
// width set by JS
width: calc(100% - 22px);
width: calc(100% - 15px);
}
// We don't have a top style because the top is dependent on the room list header's