Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
98e3746a1e
|
@ -4,7 +4,6 @@
|
|||
|
||||
.mx_UserPill,
|
||||
.mx_RoomPill {
|
||||
padding: 0px 5px 0px 2px;
|
||||
border-radius: 16px;
|
||||
display: inline-block;
|
||||
height: 20px;
|
||||
|
@ -20,20 +19,23 @@
|
|||
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {
|
||||
color: $accent-fg-color;
|
||||
background-color: $mention-user-pill-bg-color;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
/* More specific to override `.markdown-body a` color */
|
||||
.mx_EventTile_content .markdown-body a.mx_RoomPill,
|
||||
.mx_RoomPill {
|
||||
background-color: $rte-room-pill-color;
|
||||
color: $accent-fg-color;
|
||||
background-color: $rte-room-pill-color;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
.mx_UserPill .mx_BaseAvatar,
|
||||
.mx_RoomPill .mx_BaseAvatar {
|
||||
position: relative;
|
||||
top: 2px;
|
||||
margin-right: 1px;
|
||||
margin-left: 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
.mx_Markdown_BOLD {
|
||||
|
|
Loading…
Reference in New Issue