match the design

This commit is contained in:
Matthew Hodgson 2015-08-14 21:14:05 +01:00
parent a2e7c4aa77
commit 80c3b2c8a3
5 changed files with 35 additions and 21 deletions

View File

@ -15,13 +15,14 @@ limitations under the License.
*/
.mx_MemberTile {
cursor: pointer;
display: table-row;
height: 49px;
position: relative;
}
.mx_MemberTile_avatar {
display: table-cell;
padding-left: 14px;
padding-right: 12px;
padding-top: 3px;
padding-bottom: 3px;
@ -31,6 +32,10 @@ limitations under the License.
position: relative;
}
.mx_MemberTile_inviteTile {
cursor: pointer;
}
.mx_MemberTile_inviteEditing {
display: initial ! important;
}
@ -50,14 +55,14 @@ limitations under the License.
font-size: 14px;
padding: 9px;
margin-top: 6px;
margin-left: 14px;
}
.mx_MemberTile_power {
z-index: 10;
position: absolute;
width: 48px;
height: 48px;
left: -4px;
left: 10px;
top: -1px;
}
@ -68,6 +73,12 @@ limitations under the License.
text-overflow: ellipsis;
}
.mx_MemberTile_details {
display: table-cell;
padding-right: 14px;
vertical-align: middle;
}
.mx_MemberTile_hover {
background-color: #f0f0f0;
font-size: 12px;
@ -76,6 +87,16 @@ limitations under the License.
.mx_MemberTile_userId {
font-weight: bold;
overflow: hidden;
text-overflow: ellipsis;
}
.mx_MemberTile_leave {
cursor: pointer;
margin-top: 8px;
margin-right: -4px;
margin-left: 6px;
float: right;
}
/*
@ -107,7 +128,3 @@ limitations under the License.
.mx_MemberTile_zalgo {
font-family: Helvetica, Arial, Sans-Serif;
}
.mx_MemberTile_leave {
float: right;
}

View File

@ -42,7 +42,6 @@ limitations under the License.
border: 1px solid #a9dbf4;
overflow-y: auto;
border-radius: 8px;
padding: 20px 14px 14px 24px;
background-color: #fff;
order: 1;
@ -57,5 +56,5 @@ limitations under the License.
}
.mx_MemberList h2 {
margin-top: 0px;
margin: 14px;
}

View File

@ -33,7 +33,6 @@ module.exports = React.createClass({
},
onClickDiv: function() {
console.log("onClickDiv triggered");
this.setState({
phase: this.Phases.Edit,
})

View File

@ -70,8 +70,12 @@ module.exports = React.createClass({
},
getPrettyPresence: function(user) {
if (!user) return "Unknown";
var presence = user.presence;
return presence.charAt(0).toUpperCase() + presence.slice(1);
if (presence === "online") return "Online";
if (presence === "unavailable") return "Idle"; // XXX: is this actually right?
if (presence === "offline") return "Offline";
return "Unknown";
},
render: function() {
@ -110,7 +114,7 @@ module.exports = React.createClass({
if (this.state.hover) {
var presence;
// FIXME: make presence data update whenever User.presence changes...
var active = this.props.member.user.lastActiveAgo || -1;
var active = this.props.member.user ? (this.props.member.user.lastActiveAgo || -1) : -1;
if (active >= 0) {
presence = <div className="mx_MemberTile_presence">{ this.getPrettyPresence(this.props.member.user) } for { this.getDuration(active) }</div>;
}
@ -118,12 +122,12 @@ module.exports = React.createClass({
presence = <div className="mx_MemberTile_presence">{ this.getPrettyPresence(this.props.member.user) }</div>;
}
// <MemberInfo member={this.props.member} />
nameEl =
<div className="mx_MemberTile_details">
<MemberInfo member={this.props.member} />
<div className="mx_MemberTile_userId">{ this.props.member.userId }</div>
{ presence }
{ leave }
<div className="mx_MemberTile_userId" title={ this.props.member.userId }>{ this.props.member.userId }</div>
{ presence }
</div>
}
else {

View File

@ -75,14 +75,9 @@ module.exports = React.createClass({
},
inviteTile: function() {
// if (this.state.inviting) {
// return (
// <div></div>
// );
// }
var classes = classNames({
mx_MemberTile: true,
mx_MemberTile_inviteTile: true,
mx_MemberTile_inviteEditing: this.state.editing,
});