From d439871ea11b532b05f3de15d4f2be395faa9461 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Thu, 30 Jun 2022 04:47:35 +0000
Subject: [PATCH] Move mx_EventTile_highlight out of
 mx_EventTile:not([data-layout=bubble]) (#8940)

* Move mx_EventTile_highlight etc. out of mx_EventTile:not([data-layout=bubble])

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Set highlight text color globally

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/rooms/_EventBubbleTile.scss |  2 --
 res/css/views/rooms/_EventTile.scss       | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 285f16788b..def5816ed0 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -81,8 +81,6 @@ limitations under the License.
         &::before {
             background-color: $event-highlight-bg-color;
         }
-
-        color: $alert;
     }
 
     /* For replies */
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index a6f244c636..ab524ad2df 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -23,6 +23,11 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
 
     flex-shrink: 0;
 
+    &.mx_EventTile_highlight,
+    &.mx_EventTile_highlight .markdown-body {
+        color: $alert;
+    }
+
     .mx_EventTile_avatar {
         cursor: pointer;
         user-select: none;
@@ -89,6 +94,13 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
 
     &[data-layout=irc],
     &[data-layout=group] {
+        &.mx_EventTile_highlight,
+        &.mx_EventTile_highlight .markdown-body {
+            .mx_EventTile_line {
+                background-color: $event-highlight-bg-color;
+            }
+        }
+
         .mx_EventTile_e2eIcon {
             position: absolute;
         }
@@ -227,15 +239,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         background-color: $event-selected-color;
     }
 
-    &.mx_EventTile_highlight,
-    &.mx_EventTile_highlight .markdown-body {
-        color: $alert;
-
-        .mx_EventTile_line {
-            background-color: $event-highlight-bg-color;
-        }
-    }
-
     &.mx_EventTile_selected.mx_EventTile_info .mx_EventTile_line {
         padding-left: calc($left-gutter + 18px);
     }