From baace551fe872e66ee031d532c3305dc70e56bb5 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Mon, 5 Sep 2016 15:45:21 -0400
Subject: [PATCH] Redid CSS for editWork div

---
 hourglass/client/admin/admin.html     |  2 +-
 hourglass/client/main/main.css        | 79 +++++++++++++++------------
 hourglass/client/main/main.html       | 11 ++--
 hourglass/client/main/main.js         |  2 +-
 hourglass/client/profile/profile.css  |  1 -
 hourglass/client/profile/profile.html |  2 +-
 6 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/hourglass/client/admin/admin.html b/hourglass/client/admin/admin.html
index 7ac3c29..dd5cf95 100644
--- a/hourglass/client/admin/admin.html
+++ b/hourglass/client/admin/admin.html
@@ -1,5 +1,5 @@
 <template name="admin">
-	<div id="{{user}}adminBanner" style="{{banner}}{{textColor}}">
+	<div id="{{userProfile}}adminBanner" style="{{banner}}{{textColor}}">
 		<ul id="adminTabs">
 			<li id="aClasses" style="background-color:{{divColor 'adminButtons'}};margin-left:0">Classes</li>
 			<li id="aUsers" style="background-color:{{divColor 'adminButtons'}}">Users</li>
diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index baac393..4b0f07d 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -435,9 +435,17 @@ input, textarea {
 }
 
 #editWork {
-	position: absolute;
-	top: 50%;
-	left: 50%;
+	width: 40%;
+	margin: auto;
+	margin-top: 5%;
+}
+
+#editWorkCont {
+	width: 100%;
+	height: 100%;
+
+	position: relative;
+	display: table;
 }
 
 #workTypeBar {
@@ -445,8 +453,13 @@ input, textarea {
 	height: 2%;
 }
 
+#workNameDiv {
+	padding: 4% 4% 0 3.5%;
+}
+
 #workName {
 	font-weight: 400;
+	font-size: 200%;
 }
 
 .workTitle, .prefTitle {
@@ -464,6 +477,11 @@ input, textarea {
 	display: none;
 }
 
+#workNamerestrict, #workDescrestrict {
+	margin-top: 1.5%;
+	float: right;
+}
+
 .workOptions, .prefOptions {
 	box-shadow: 2px 2px 5px 3px #666;
 
@@ -498,21 +516,26 @@ input, textarea {
 	box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1);
 }
 
+#workInfoContainer, #workToggle {
+	height: 100%;
+	display: table-cell;
+	vertical-align: top;
+}
+
 #workInfoContainer {
 	width: 70%;
-	padding: 2%;
-	display: inline-block;
+	margin-right: 3%;
+	float: left;
 }
 
 #workToggle {
-	width: 25%;
-	height: 100%;
-	display: inline-block;
+	width: 27%;
 	float: right;
+	vertical-align: top;
 }
 
 #workInfoNmCont {
-	padding: 3%;
+	padding: 3% 0 3% 7%;
 }
 
 #workInfoNmCont div {
@@ -521,7 +544,8 @@ input, textarea {
 
 .datepicker {
 	box-shadow: 2px 2px 5px 3px #666;
-	background-color: rgba(255,255,255,0.7);
+	color: #000;
+	background-color: rgba(250,250,250,0.85);
 	position: absolute;
 }
 
@@ -539,18 +563,18 @@ input, textarea {
 	filter: none;
 }
 
-#workSubmit {
+#workSubmit, #workDelete {
 	font-weight: 200;
 	font-size: 140%;
-	padding: 4%;
+	padding: 2%;
 
 	background-color: rgba(0,0,0,0.25);
 	text-align: center;
 	cursor: pointer;
 
 	position: absolute;
-	left: -91%;
-	bottom: 7%;
+	right: 3%;
+	bottom: 3%;
 
 	-webkit-transition: background-color 0.4s ease;  
 	-moz-transition: background-color 0.4s ease; 
@@ -558,7 +582,7 @@ input, textarea {
 	transition: background-color 0.4s ease;
 }
 
-#workSubmit:hover {
+#workSubmit:hover, #workDelete:hover {
 	background-color: rgba(0,0,0,0.15);
 }
 
@@ -818,6 +842,7 @@ input, textarea {
 }
 
 #workComment {
+	width: 99%;
 	margin-bottom: 3%;
 }
 
@@ -868,7 +893,9 @@ input, textarea {
 }
 
 .doneUser {
-	padding: 12%;
+	font-size: 110%;
+	margin: 0;
+	padding: 6% 6% 6% 10%;
 	background-color: rgba(0,0,0,0.1);
 	overflow-y: auto;
 
@@ -928,23 +955,3 @@ input, textarea {
 	box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15);
 }
 
-#workDelete {
-	margin-bottom: 0;
-	padding: 4%;
-	background-color: rgba(0,0,0,0.1);
-
-	position: absolute;
-	bottom: 8%;
-	right: 5%;
-	cursor: pointer;
-
-	-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;
-}
-
-#workDelete:hover {
-	background-color: rgba(0,0,0,0.15);
-}
-
diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index c1d0b95..32fe7f3 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -4,7 +4,7 @@
 </head>
 
 <template name="main">
-    <header style="background-color:{{user}}{{divColor 'header'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
+    <header style="background-color:{{userProfile}}{{divColor 'header'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
         <div id="aboveBar">
             <i class="fa fa-bars" aria-hidden="true" style="color:{{iconColor 'menu'}}"></i>
             <h1>Hourglass</h1><h2>{{schoolName}}</h2>
@@ -115,10 +115,9 @@
 
     <div class="overlay">
         <div id="editWork">
-            <div id="editWorkCont" style="{{workCenter}};background-color:{{divColor 'header'}}">
-                <div id="workTypeBar" style="background-color:{{workType}}"></div>
+            <div id="editWorkCont" style="background-color:{{divColor 'header'}};border-top:10px solid {{workType}}">
                 <div id="workInfoContainer">
-                    <div>
+                    <div id="workNameDiv">
                         <span id="workNamerestrict">{{commentLength}}</span>
                         <span class="change req" id="workName" restrict="50">{{work 'name'}}</span>
                     </div>
@@ -263,7 +262,5 @@
 </template>
 
 <template name="doneUsers">
-    <div class="doneUser">
-        <p>{{user}}</p>
-    </div>
+    <p class="doneUser">{{user}}</p>
 </template>
\ No newline at end of file
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 11f7112..f7045af 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -50,7 +50,7 @@ Session.set("classDispHover", null); // Stores current hovered filter.
 Session.set("refetchEvents", null); // Stores whether to get calendar events again.
 Session.set("commentRestrict", ""); // Stores text for comment character restriction.
 
-Template.registerHelper('user', () => {
+Template.registerHelper('userProfile', () => {
     if(Meteor.user() === undefined || Meteor.user() === null) return;
     Session.set("user", Meteor.user().profile);
     return;
diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css
index 71f81b9..8122b60 100644
--- a/hourglass/client/profile/profile.css
+++ b/hourglass/client/profile/profile.css
@@ -161,7 +161,6 @@
 #cardColRight {
 	width: 60%;
 	float: right;
-	text-align: right;
 }
 
 .card {
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index 3afd32b..075b52e 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -1,5 +1,5 @@
 <template name="profile">
-	<div id="mainpage{{user}}" onclick="window.location='/'"><h2>Main Page</h2></div>
+	<div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div>
 	<div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div>
 	<div id="profPage" style="background-color:{{divColor 'header'}};{{textColor}}{{loadNew}}">
 		<div id="profMainContainer">