pull/1/head
Matthew Hodgson 2015-07-18 19:06:58 +01:00
parent c83ff1c623
commit ea8737d957
23 changed files with 19 additions and 2 deletions

View File

@ -27,13 +27,24 @@ limitations under the License.
vertical-align: middle; vertical-align: middle;
width: 40px; width: 40px;
height: 40px; height: 40px;
position: relative;
} }
.mx_MemberTile_avatar img { .mx_MemberTile_avatarImg {
z-index: 20;
border-radius: 20px; border-radius: 20px;
background-color: #dbdbdb; background-color: #dbdbdb;
} }
.mx_MemberTile_power {
z-index: 10;
position: absolute;
width: 48px;
height: 48px;
left: -4px;
top: -1px;
}
.mx_MemberTile_name { .mx_MemberTile_name {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;

BIN
skins/base/img/p/p0.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 B

BIN
skins/base/img/p/p1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

BIN
skins/base/img/p/p10.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 B

BIN
skins/base/img/p/p11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 628 B

BIN
skins/base/img/p/p12.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 B

BIN
skins/base/img/p/p13.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

BIN
skins/base/img/p/p14.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

BIN
skins/base/img/p/p15.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 774 B

BIN
skins/base/img/p/p16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 835 B

BIN
skins/base/img/p/p17.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 872 B

BIN
skins/base/img/p/p18.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 931 B

BIN
skins/base/img/p/p19.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 960 B

BIN
skins/base/img/p/p2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

BIN
skins/base/img/p/p20.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 911 B

BIN
skins/base/img/p/p3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

BIN
skins/base/img/p/p4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

BIN
skins/base/img/p/p5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 389 B

BIN
skins/base/img/p/p6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

BIN
skins/base/img/p/p7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 476 B

BIN
skins/base/img/p/p8.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 538 B

BIN
skins/base/img/p/p9.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

View File

@ -25,9 +25,15 @@ module.exports = React.createClass({
displayName: 'MemberTile', displayName: 'MemberTile',
mixins: [MemberTileController], mixins: [MemberTileController],
render: function() { render: function() {
var power;
if (this.props.member) {
var img = "/img/p/p" + Math.floor(20 * this.props.member.powerLevelNorm / 100) + ".png";
power = <img src={ img } className="mx_MemberTile_power" width="48" height="48" alt=""/>;
}
return ( return (
<div className="mx_MemberTile"> <div className="mx_MemberTile">
<div className="mx_MemberTile_avatar"><img src={ this.props.member ? MatrixClientPeg.get().getAvatarUrlForMember(this.props.member, 40, 40, "crop") : null } width="40" height="40" alt=""/></div> <div className="mx_MemberTile_avatar"><img className="mx_MemberTile_avatarImg" src={ this.props.member ? MatrixClientPeg.get().getAvatarUrlForMember(this.props.member, 40, 40, "crop") : null } width="40" height="40" alt=""/>{ power }</div>
<div className="mx_MemberTile_name">{this.props.member.name}</div> <div className="mx_MemberTile_name">{this.props.member.name}</div>
</div> </div>
); );