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

fix encryption icon missalignment

Browse source
This commit is contained in:
Jorik Schellekens 2020-05-26 18:15:06 +01:00
parent 076a3e058d
commit 73213422a9
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ $irc-line-height: $font-18px;
} }
> .mx_EventTile_msgOption { > .mx_EventTile_msgOption {
order: 4; order: 5;
flex-shrink: 0; flex-shrink: 0;
} }
@ -90,12 +90,14 @@ $irc-line-height: $font-18px;
text-align: right; text-align: right;
} }
.mx_EventTile_e2eIcon { > .mx_EventTile_e2eIcon {
position: relative; position: relative;
right: unset; right: unset;
left: unset; left: unset;
top: -2px;
padding: 0; padding: 0;
order: 3;
flex-shrink: 0;
flex-grow: 0;
} }
.mx_EventTile_line { .mx_EventTile_line {
@ -113,7 +115,7 @@ $irc-line-height: $font-18px;
} }
.mx_EventTile_reply { .mx_EventTile_reply {
order: 3; order: 4;
} }
.mx_EditMessageComposer_buttons { .mx_EditMessageComposer_buttons {

8
src/components/views/rooms/EventTile.js
View file

@ -802,6 +802,8 @@ export default createReactClass({
const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null; const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null;
const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null; const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null;
const groupPadlock = !this.props.useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
const ircPadlock = this.props.useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
switch (this.props.tileShape) { switch (this.props.tileShape) {
case 'notif': { case 'notif': {
@ -873,9 +875,10 @@ export default createReactClass({
{ ircTimestamp } { ircTimestamp }
{ avatar } { avatar }
{ sender } { sender }
{ ircPadlock }
<div className="mx_EventTile_reply"> <div className="mx_EventTile_reply">
{ groupTimestamp } { groupTimestamp }
{ !isBubbleMessage && this._renderE2EPadlock() } { groupPadlock }
{ thread } { thread }
<EventTileType ref={this._tile} <EventTileType ref={this._tile}
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
@ -904,9 +907,10 @@ export default createReactClass({
{ readAvatars } { readAvatars }
</div> </div>
{ sender } { sender }
{ ircPadlock }
<div className="mx_EventTile_line"> <div className="mx_EventTile_line">
{ groupTimestamp } { groupTimestamp }
{ !isBubbleMessage && this._renderE2EPadlock() } { groupPadlock }
{ thread } { thread }
<EventTileType ref={this._tile} <EventTileType ref={this._tile}
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}