Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ac89b5dc5e
|
@ -3,7 +3,8 @@
|
||||||
// --Matthew
|
// --Matthew
|
||||||
|
|
||||||
.mx_UserPill,
|
.mx_UserPill,
|
||||||
.mx_RoomPill {
|
.mx_RoomPill,
|
||||||
|
.mx_AtRoomPill {
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
|
@ -24,7 +25,8 @@
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {
|
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me,
|
||||||
|
.mx_EventTile_content .mx_AtRoomPill {
|
||||||
color: $accent-fg-color;
|
color: $accent-fg-color;
|
||||||
background-color: $mention-user-pill-bg-color;
|
background-color: $mention-user-pill-bg-color;
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
|
@ -39,7 +41,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_UserPill .mx_BaseAvatar,
|
.mx_UserPill .mx_BaseAvatar,
|
||||||
.mx_RoomPill .mx_BaseAvatar {
|
.mx_RoomPill .mx_BaseAvatar,
|
||||||
|
.mx_AtRoomPill .mx_BaseAvatar {
|
||||||
position: relative;
|
position: relative;
|
||||||
left: -3px;
|
left: -3px;
|
||||||
top: 2px;
|
top: 2px;
|
||||||
|
|
Loading…
Reference in New Issue