PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #6464 from matrix-org/gsouquet/fix-18172

Browse source 
Fix reactions row pushing content on IRC layout
This commit is contained in:
Germain 2021-07-26 07:40:49 +01:00 committed by GitHub
commit 93ae5c20d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,11 @@ $irc-line-height: $font-18px;
.mx_EditMessageComposer_buttons { .mx_EditMessageComposer_buttons {
position: relative; position: relative;
} }
.mx_ReactionsRow {
padding-left: 0;
padding-right: 0;
}
} }
.mx_EventTile_emote { .mx_EventTile_emote {

3
src/components/views/rooms/EventTile.tsx
View file

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