OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated changes for the tile 

Signed-off-by: Ayush PS <ayushpratap16@gmail.com>
pull/21833/head
Ayush PS 2021-06-18 00:12:39 +05:30
parent 39402ec971
commit 1394e5b0a4
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/views/rooms/_EventTile.scss
View File

@ -130,11 +130,6 @@ $left-gutter: 64px;
.mx_EventTile_msgOption { .mx_EventTile_msgOption {
grid-column: 2; grid-column: 2;
} }
.hidden {
// override the overriden padding for hidden events
padding-left: 64px !important;
}
} }
.mx_EventTile_reply { .mx_EventTile_reply {

6
src/components/views/rooms/EventTile.tsx
View File

@ -824,7 +824,7 @@ export default class EventTile extends React.Component<IProps, IState> {
let tileHandler = getHandlerTile(this.props.mxEvent); let tileHandler = getHandlerTile(this.props.mxEvent);
// Info messages are basically information about commands processed on a room // 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.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
(eventType === EventType.RoomCreate) || (eventType === EventType.RoomCreate) ||
(eventType === EventType.RoomEncryption) || (eventType === EventType.RoomEncryption) ||
@ -840,6 +840,7 @@ export default class EventTile extends React.Component<IProps, IState> {
// duplicate of the thing they are replacing). // duplicate of the thing they are replacing).
if (SettingsStore.getValue("showHiddenEventsInTimeline") && !haveTileForEvent(this.props.mxEvent)) { if (SettingsStore.getValue("showHiddenEventsInTimeline") && !haveTileForEvent(this.props.mxEvent)) {
tileHandler = "messages.ViewSourceEvent"; tileHandler = "messages.ViewSourceEvent";
isBubbleMessage = false;
// Reuse info message avatar and sender profile styling // Reuse info message avatar and sender profile styling
isInfoMessage = true; isInfoMessage = true;
} }
@ -1135,8 +1136,7 @@ export default class EventTile extends React.Component<IProps, IState> {
{ ircTimestamp } { ircTimestamp }
{ sender } { sender }
{ ircPadlock } { ircPadlock }
<div className={`mx_EventTile_line ${ isBubbleMessage <div className="mx_EventTile_line">
&& tileHandler == "messages.ViewSourceEvent" ? "hidden" : ""}`}>
{ groupTimestamp } { groupTimestamp }
{ groupPadlock } { groupPadlock }
{ thread } { thread }