From bbea11a0cc16d8ec27be0e4aabc69e2f1de91876 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Thu, 26 Jan 2017 01:38:19 -0500
Subject: [PATCH] deleted login page, added new(?) logo

---
 hourglass/client/login/login.css  | 151 ++----------------------------
 hourglass/client/login/login.html |  25 ++---
 2 files changed, 15 insertions(+), 161 deletions(-)

diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css
index a44b351..df24c6b 100644
--- a/hourglass/client/login/login.css
+++ b/hourglass/client/login/login.css
@@ -1,157 +1,24 @@
-#loginCont {
+#loginBody {
+	height: 94vh;
 	width: 100%;
-	height: 100%;
-	display: table;
-
-	table-layout: fixed;
-	border-collapse: collapse;
-}
-
-#loginHeader {
-	font-weight: 600;
-	width: 100%;
-	height: 11vh;
-
-	background-color: #EBEBEB;
-	box-shadow: 2px 2px 5px 3px #666;
-
-	display: table-row;
-	position: absolute;
-	top: 0;
-	z-index: 50;
-}
-
-#logo {
-	height: 8vh;
-	width: 8vh;
-	padding: 1.5vh;
-	line-height: 11vh;
-
-	float: left;
-
-	-webkit-filter: drop-shadow(2px 2px 5px #333);
-	filter: drop-shadow(2px 2px 5px #333);
-}
-
-#loginTitle {
-	font-size: 5vh;
-	color: #000 !important;
-	height: 11vh;
-	line-height: 11vh;
-	padding: 0 0 0 1vw;
-	margin: 0;
-}
-
-#loginMain {
-	width: 100%;
-	height: 83vh;
-	
-	display: table-row;
-	position: absolute;
-	top: 11vh;
-}
-
-#bannerBg {
-	min-width: 100vw;
-	height: 83vh;
-
-	position: fixed;
-	left: 50%;
-	z-index: -1;
-
-	transform:translateX(-50%);
-}
-
-#circle {
-	width: 98vh;
-	height: 98vh;
-	
-	-moz-border-radius: 50%;
-	-webkit-border-radius: 50%;
-	border-radius: 50%;
-
-	background-color: rgba(0,0,0,0.2);
-	position: relative;
-	top: 50%;
-	left: 50%;
-	z-index: 0;
-
-	-webkit-filter: drop-shadow(2px 2px 5px #333);
-	filter: drop-shadow(2px 2px 5px #333);
-
-	transform: translate(-50%, -50%);
-}
-
-#loginContent {
-	width: 80%;
-	margin: auto;
-	padding-top: 16vh;
-  	padding-bottom: 4vh;
-}
-
-.text {
-	text-align: center;
-	color: #FFF;
-}
-
-h2.text {
-	font-size: 8vh;
-	padding-bottom: 2%;
-	border-bottom: 1px solid #FEFEFE;
-}
-
-p.text {
-	font-size: 2.5vh;
-	margin-bottom: 5%;
-}
-
-#loginButton {
-	font-size: 3.5vh;
-	width: 25%;
-	margin: auto;
-	padding: 2%;
-
-	-webkit-border-radius: 6;
-	-moz-border-radius: 6;
-	border-radius: 6px;
-
-	position: relative;
-
-	background-color: #005CE6;
-
-	-webkit-transition: background-color 0.4s ease;  
-	-moz-transition: background-color 0.4s ease; 
-	-ms-transition: background-color 0.4s ease;
-	transition: background-color 0.4s ease; 
-
-	cursor: pointer;
-}
-
-#loginButton:hover {
-	background-color: #0066FF;
-}
-
-#loginButton:active {
-	background-color: #FF4D4D;
-
-	-webkit-transition: background-color 0.1s ease;  
-	-moz-transition: background-color 0.1s ease; 
-	-ms-transition: background-color 0.1s ease;
-	transition: background-color 0.1s ease; 
+	background-color: #222328;
 }
 
 #loginFooter {
 	width: 100%;
 	height: 6vh;
-	box-shadow: 2px 2px 5px 3px #666;
-	background-color: #EBEBEB;
+	background-color: #1C1C1F;
 	position: absolute;
 	bottom: 0;
 }
 
+#loginLogo {
+	height: 50vh;
+}
+
 #github, #version {
 	font-size: 2.3vh;
-	color: #000 !important;
+	color: #FFF !important;
 
 	height: 6vh;
 	margin: 0;
diff --git a/hourglass/client/login/login.html b/hourglass/client/login/login.html
index fc12bcb..38d0b22 100644
--- a/hourglass/client/login/login.html
+++ b/hourglass/client/login/login.html
@@ -1,25 +1,12 @@
 <template name="login">
 	<div class="noScroll">
-		<div id="loginCont">
-			<header id="loginHeader">
-				<img id="logo" src="logo.png">
-				<h1 id="loginTitle">Hourglass</h1>
-			</header>
-			<div id="loginMain">
-				<img id="bannerBg" src="banner100.jpg">
-				<div id="circle">
-					<div id="loginContent">
-						<h2 class="text">Hourglass</h2>
-						<p class="text">All your work in one place. Finish before your time runs out.</p>
-						<h3 class="text" id="loginButton" onclick="document.getElementById('login-buttons-google').click();">Sign in</h3>
-					</div>
-				</div>
-			</div>
-			<footer id="loginFooter">
-				<p id="github">View the <a href="https://github.com/ksjdragon/hourglass">Code!</a></p>
-				<p id="version">Version 0.1.2</p>
-			</footer>
+		<div id="loginBody">
+			<img src="logo.png" id="loginLogo">
 		</div>
+		<footer id="loginFooter">
+			<p id="github">View the <a href="https://github.com/ksjdragon/hourglass">Code!</a></p>
+			<p id="version">Version 0.1.2</p>
+		</footer>
 	</div>
 	{{> loginButtons}}
 </template>