OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-03-01 15:56:37 +00:00
parent 2aa15095f2 9a7a7ea2d6
commit 7daf0279d6
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/elements/TagTile.js
View File

@ -154,7 +154,13 @@ export default React.createClass({
</div> : <div />; </div> : <div />;
return <AccessibleButton className={className} onClick={this.onClick}> return <AccessibleButton className={className} onClick={this.onClick}>
<div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}> <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
<BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} /> <BaseAvatar
name={name}
idName={this.props.tag}
url={httpUrl}
width={avatarHeight}
height={avatarHeight}
/>
{ tip } { tip }
{ contextButton } { contextButton }
</div> </div>

14
src/components/views/groups/GroupTile.js
View File

@ -99,13 +99,23 @@ const GroupTile = React.createClass({
{...provided.dragHandleProps} {...provided.dragHandleProps}
> >
<div className="mx_GroupTile_avatar"> <div className="mx_GroupTile_avatar">
<BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} /> <BaseAvatar
name={name}
idName={this.props.groupId}
url={httpUrl}
width={avatarHeight}
height={avatarHeight} />
</div> </div>
</div> </div>
{ /* Instead of a blank placeholder, use a copy of the avatar itself. */ } { /* Instead of a blank placeholder, use a copy of the avatar itself. */ }
{ provided.placeholder ? { provided.placeholder ?
<div className="mx_GroupTile_avatar"> <div className="mx_GroupTile_avatar">
<BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} /> <BaseAvatar
name={name}
idName={this.props.groupId}
url={httpUrl}
width={avatarHeight}
height={avatarHeight} />
</div> : </div> :
<div /> <div />
} }