From 094093e078ece765e6e9659d7426c515c40dfa6f Mon Sep 17 00:00:00 2001
From: Arav-Agarwal <aagarw6723@rcs-k12.us>
Date: Thu, 1 Sep 2016 00:05:45 -0400
Subject: [PATCH 1/2] Added login button to profile page

---
 hourglass/client/login/login.css      |  2 +-
 hourglass/client/profile/profile.css  | 16 +++++++++++-----
 hourglass/client/profile/profile.html |  2 ++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css
index d18e05d..edb64ae 100644
--- a/hourglass/client/login/login.css
+++ b/hourglass/client/login/login.css
@@ -124,7 +124,7 @@ p.text {
 }
 
 .login-button {
-	display: none !important;
+	
 }
 
 #github {
diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css
index 7f4ed28..2e941b6 100644
--- a/hourglass/client/profile/profile.css
+++ b/hourglass/client/profile/profile.css
@@ -401,7 +401,7 @@
 	color: #999 !important;
 }
 
-#mainpage:hover {
+#mainpage:hover, #logout2:hover {
 	-webkit-transform: scale(1.05);
     -moz-transform: scale(1.05);
     -ms-transform: scale(1.05);
@@ -409,7 +409,7 @@
     transform: scale(1.05);
 }
 
-#mainpage h2 {
+#mainpage h2, #logout2 h2 {
 	font-weight: 200;
 	width: 100%;
 	padding: 8%;
@@ -418,8 +418,9 @@
 	filter: none !important;
 }
 
-#mainpage {
+#mainpage, #logout2 {
 	font-size: 90%;
+	padding: 0;
 	background-color: #617C9E;
 
 	box-shadow: -1px 2px 5px 1px #333;
@@ -434,8 +435,13 @@
 	-ms-transition: transform 0.2s ease, background-color 0.1s ease;
 	transition: transform 0.2s ease, background-color 0.1s ease;
 }
-
-#mainpage:active {
+#logout2 {
+	background-color: #DE5050;
+	position: absolute;
+	top: 0;
+	left: 85%;
+}
+#mainpage:active,#logout2:active {
 	background-color: #56708D;
 }
 
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index 038128d..f3d8726 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -1,6 +1,8 @@
 <template name="profile">
+	{{> loginButtons}}
 	<div id="profPage" style="background-color:{{divColor 'header'}};height:{{mainHeight}};{{textColor}}{{loadNew}}">
 		<div id="mainpage" onclick="window.location='/'"><h2>Main Page</h2></div>
+		<div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div>
 		<div id="profMainContainer" style="{{mainCenter}}">
 			<div id="profBanner" style="{{banner}};"></div>
 			<div id="profAvatar" style="{{avatar}};{{avatarDim}}"></div>

From 726be1e084a8f93423ee17b92099025ea145c56d Mon Sep 17 00:00:00 2001
From: Arav-Agarwal <aagarw6723@rcs-k12.us>
Date: Thu, 1 Sep 2016 00:07:56 -0400
Subject: [PATCH 2/2] css reversion

---
 hourglass/client/login/login.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css
index edb64ae..d18e05d 100644
--- a/hourglass/client/login/login.css
+++ b/hourglass/client/login/login.css
@@ -124,7 +124,7 @@ p.text {
 }
 
 .login-button {
-	
+	display: none !important;
 }
 
 #github {