Merge branch 'develop' into gsouquet/fix-18128

This commit is contained in:
Germain 2021-07-26 07:41:42 +01:00 committed by GitHub
commit c7bbb497f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 824 additions and 461 deletions

View file

@ -169,6 +169,11 @@ limitations under the License.
}
}
.mx_BaseAvatar,
.mx_EventTile_avatar {
line-height: 1;
}
&[data-has-reply=true] {
> .mx_EventTile_line {
flex-direction: column;
@ -228,6 +233,7 @@ limitations under the License.
display: flex;
align-items: center;
justify-content: center;
padding: 5px 0;
.mx_EventTile_avatar {
position: static;
@ -294,7 +300,7 @@ limitations under the License.
& + .mx_EventListSummary {
.mx_EventTile {
margin-top: 0;
padding: 0;
padding: 2px 0;
}
}