From 85f9b4798e915d647d19d8631c5df0d74332c8f8 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Tue, 18 Oct 2016 16:27:42 -0400 Subject: [PATCH] minor fixes --- hourglass/client/main/main.js | 3 +- hourglass/client/profile/profile.js | 2 ++ hourglass/lib/constants.js | 52 ++++++++++++++--------------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 8cdf746..e3a3a3f 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -706,7 +706,6 @@ 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(); @@ -714,6 +713,7 @@ Template.main.events({ var lastSel = $(".selectedOption"); if (event.keyCode === 38) { + event.preventDefault(); if (lastSel === undefined) { last.addClass("selectedOption"); } else { @@ -726,6 +726,7 @@ Template.main.events({ } } } else if (event.keyCode === 40) { + event.preventDefault(); if (lastSel === undefined) { first.addClass("selectedOption"); last.removeClass("selectedOption"); diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js index 34d8ba2..7ca6de3 100644 --- a/hourglass/client/profile/profile.js +++ b/hourglass/client/profile/profile.js @@ -478,6 +478,7 @@ Template.profile.events({ var lastSel = $(".selectedOption"); if (event.keyCode === 38) { + event.preventDefault(); if (lastSel === undefined) { last.addClass("selectedOption"); } else { @@ -490,6 +491,7 @@ Template.profile.events({ } } } else if (event.keyCode === 40) { + event.preventDefault(); if (lastSel === undefined) { first.addClass("selectedOption"); last.removeClass("selectedOption"); diff --git a/hourglass/lib/constants.js b/hourglass/lib/constants.js index 98f757d..71d285a 100644 --- a/hourglass/lib/constants.js +++ b/hourglass/lib/constants.js @@ -21,10 +21,10 @@ themeColors = { "classCardColor":"#46396E", "textColor": "#F6F6F6" }, - "requox": { + "requom": { "background": "RedBlack.jpg", - "mainColor": "#302c36", - "secondaryColor": "#C51313", + "mainColor": "#302C36", + "secondaryColor": "#B93A3A", "sidebarColor": "#327C5A", "userDropdownColor": "#CC3333", "iconHighlight": "#327C5A", @@ -34,36 +34,36 @@ themeColors = { }, "aequor": { "background": "Sea.jpg", - "mainColor": "#1e926c", - "secondaryColor": "#1c564f", - "sidebarColor": "#3cb08a", - "userDropdownColor": "#2ea96a", - "iconHighlight": "#61d9a3", - "modeHighlight": "#c9fe62", - "classCardColor":"#2567a1", - "textColor": "#fcf0f0" + "mainColor": "#1E926C", + "secondaryColor": "#1C564F", + "sidebarColor": "#3CB08A", + "userDropdownColor": "#2EA96A", + "iconHighlight": "#61D9A3", + "modeHighlight": "#C9FE62", + "classCardColor":"#2567A1", + "textColor": "#FCF0F0" }, "fresva": { "background": "Earth.jpg", - "mainColor": "#dea743", + "mainColor": "#DEA743", "secondaryColor": "#496234", - "sidebarColor": "#6d9957", - "userDropdownColor": "#89bb52", - "iconHighlight": "#91ee61", - "modeHighlight": "#b9f643", - "classCardColor":"#c18311", - "textColor": "#fcf0f0" + "sidebarColor": "#6D9957", + "userDropdownColor": "#89BB52", + "iconHighlight": "#91EE61", + "modeHighlight": "#B9f643", + "classCardColor":"#C18311", + "textColor": "#FCF0F0" }, "atlaneon": { "background": "NeonBlue.jpg", - "mainColor": "#1d1c23", - "secondaryColor": "#1f212f", - "sidebarColor": "#312e32", + "mainColor": "#1D1C23", + "secondaryColor": "#1F212f", + "sidebarColor": "#312E32", "userDropdownColor": "#2e312b", - "iconHighlight": "#70e6e6", - "modeHighlight": "#70e6e6", - "classCardColor":"#1faab1", - "textColor": "#fcf0f0" + "iconHighlight": "#70E6E6", + "modeHighlight": "#70E6E6", + "classCardColor":"#1FAAB1", + "textColor": "#FCF0F0" } }; @@ -71,7 +71,7 @@ options = { "theme": [ {"val": "lux", "alias": "Lux"}, {"val": "nox", "alias": "Nox"}, - {"val": "requox", "alias": "Recoum"}, + {"val": "requom", "alias": "Recoum"}, {"val": "aequor", "alias": "Aequor"}, {"val": "fresva", "alias": "Fresva"}, {"val": "atlaneon", "alias": "Atlaneon"}