From 4e5e7bb14aeea5cab95b563d3162aa231163f3f3 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Tue, 18 Oct 2016 14:14:59 -0400
Subject: [PATCH] Naming changes, css fixes, small bugs

---
 hourglass/client/main/main.css        |  7 +++--
 hourglass/client/main/main.html       | 10 +++----
 hourglass/client/main/main.js         |  1 +
 hourglass/client/profile/profile.css  | 24 +++-------------
 hourglass/client/profile/profile.html |  2 +-
 hourglass/client/profile/profile.js   |  1 +
 hourglass/lib/constants.js            | 40 +++++++++++++++------------
 7 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 130fec7..440795f 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -589,7 +589,7 @@ input.clickModify, textarea.clickModify {
 
 input.clickModify:hover, textarea.clickModify:hover {
 	background-color: rgba(0,0,0,0.1);
-	border-color: rgba(0,0,0,0.1);;
+	
 }
 
 textarea.clickModify {
@@ -608,12 +608,15 @@ textarea.clickModify {
 #editWorkCont {
 	width: 100%;
 	height: 100%;
-	min-height: 68vh;
 
 	position: relative;
 	display: table;
 }
 
+#workInfoContainer {
+	min-height: 68vh;
+}
+
 #workTypeBar {
 	background-color: rgba(0,0,0,0.1);
 	height: 2%;
diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index 61ed342..46c8371 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -151,8 +151,8 @@
                         {{else}}
                             {{> workDisplay}}
                         {{/if}}
-                        <div id="workInfo2">
-                            {{#unless newWork}}
+                        {{#unless newWork}}
+                            <div id="workInfo2">
                                 <div id="workComments">
                                     <h3>Comments</h3>
                                     <div>
@@ -167,9 +167,9 @@
                                             {{> comment}}
                                         {{/each}}
                                     </div>
-                                </div>
-                            {{/unless}}
-                        </div>
+                                </div> 
+                            </div>
+                        {{/unless}}
                     </div>
                     {{#unless newWork}}
                         <div id="workToggle">
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 62816c1..8cdf746 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -706,6 +706,7 @@ Template.main.events({
         }
     },
     'keydown .dropdown' (event) {
+        event.preventDefault();
         var first = $("#"+modifyingInput).next().children("p:first-child");
         var last = $("#"+modifyingInput).next().children("p:last-child"); 
         var next = $(".selectedOption").next();
diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css
index 1f570cf..d339fc8 100644
--- a/hourglass/client/profile/profile.css
+++ b/hourglass/client/profile/profile.css
@@ -80,30 +80,14 @@
 	width: 50% !important;
 }
 
+#description:hover {
+	background-color: rgba(255,255,255,0.1);
+}
+
 .username {
 	margin-left: 20% !important;
 }
 
-#motdrestrict {
-	margin-right: 1% !important;
-	float: right;
-}
-
-.profOptions {
-	box-shadow: 2px 2px 5px 3px #666;
-
-	position: absolute;
-	display: none;
-	z-index: 5;
-
-	opacity: 0;
-
-	-webkit-transition: opacity 0.4s ease;  
-	-moz-transition: opacity 0.4s ease; 
-	-ms-transition: opacity 0.4s ease;
-	transition: opacity 0.4s ease; 
-}
-
 #profCards {
 	width: 100%;
 	height: 100%;
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index d95160d..57fc5c2 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -37,7 +37,7 @@
 					                </div>
 									<br>
 									<div class="prefWrapper">
-										<p class="profTitle">Grade:</p>
+										<p class="profTitle">Graduation Year:</p>
 										<div id="grade" class="clickModify dropdown" tabindex="2">
 						                    <span>{{grade}}</span>
 						                    <i class="fa fa-caret-down" aria-hidden="true"></i>
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index 8631f23..34d8ba2 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -470,6 +470,7 @@ Template.profile.events({
         }
     },
     'keydown .dropdown' (event) {
+        event.preventDefault();
         var first = $("#"+modifyingInput).next().children("p:first-child");
         var last = $("#"+modifyingInput).next().children("p:last-child"); 
         var next = $(".selectedOption").next();
diff --git a/hourglass/lib/constants.js b/hourglass/lib/constants.js
index 58c694d..98f757d 100644
--- a/hourglass/lib/constants.js
+++ b/hourglass/lib/constants.js
@@ -1,5 +1,5 @@
 themeColors =  {
-    "light": {
+    "lux": {
         "background": "White.jpg",
         "mainColor": "#D9D9D9",
         "secondaryColor": "#E8E8E8",
@@ -10,7 +10,7 @@ themeColors =  {
         "classCardColor":"#EBEBEB",
         "textColor": "#000"
     },
-    /*"dark": {
+    "nox": {
         "background": "Black.jpg",
         "mainColor": "#373A56",
         "secondaryColor": "#151A2B",
@@ -20,19 +20,19 @@ themeColors =  {
         "modeHighlight": "#FF1A1A",
         "classCardColor":"#46396E",
         "textColor": "#F6F6F6" 
-    },*/
-    /*"dark": {
+    },
+    "requox": {
        "background": "RedBlack.jpg",
         "mainColor": "#302c36",
-        "secondaryColor": "#151313",
-        "sidebarColor": "#327c5a",
-        "userDropdownColor": "#cc3333", 
-        "iconHighlight": "#327c5a",
-        "modeHighlight": "#c9fe62",
+        "secondaryColor": "#C51313",
+        "sidebarColor": "#327C5A",
+        "userDropdownColor": "#CC3333", 
+        "iconHighlight": "#327C5A",
+        "modeHighlight": "#C9fE62",
         "classCardColor":"#302c36",
-        "textColor": "#fcf0f0"  
-    },*/
-    /*"dark": {
+        "textColor": "#FCF0F0"  
+    },
+    "aequor": {
        "background": "Sea.jpg",
         "mainColor": "#1e926c",
         "secondaryColor": "#1c564f",
@@ -42,8 +42,8 @@ themeColors =  {
         "modeHighlight": "#c9fe62",
         "classCardColor":"#2567a1",
         "textColor": "#fcf0f0"  
-    },*/
-    /*"dark": {
+    },
+    "fresva": {
        "background": "Earth.jpg",
         "mainColor": "#dea743",
         "secondaryColor": "#496234",
@@ -53,8 +53,8 @@ themeColors =  {
         "modeHighlight": "#b9f643",
         "classCardColor":"#c18311",
         "textColor": "#fcf0f0"  
-    },*/
-    "dark": {
+    },
+    "atlaneon": { 
        "background": "NeonBlue.jpg",
         "mainColor": "#1d1c23",
         "secondaryColor": "#1f212f",
@@ -69,8 +69,12 @@ themeColors =  {
 
 options = {
     "theme": [
-        {"val": "light", "alias": "Light"},
-        {"val": "dark", "alias": "Dark"}
+        {"val": "lux", "alias": "Lux"},
+        {"val": "nox", "alias": "Nox"},
+        {"val": "requox", "alias": "Recoum"},
+        {"val": "aequor", "alias": "Aequor"},
+        {"val": "fresva", "alias": "Fresva"},
+        {"val": "atlaneon", "alias": "Atlaneon"}
     ],
     "mode": [
         {"val": "classes", "alias": "Classes"},