ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-26 22:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restyle

Browse source
This commit is contained in:
Chris Blanchard 2015-09-14 23:27:45 +01:00
parent 7bd06a5131
commit 98a89ee4b9
4 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/react/gather.jsx
View file

@ -602,7 +602,7 @@ var Gather = React.createClass({
}
return (
<div>
<div className="panel panel-default">
<div className="panel panel-default add-bottom">
<div className="panel-heading">Current Gather</div>
<div className="panel-body">
<GatherProgress {...this.props} />

25
lib/react/user.jsx
View file

@ -56,19 +56,24 @@ var UserMenu = React.createClass({
render() {
let users = this.props.users.map(user => {
return (
<li key={user.id}><a href="#">{user.username}</a></li>
<li key={user.id}
className="list-group-item">
<a href="#">{user.username}</a>
</li>
);
});
return (
<ul className="nav" id="side-menu">
<li>
<a href="#">
<i className="fa fa-users fa-fw"></i> Online
<span className="badge add-left"> {this.props.users.length} </span>
</a>
</li>
{users}
</ul>
<div>
<div className="panel panel-default add-bottom">
<div className="panel-heading">
<span className="badge add-right">{this.props.users.length}</span>
<i className="fa fa-users fa-fw"></i>
</div>
</div>
<ul className="list-group" id="users-list">
{users}
</ul>
</div>
);
}
});

18
public/css/app.css
View file

@ -21,6 +21,14 @@ html, body {
padding: 0px;
}
#side-menu {
margin-top: 1em;
}
#users-list {
}
#chatroom {
margin-top: 1em;
}
@ -30,7 +38,11 @@ html, body {
}
.add-left {
margin-left: 10px;
margin-left: 0.5em;
}
.add-right {
margin-left: 0.5em;
}
#chatmessages {
@ -63,6 +75,10 @@ html, body {
margin-top: 0.5em;
}
.add-bottom {
margin-bottom: 0.5em;
}
.previous-headline {
margin-top: 2em;
};

4
views/index.hbs
View file

@ -44,11 +44,11 @@
</div>
</div>
<div class="row">
<div class="col-lg-1">
<div class="col-lg-2 hidden-xs">
<ul class="nav" id="side-menu"></ul>
</div>
<div class="col-lg-5" id="chatroom"></div>
<div class="col-lg-6" id="gathers"></div>
<div class="col-lg-5" id="gathers"></div>
</div>
</div>
</div>