From d65b2f8a7bbb77292b99d559aadcf980ddde03a0 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 7 Jan 2019 09:13:01 -0600 Subject: [PATCH 1/2] Remove unexpected underline from pills Fixes vector-im/riot-web#8031. --- res/css/views/elements/_RichText.scss | 5 +++++ src/components/views/elements/Pill.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss index cea4b7897dc..5e2b57aa5f7 100644 --- a/res/css/views/elements/_RichText.scss +++ b/res/css/views/elements/_RichText.scss @@ -19,6 +19,11 @@ cursor: pointer; } +/* More specific to override `.markdown-body a` text-decoration */ +.mx_EventTile_content .markdown-body a.mx_Pill { + text-decoration: none; +} + /* More specific to override `.markdown-body a` color */ .mx_EventTile_content .markdown-body a.mx_UserPill, .mx_UserPill { diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index 0d0949f07c3..9d9e5a9e790 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -271,7 +271,7 @@ const Pill = React.createClass({ break; } - const classes = classNames(pillClass, { + const classes = classNames("mx_Pill", pillClass, { "mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId, "mx_UserPill_selected": this.props.isSelected, }); From c24161097e03c1eb15fc41449ac54d7d66c6b720 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 7 Jan 2019 09:18:24 -0600 Subject: [PATCH 2/2] Fix color for @room pills in HTML messages --- res/css/views/elements/_RichText.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss index 5e2b57aa5f7..e35f4d60f4f 100644 --- a/res/css/views/elements/_RichText.scss +++ b/res/css/views/elements/_RichText.scss @@ -36,7 +36,9 @@ background-color: $accent-color ! important; } +/* More specific to override `.markdown-body a` color */ .mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me, +.mx_EventTile_content .markdown-body a.mx_AtRoomPill, .mx_EventTile_content .mx_AtRoomPill, .mx_MessageComposer_input .mx_AtRoomPill { color: $accent-fg-color;