Skip to content

Commit f7d282f

Browse files
lukebarnard1lukebarnard1
authored
Merge pull request element-hq#4597 from vector-im/luke/css-matrixto-timeline-pills
Make some adjustments to mx_UserPill and mx_RoomPill
2 parents 3544c2b + 871c9e6 commit f7d282f

2 files changed

Lines changed: 25 additions & 9 deletions

File tree

‎src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,38 @@
22
// naming scheme; it's completely unclear where or how they're being used
33
// --Matthew
44

5-
.mx_UserPill {
6-
color: $accent-fg-color;
7-
background-color: $accent-color;
8-
padding: 1px 5px 0px 2px;
5+
.mx_UserPill,
6+
.mx_RoomPill {
7+
padding: 0px 5px 0px 2px;
98
border-radius: 16px;
9+
display: inline-block;
10+
height: 20px;
11+
line-height: 20px;
12+
}
13+
14+
/* More specific to override `.markdown-body a` color */
15+
.mx_EventTile_content .markdown-body a.mx_UserPill,
16+
.mx_UserPill {
17+
color: $primary-fg-color;
1018
}
1119

12-
.mx_UserPill img, .mx_RoomPill img {
13-
vertical-align: -2px;
14-
margin-right: 1px
20+
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {
21+
color: $accent-fg-color;
22+
background-color: $mention-user-pill-bg-color;
1523
}
1624

25+
/* More specific to override `.markdown-body a` color */
26+
.mx_EventTile_content .markdown-body a.mx_RoomPill,
1727
.mx_RoomPill {
1828
background-color: $rte-room-pill-color;
1929
color: $accent-fg-color;
20-
padding: 1px 5px 0px 2px;
21-
border-radius: 16px;
30+
}
31+
32+
.mx_UserPill .mx_BaseAvatar,
33+
.mx_RoomPill .mx_BaseAvatar {
34+
position: relative;
35+
top: 2px;
36+
margin-right: 1px;
2237
}
2338

2439
.mx_Markdown_BOLD {

‎src/skins/vector/css/themes/_base.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ $focus-brightness: 125%;
1919

2020
// red warning colour
2121
$warning-color: #ff0064;
22+
$mention-user-pill-bg-color: #ff0064;
2223

2324
$preview-bar-bg-color: #f7f7f7;
2425

0 commit comments

Comments
 (0)