Merge branch 'master' of https://github.com/ksjdragon/hourglass

hourglass/client/login/login.html

@@ -13,7 +13,6 @@
 				<p class="text">All your work in one place. Finish before your time runs out.</p>
 				<h3 class="text" id="loginButton" style="{{hea}}">Sign in</h3>
 			</div>
-			
 		</div>
 	</div>
 	<footer id="loginFooter">

hourglass/client/main/main.css

@@ -367,4 +367,11 @@ select {
 	-moz-transition: background-color 0.2s ease; 
 	-ms-transition: background-color 0.2s ease;
 	transition: background-color 0.2s ease; 
+}
+
+#mainBody {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	z-index: -1;
 }

hourglass/client/main/main.html

@@ -85,6 +85,8 @@
   </div>
   <div id="optionsContainer" style="margin-right:{{optionsStatus}};background-color:{{divColor 'sidebar'}}">
   </div>
+  <div id="mainBody">
+  </div>
   <div class="overlay">
     <div class="overlayCont" style="{{overlayDim}};">
       <p>Are you sure?</p>

hourglass/client/main/main.js

@@ -36,10 +36,11 @@ Session.set("inputOpen",null);
 
 Cookie.set("theme","light",{'years':15});
 
+Template.registerHelper( 'divColor', (div) => {
+	return themeColors[Cookie.get("theme")][div];	
+})
+
 Template.main.helpers({
-	divColor(div) {
-		return themeColors[Cookie.get("theme")][div];	
-	},
 	iconColor(icon) {
 		let status = Session.get(icon+"Open");
 		if(status) {
@@ -190,11 +191,25 @@ Template.main.events({
 		Session.set("inputOpen", event.target.getAttribute("op"));
 		openDivFade(event.target.parentNode.childNodes[4]);
 	},
+	'focus .creInputSel' (event) {
+		Session.set("inputOpen", event.target.getAttribute("op"));
+		openDivFade(event.target.parentNode.childNodes[4]);
+	},
 	'click .creOptions p' (event) {
 		var p = event.target;
 		p.parentNode.parentNode.childNodes[1].value = p.childNodes[0].nodeValue;
 		closeDivFade(p.parentNode);
+		p.parentNode.parentNode.childNodes[1].focus();
 		Session.set("inputOpen",null)
+	},
+	'click' (event) {
+		console.log(event.target.className);
+		var e = event.target.className;
+		if(!(e.includes("creInput") || e.includes("select"))) {
+			try {
+				closeDivFade(document.getElementsByClassName("creInputSel")[Session.get("inputOpen")].parentNode.childNodes[4]);
+			} catch(err) {}
+		}
 	}
 });