Skip to content
Snippets Groups Projects
Commit 8dc73cb6 authored by Matthew Hodgson's avatar Matthew Hodgson
Browse files

finally fix dave's MemberInfo visibility bug, hopefully

parent 2160440f
No related branches found
No related tags found
No related merge requests found
......@@ -71,14 +71,26 @@ limitations under the License.
text-overflow: ellipsis;
}
.mx_MemberTile_nameWrapper {
display: table-cell;
vertical-align: middle;
overflow: hidden;
text-overflow: ellipsis;
}
.mx_MemberTile_nameSpan {
}
.mx_MemberTile_unavailable .mx_MemberTile_avatar,
.mx_MemberTile_unavailable .mx_MemberTile_name
.mx_MemberTile_unavailable .mx_MemberTile_name,
.mx_MemberTile_unavailable .mx_MemberTile_nameSpan
{
opacity: 0.75;
}
.mx_MemberTile_offline .mx_MemberTile_avatar,
.mx_MemberTile_offline .mx_MemberTile_name
.mx_MemberTile_offline .mx_MemberTile_name,
.mx_MemberTile_offline .mx_MemberTile_nameSpan
{
opacity: 0.5;
}
\ No newline at end of file
......@@ -58,6 +58,21 @@ module.exports = React.createClass({
}
mainClassName += presenceClass;
var name;
if (this.state.hover) {
name =
<div className="mx_MemberTile_nameWrapper">
<MemberInfo member={this.props.member} />
<span className="mx_MemberTile_nameSpan">{this.props.member.name}</span>
</div>
}
else {
name =
<div className="mx_MemberTile_name">
{this.props.member.name}
</div>
}
return (
<div className={mainClassName} onMouseEnter={ this.mouseEnter } onMouseLeave={ this.mouseLeave }>
<div className="mx_MemberTile_avatar">
......@@ -66,10 +81,7 @@ module.exports = React.createClass({
width="40" height="40" alt=""/>
{ power }
</div>
<div className="mx_MemberTile_name">
{ this.state.hover ? <MemberInfo member={this.props.member} /> : null }
{this.props.member.name}
</div>
{ name }
</div>
);
}
......
......@@ -33,7 +33,7 @@ module.exports = React.createClass({
getInitialState: function() {
return {
phase : this.Phase.None
phase : this.Phase.MemberList
}
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment