mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-07-20 10:16:40 +00:00
commit 98e3746a1e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
View file

@ -4,7 +4,6 @@
.mx_UserPill, .mx_UserPill,
.mx_RoomPill { .mx_RoomPill {
padding: 0px 5px 0px 2px;
border-radius: 16px; border-radius: 16px;
display: inline-block; display: inline-block;
height: 20px; height: 20px;
@ -20,20 +19,23 @@
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me { .mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {
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;
} }
/* More specific to override `.markdown-body a` color */ /* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_RoomPill, .mx_EventTile_content .markdown-body a.mx_RoomPill,
.mx_RoomPill { .mx_RoomPill {
background-color: $rte-room-pill-color;
color: $accent-fg-color; color: $accent-fg-color;
background-color: $rte-room-pill-color;
padding-right: 5px;
} }
.mx_UserPill .mx_BaseAvatar, .mx_UserPill .mx_BaseAvatar,
.mx_RoomPill .mx_BaseAvatar { .mx_RoomPill .mx_BaseAvatar {
position: relative; position: relative;
top: 2px; top: 2px;
margin-right: 1px; margin-left: 2px;
margin-right: 2px;
} }
.mx_Markdown_BOLD { .mx_Markdown_BOLD {