Merge branch 'develop' into gsouquet/fix-18132

This commit is contained in:
Germain Souquet 2021-07-26 15:49:55 +02:00
commit 486d576b23
151 changed files with 2280 additions and 1058 deletions

View file

@ -38,7 +38,8 @@ limitations under the License.
padding-top: 0;
}
&:hover {
&:hover,
&.mx_EventTile_selected {
&::before {
content: '';
position: absolute;
@ -155,12 +156,24 @@ limitations under the License.
position: absolute;
top: 0;
line-height: 1;
z-index: 9;
img {
box-shadow: 0 0 0 3px $eventbubble-avatar-outline;
border-radius: 50%;
}
}
&.mx_EventTile_noSender {
.mx_EventTile_avatar {
top: -19px;
}
}
.mx_BaseAvatar,
.mx_EventTile_avatar {
line-height: 1;
}
&[data-has-reply=true] {
> .mx_EventTile_line {
flex-direction: column;
@ -219,6 +232,8 @@ limitations under the License.
display: flex;
align-items: center;
justify-content: center;
padding: 5px 0;
.mx_EventTile_avatar {
position: static;
@ -289,7 +304,7 @@ limitations under the License.
& + .mx_EventListSummary {
.mx_EventTile {
margin-top: 0;
padding: 0;
padding: 2px 0;
}
}