Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make some adjustments to mx_UserPill and mx_RoomPill #4597

Merged
merged 2 commits into from
Jul 19, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make some adjustments to mx_UserPill and mx_RoomPill
So that they can appear correctly in the body of a text message.
Luke Barnard committed Jul 17, 2017

Verified

This commit was signed with the committer’s verified signature.
987Nabil Nabil Abdel-Hafeez
commit 0e71ea7a5af6f5816335bd7b8dfa44c15eb19e38
Original file line number Diff line number Diff line change
@@ -2,23 +2,34 @@
// 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: $accent-fg-color;
background-color: $accent-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 {