imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6138 from matrix-org/gsouquet/containment-event

Browse source 
Fix mx_Event containment rules and empty read avatar row
This commit is contained in:
Germain 2021-06-03 16:38:55 +01:00 • committed by GitHub
commit a36063704d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/css/structures/_RoomView.scss
View file

@ -222,7 +222,6 @@ limitations under the License.
.mx_RoomView_MessageList li { .mx_RoomView_MessageList li {
clear: both; clear: both;
contain: content;
} }
li.mx_RoomView_myReadMarker_container { li.mx_RoomView_myReadMarker_container {

2
res/css/views/rooms/_RoomTile.scss
View file

@ -19,7 +19,7 @@ limitations under the License.
margin-bottom: 4px; margin-bottom: 4px;
padding: 4px; padding: 4px;
contain: strict; contain: content; // Not strict as it will break when resizing a sublist vertically
height: 40px; height: 40px;
box-sizing: border-box; box-sizing: border-box;

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

@ -644,7 +644,7 @@ export default class EventTile extends React.Component<IProps, IState> {
// return early if there are no read receipts // return early if there are no read receipts
if (!this.props.readReceipts || this.props.readReceipts.length === 0) { if (!this.props.readReceipts || this.props.readReceipts.length === 0) {
return (<span className="mx_EventTile_readAvatars" />); return null;
} }
const ReadReceiptMarker = sdk.getComponent('rooms.ReadReceiptMarker'); const ReadReceiptMarker = sdk.getComponent('rooms.ReadReceiptMarker');