From f7d742422d59bc2699a5325b998c3d6242a25ba7 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Thu, 13 Apr 2017 01:49:29 -0400 Subject: [PATCH] Added drag scrolling for classes, changed theme --- hourglass/client/main/main.js | 22 +++++++++++++++++++++- hourglass/lib/constants.js | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 7715e4a..2bcdabc 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -40,6 +40,11 @@ Template.login.rendered = function() { Template.main.created = function() { Session.set("mode", Session.get("user").preferences.mode); Session.set("classInfo", null); + $(document).on('keyup', (e) => { + if(event.keyCode === 27 && $(".overlay").css("display") !== "none") { + $(".overlay").fadeOut(150); + } + }); /*if (Notification.permission !== "granted") { Notification.requestPermission().then(function(result) { @@ -66,8 +71,23 @@ Template.classesMode.rendered = function() { touchScrollStep: 90 }); $(".mainClass .slimScrollBar").css("display", "none"); + + // Classes mode drag scrolling + var dX = 0; + var currX = 0; + var sidebar = $("#classesMode"); + new Hammer(sidebar[0], { + domEvents: true + }); - + sidebar.on('panmove', function(e) { + dX = currX + (e.originalEvent.gesture.deltaX); + sidebar.scrollLeft(dX); + }); + + sidebar.on('panend', function(e) { + currX = dX; + }); }; // Global Helpers diff --git a/hourglass/lib/constants.js b/hourglass/lib/constants.js index b9e1223..26d502e 100644 --- a/hourglass/lib/constants.js +++ b/hourglass/lib/constants.js @@ -62,7 +62,7 @@ themeColors = { "userDropdownColor": "#2E312B", "iconHighlight": "#70E6E6", "modeHighlight": "#70E6E6", - "classCardColor":"#3C6567", + "classCardColor":"#32363C", "textColor": "#FCF0F0" } };