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

Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo

Browse source 
Blend pending redactions
This commit is contained in:
Bruno Windels 2019-06-18 13:09:25 +00:00 • committed by GitHub
commit f7c03acb58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/views/rooms/_EventTile.scss
View file

@ -169,6 +169,9 @@ limitations under the License.
.mx_EventTile_sending .mx_RoomPill { .mx_EventTile_sending .mx_RoomPill {
opacity: 0.5; opacity: 0.5;
} }
.mx_EventTile_sending.mx_EventTile_redacted .mx_UnknownBody {
opacity: 0.4;
}
.mx_EventTile_notSent { .mx_EventTile_notSent {
color: $event-notsent-color; color: $event-notsent-color;

2
src/components/structures/MessagePanel.js
View file

@ -592,7 +592,7 @@ module.exports = React.createClass({
readReceiptMap={this._readReceiptMap} readReceiptMap={this._readReceiptMap}
showUrlPreview={this.props.showUrlPreview} showUrlPreview={this.props.showUrlPreview}
checkUnmounting={this._isUnmounting} checkUnmounting={this._isUnmounting}
eventSendStatus={mxEv.replacementOrOwnStatus()} eventSendStatus={mxEv.getAssociatedStatus()}
tileShape={this.props.tileShape} tileShape={this.props.tileShape}
isTwelveHour={this.props.isTwelveHour} isTwelveHour={this.props.isTwelveHour}
permalinkCreator={this.props.permalinkCreator} permalinkCreator={this.props.permalinkCreator}