diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index eb647bf..57799e5 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -432,7 +432,7 @@ input { } .classWrapper { - width: 15vw; + width: 35vh; height: 95%; margin: 10px; margin-top: 20px; @@ -450,13 +450,13 @@ input { } .classInfo { - padding: 1vw; + padding: 3vh; background-color: rgba(255,255,255,0.3); /* remove when class color */ cursor: pointer; } .mainClassName { - font-size: 1.5vw; + font-size: 3.7vh; white-space: normal; -webkit-filter: none !important; @@ -465,18 +465,18 @@ input { } .mainClassHour { - font-size: .8vw; + font-size: 1.7vh; margin-top: 0; pointer-events: none; } .mainClassTeacher { - font-size: .8vw; + font-size: 1.7vh; pointer-events: none; } .creWork { - font-size: .8vw; + font-size: 1.7vh; cursor: pointer; box-shadow: 0px 5px 5px -2px #666; @@ -548,12 +548,12 @@ input { } .cWorkCont { - font-size: .8vw; + font-size: 1.7vh; padding: 5%; } .cWorkType { - height: .3vw; + height: .8vh; } .cWorkName { diff --git a/hourglass/client/mobile/mobile.js b/hourglass/client/mobile/mobile.js index 1b75669..d83d5cc 100644 --- a/hourglass/client/mobile/mobile.js +++ b/hourglass/client/mobile/mobile.js @@ -7,6 +7,7 @@ Session.set("select", "none"); Session.set("options", null); var filterOpen = [false, true, true]; +var timeout; Template.registerHelper('optionInfo', (type) => { var op = Session.get("options") @@ -116,7 +117,7 @@ Template.mobile.rendered = function() { Template.mobile.events({ 'click #mOverlay' () { - toggleSidebar(false); + if(timeout) toggleSidebar(false); } }); @@ -604,6 +605,10 @@ addMobileButton = function(element, lighten, animateType, completeFunction) { ele.on('touchend', function(e) { if(!care) return; ele.velocity("stop"); + timeout = false; + setTimeout(function() { + timeout = true; + }, 100); switch(type) { case "color": ele.velocity(