diff --git a/skins/base/css/molecules/MemberTile.css b/skins/base/css/molecules/MemberTile.css index 083e41cf1f..ddd3962b33 100644 --- a/skins/base/css/molecules/MemberTile.css +++ b/skins/base/css/molecules/MemberTile.css @@ -27,13 +27,24 @@ limitations under the License. vertical-align: middle; width: 40px; height: 40px; + position: relative; } -.mx_MemberTile_avatar img { +.mx_MemberTile_avatarImg { + z-index: 20; border-radius: 20px; background-color: #dbdbdb; } +.mx_MemberTile_power { + z-index: 10; + position: absolute; + width: 48px; + height: 48px; + left: -4px; + top: -1px; +} + .mx_MemberTile_name { display: table-cell; vertical-align: middle; diff --git a/skins/base/img/p/p0.png b/skins/base/img/p/p0.png new file mode 100644 index 0000000000..300cc22654 Binary files /dev/null and b/skins/base/img/p/p0.png differ diff --git a/skins/base/img/p/p1.png b/skins/base/img/p/p1.png new file mode 100644 index 0000000000..5a6e3054e4 Binary files /dev/null and b/skins/base/img/p/p1.png differ diff --git a/skins/base/img/p/p10.png b/skins/base/img/p/p10.png new file mode 100644 index 0000000000..7cead0f239 Binary files /dev/null and b/skins/base/img/p/p10.png differ diff --git a/skins/base/img/p/p11.png b/skins/base/img/p/p11.png new file mode 100644 index 0000000000..d744d8af2f Binary files /dev/null and b/skins/base/img/p/p11.png differ diff --git a/skins/base/img/p/p12.png b/skins/base/img/p/p12.png new file mode 100644 index 0000000000..02492d554a Binary files /dev/null and b/skins/base/img/p/p12.png differ diff --git a/skins/base/img/p/p13.png b/skins/base/img/p/p13.png new file mode 100644 index 0000000000..0ae8029d87 Binary files /dev/null and b/skins/base/img/p/p13.png differ diff --git a/skins/base/img/p/p14.png b/skins/base/img/p/p14.png new file mode 100644 index 0000000000..23a3840bf8 Binary files /dev/null and b/skins/base/img/p/p14.png differ diff --git a/skins/base/img/p/p15.png b/skins/base/img/p/p15.png new file mode 100644 index 0000000000..b07f463a07 Binary files /dev/null and b/skins/base/img/p/p15.png differ diff --git a/skins/base/img/p/p16.png b/skins/base/img/p/p16.png new file mode 100644 index 0000000000..f8fa4abfa1 Binary files /dev/null and b/skins/base/img/p/p16.png differ diff --git a/skins/base/img/p/p17.png b/skins/base/img/p/p17.png new file mode 100644 index 0000000000..20e985bb1c Binary files /dev/null and b/skins/base/img/p/p17.png differ diff --git a/skins/base/img/p/p18.png b/skins/base/img/p/p18.png new file mode 100644 index 0000000000..2ecd29b350 Binary files /dev/null and b/skins/base/img/p/p18.png differ diff --git a/skins/base/img/p/p19.png b/skins/base/img/p/p19.png new file mode 100644 index 0000000000..ec35f0fc80 Binary files /dev/null and b/skins/base/img/p/p19.png differ diff --git a/skins/base/img/p/p2.png b/skins/base/img/p/p2.png new file mode 100644 index 0000000000..82f16d6078 Binary files /dev/null and b/skins/base/img/p/p2.png differ diff --git a/skins/base/img/p/p20.png b/skins/base/img/p/p20.png new file mode 100644 index 0000000000..0ff816d61b Binary files /dev/null and b/skins/base/img/p/p20.png differ diff --git a/skins/base/img/p/p3.png b/skins/base/img/p/p3.png new file mode 100644 index 0000000000..ae215557a8 Binary files /dev/null and b/skins/base/img/p/p3.png differ diff --git a/skins/base/img/p/p4.png b/skins/base/img/p/p4.png new file mode 100644 index 0000000000..011ff6f541 Binary files /dev/null and b/skins/base/img/p/p4.png differ diff --git a/skins/base/img/p/p5.png b/skins/base/img/p/p5.png new file mode 100644 index 0000000000..1a90da9aac Binary files /dev/null and b/skins/base/img/p/p5.png differ diff --git a/skins/base/img/p/p6.png b/skins/base/img/p/p6.png new file mode 100644 index 0000000000..453110f62f Binary files /dev/null and b/skins/base/img/p/p6.png differ diff --git a/skins/base/img/p/p7.png b/skins/base/img/p/p7.png new file mode 100644 index 0000000000..6418817ca8 Binary files /dev/null and b/skins/base/img/p/p7.png differ diff --git a/skins/base/img/p/p8.png b/skins/base/img/p/p8.png new file mode 100644 index 0000000000..0e821fd675 Binary files /dev/null and b/skins/base/img/p/p8.png differ diff --git a/skins/base/img/p/p9.png b/skins/base/img/p/p9.png new file mode 100644 index 0000000000..f4b6941b24 Binary files /dev/null and b/skins/base/img/p/p9.png differ diff --git a/skins/base/views/molecules/MemberTile.js b/skins/base/views/molecules/MemberTile.js index 29f72c9393..feaab9788f 100644 --- a/skins/base/views/molecules/MemberTile.js +++ b/skins/base/views/molecules/MemberTile.js @@ -25,9 +25,15 @@ module.exports = React.createClass({ displayName: 'MemberTile', mixins: [MemberTileController], render: function() { + var power; + if (this.props.member) { + var img = "/img/p/p" + Math.floor(20 * this.props.member.powerLevelNorm / 100) + ".png"; + power = ; + } + return (
-
+
{ power }
{this.props.member.name}
);