Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills
Make some adjustments to mx_UserPill and mx_RoomPill
This commit is contained in:
commit
f7d282fc8e
|
@ -2,23 +2,38 @@
|
|||
// naming scheme; it's completely unclear where or how they're being used
|
||||
// --Matthew
|
||||
|
||||
.mx_UserPill {
|
||||
color: $accent-fg-color;
|
||||
background-color: $accent-color;
|
||||
padding: 1px 5px 0px 2px;
|
||||
.mx_UserPill,
|
||||
.mx_RoomPill {
|
||||
padding: 0px 5px 0px 2px;
|
||||
border-radius: 16px;
|
||||
display: inline-block;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.mx_UserPill img, .mx_RoomPill img {
|
||||
vertical-align: -2px;
|
||||
margin-right: 1px
|
||||
/* More specific to override `.markdown-body a` color */
|
||||
.mx_EventTile_content .markdown-body a.mx_UserPill,
|
||||
.mx_UserPill {
|
||||
color: $primary-fg-color;
|
||||
}
|
||||
|
||||
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {
|
||||
color: $accent-fg-color;
|
||||
background-color: $mention-user-pill-bg-color;
|
||||
}
|
||||
|
||||
/* 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;
|
||||
padding: 1px 5px 0px 2px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
.mx_UserPill .mx_BaseAvatar,
|
||||
.mx_RoomPill .mx_BaseAvatar {
|
||||
position: relative;
|
||||
top: 2px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
.mx_Markdown_BOLD {
|
||||
|
|
|
@ -19,6 +19,7 @@ $focus-brightness: 125%;
|
|||
|
||||
// red warning colour
|
||||
$warning-color: #ff0064;
|
||||
$mention-user-pill-bg-color: #ff0064;
|
||||
|
||||
$preview-bar-bg-color: #f7f7f7;
|
||||
|
||||
|
|
Loading…
Reference in New Issue