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

Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice

Browse source
This commit is contained in:
Travis Ralston 2017-11-03 19:57:39 -06:00
commit a2b7f6d30e
111 changed files with 10299 additions and 3407 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/rooms/RoomHeader.js
View file

@ -309,8 +309,11 @@ module.exports = React.createClass({
<input id="avatarInput" type="file" onChange={this.onAvatarSelected} />
</div>
<div className="mx_RoomHeader_avatarPicker_remove" onClick={this.onAvatarRemoveClick}>
<img src="img/cancel.svg" width="10"
alt={_t("Remove avatar")} title={_t("Remove avatar")} />
<img src="img/cancel.svg"
className="mx_filterFlipColor"
width="10"
alt={_t("Remove avatar")}
title={_t("Remove avatar")} />
</div>
</div>
);