From bf87547f8808d2d5a20c9190a75bce0e79d50349 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 7 Jan 2019 09:13:01 -0600
Subject: [PATCH] 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 cea4b7897d..5e2b57aa5f 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 0d0949f07c..9d9e5a9e79 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,
         });