From 1394e5b0a4a950cb8f2a17758b09fc72862493a2 Mon Sep 17 00:00:00 2001 From: Ayush PS Date: Fri, 18 Jun 2021 00:12:39 +0530 Subject: [PATCH] Updated changes for the tile Signed-off-by: Ayush PS --- res/css/views/rooms/_EventTile.scss | 5 ----- src/components/views/rooms/EventTile.tsx | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index a6ccde93d3..5d1dd04383 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -130,11 +130,6 @@ $left-gutter: 64px; .mx_EventTile_msgOption { grid-column: 2; } - - .hidden { - // override the overriden padding for hidden events - padding-left: 64px !important; - } } .mx_EventTile_reply { diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 533aa6cfab..35ccefde1e 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -824,7 +824,7 @@ export default class EventTile extends React.Component { let tileHandler = getHandlerTile(this.props.mxEvent); // Info messages are basically information about commands processed on a room - const isBubbleMessage = eventType.startsWith("m.key.verification") || + let isBubbleMessage = eventType.startsWith("m.key.verification") || (eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) || (eventType === EventType.RoomCreate) || (eventType === EventType.RoomEncryption) || @@ -840,6 +840,7 @@ export default class EventTile extends React.Component { // duplicate of the thing they are replacing). if (SettingsStore.getValue("showHiddenEventsInTimeline") && !haveTileForEvent(this.props.mxEvent)) { tileHandler = "messages.ViewSourceEvent"; + isBubbleMessage = false; // Reuse info message avatar and sender profile styling isInfoMessage = true; } @@ -1135,8 +1136,7 @@ export default class EventTile extends React.Component { { ircTimestamp } { sender } { ircPadlock } -
+
{ groupTimestamp } { groupPadlock } { thread }