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

Unbreak IRC layout when thread summary is displayed (#7066)

pull/21833/head
Germain 2021-11-03 08:26:41 +00:00 committed by GitHub
parent 74376f989e
commit 4b66d4a891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,11 @@ $irc-line-height: $font-18px;
margin-right: $right-padding; margin-right: $right-padding;
} }
.mx_ThreadInfo {
margin-right: 0;
margin-left: 0;
}
> .mx_EventTile_msgOption { > .mx_EventTile_msgOption {
order: 5; order: 5;
flex-shrink: 0; flex-shrink: 0;

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

@ -1369,10 +1369,15 @@ export default class EventTile extends React.Component<IProps, IState> {
/> />
{ keyRequestInfo } { keyRequestInfo }
{ actionBar } { actionBar }
{ this.props.layout === Layout.IRC && (reactionsRow) } { this.props.layout === Layout.IRC && <>
</div> { reactionsRow }
{ this.renderThreadInfo() } { this.renderThreadInfo() }
{ this.props.layout !== Layout.IRC && (reactionsRow) } </> }
</div>
{ this.props.layout !== Layout.IRC && <>
{ reactionsRow }
{ this.renderThreadInfo() }
</> }
{ msgOption } { msgOption }
</>) </>)
); );