From 98a89ee4b9884313d44332e2aebd71737833ffb1 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <cablanchard@gmail.com>
Date: Mon, 14 Sep 2015 23:27:45 +0100
Subject: [PATCH] Restyle

---
 lib/react/gather.jsx |  2 +-
 lib/react/user.jsx   | 25 +++++++++++++++----------
 public/css/app.css   | 18 +++++++++++++++++-
 views/index.hbs      |  4 ++--
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/lib/react/gather.jsx b/lib/react/gather.jsx
index b91e252..809e09f 100644
--- a/lib/react/gather.jsx
+++ b/lib/react/gather.jsx
@@ -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} />
diff --git a/lib/react/user.jsx b/lib/react/user.jsx
index 847a7c2..8c84f40 100644
--- a/lib/react/user.jsx
+++ b/lib/react/user.jsx
@@ -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>
 		);
 	}
 });
diff --git a/public/css/app.css b/public/css/app.css
index 9f841e7..20800a0 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -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;
 };
diff --git a/views/index.hbs b/views/index.hbs
index 301e261..644320a 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -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>