diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index f172b4e..97b6e4c 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -317,6 +317,11 @@ input { vertical-align: middle; } +.slimScrollBar { + border-radius: 1px !important; + z-index: 1 !important; +} + #divLeftBar .fa-university, #divLeftBar .fa-calendar, #divLeftBar .fa-download, #divLeftBar .fa-tasks, #divLeftBar .fa-graduation-cap, #divLeftBar .fa-book { font-size: 2vh; @@ -339,6 +344,7 @@ input { #classListHolder { width: 100%; + max-height: 27.4507vh; overflow-y: auto; } @@ -414,8 +420,6 @@ input { .mainClass { width: 100%; - padding-bottom: 1%; - box-shadow: 2px 2px 5px 1px #666; } @@ -456,7 +460,6 @@ input { } .creWork { - margin-bottom: 5%; cursor: pointer; box-shadow: 0px 5px 5px -2px #666; @@ -475,12 +478,22 @@ input { } .workHolder { - width: 100%; + width: 90% !important; + max-height: 71vh; + padding: 5%; +} + +.workCard:first-child { + margin-top: 0%; +} + +.workCard:last-child { + margin-bottom: 0%; } .workCard { - width: 90%; - margin: 5%; + width: 100%; + margin: 5% 0 5% 0; background-color: rgba(255,255,255,0.3); box-shadow: 1px 1px 5px 1px #666; cursor: pointer; @@ -1335,9 +1348,9 @@ textarea.clickModify { } .scaled { - -webkit-transform: scale(1.12); - -ms-transform: scale(1.12); - transform: scale(1.12); + -webkit-transform: scale(1.07); + -ms-transform: scale(1.07); + transform: scale(1.07); } .gu-mirror { diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index b766413..a6464b9 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -55,17 +55,18 @@ Template.main.rendered = function() { height: '20vh', touchScrollStep: 90 }); - /*$("#classListHolder").slimScroll({ - height: '30vh', - size: '5px', - railVisible: true, - railColor: '#222', - railOpacity: 0.1, - });*/ document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor; }; +Template.classesMode.rendered = function() { + $(".workHolder").slimScroll({ + width: '100%', + height: '', + touchScrollStep: 90 + }); +}; + // Global Helpers Template.registerHelper('adminPage', () => { @@ -227,7 +228,7 @@ Template.main.helpers({ eventClick: function(event, jsEvent, view) { // On-click for work. Session.set("newWork", false); Session.set("currentWork", work.findOne({_id: event.id})); - $(".overlay").fadeIn(250); + $(".overlay").fadeIn(150); }, eventMouseover: function(event, jsEvent, view) { this.style.boxShadow = "inset 0 0 0 99999px rgba(255,255,255,0.2)"; @@ -321,7 +322,7 @@ Template.main.events({ } if (e === "overlay") { // Overlay closing. - $(".overlay").fadeOut(250); + $(".overlay").fadeOut(150); if (!Session.get("newWork")) { document.getElementById("workComment").value = ""; } @@ -348,7 +349,7 @@ Template.main.events({ } Session.set("newWork", true); Session.set("currentWork",{class: attr, dueDate: (new Date((new Date()).valueOf() + 1000*3600*24))}); - $(".overlay").fadeIn(250); + $(".overlay").fadeIn(150); }, 'click .fa-check-circle-o' () { // Confirmation Button sendData(confirm); @@ -391,7 +392,7 @@ Template.main.events({ var inputs = $('#editWork .clickModify').css("cursor", "default"); } } - $(".overlay").fadeIn(250); + $(".overlay").fadeIn(150); }, 'click #requestSubmit' () { var area = document.getElementById("requestArea"); @@ -585,12 +586,12 @@ Template.main.events({ if(checkMissing()) return; sendData("createWork"); Session.set("newWork",false); - $(".overlay").fadeOut(250); + $(".overlay").fadeOut(150); }, 'click #workDelete' () { serverData = Session.get("currentWork")._id; sendData("deleteWork"); - $(".overlay").fadeOut(250); + $(".overlay").fadeOut(150); }, 'click #markDone' () { // Click done button. serverData = [Session.get("currentWork")._id, "done"]; diff --git a/hourglass/client/menus/menus.css b/hourglass/client/menus/menus.css index 7d5332c..755ccc3 100644 --- a/hourglass/client/menus/menus.css +++ b/hourglass/client/menus/menus.css @@ -1,7 +1,3 @@ -#filterWrapper { - width: 100%; -} - .sectionTitle { font-weight: 200; font-size: 2vh; @@ -72,8 +68,10 @@ } #filterWrapper { - display: none; + width: 100%; + height: 64vh; max-height: 64vh; + display: none; } #backgroundOverlay { diff --git a/hourglass/client/menus/menus.js b/hourglass/client/menus/menus.js index 2f2c804..0ffa1b5 100644 --- a/hourglass/client/menus/menus.js +++ b/hourglass/client/menus/menus.js @@ -10,9 +10,9 @@ var sidebarMode = [null, null]; Template.sidebarMenuPlate.rendered = function() { $(".menuWrapper").slideDown(300); - $("#classListHolder").slimScroll({ + $("#classListHolder").slimScroll({ width: '100%', - height: 'auto', + height: '', touchScrollStep: 90 }); }; @@ -62,7 +62,7 @@ Template.sidebarMenuPlate.events({ 'click #filterHead' (event) { if (event.target.id === "disableFilter") return; if (!filterOpen[0]) { - $("#filterWrapper").slideDown(300, function(){recalcHeightScroll();}); + $("#filterWrapper").slideDown(300); } else { $("#filterWrapper").slideUp(300); } @@ -70,15 +70,18 @@ Template.sidebarMenuPlate.events({ }, 'click #typeFilterWrapper' () { if (!filterOpen[1]) { - $("#classFilterHolder").slideDown(300, function(){recalcHeightScroll();}); + $("#classFilterHolder").slideDown(300); + $("#classListHolder").animate({'max-height':'27.4507vh'},300); } else { - recalcHeightScroll(); - $("#classFilterHolder").slideUp(300); + $("#classFilterHolder").slideUp(300) + $("#classListHolder").animate({'max-height':'52vh'},300); } filterOpen[1] = !filterOpen[1]; }, 'click #classFilterWrapper' () { if (!filterOpen[2]) { + var height = (88-100*$("#classFilterWrapper").offset().top / window.innerHeight) + "vh"; + $("#classListHolder").css('max-height',height); $("#classListHolder").slideDown(300); } else { $("#classListHolder").slideUp(300); @@ -644,6 +647,7 @@ toggleToSidebar = function(sidebar) { Session.set("sidebarMode", sidebar); }); } + filterOpen = [false, true, true, true, true]; }; toggleToClassInfo = function(classId) { @@ -661,9 +665,3 @@ toggleToClassInfoMode = function(mode) { $(this).fadeIn(250); }); }; - -function recalcHeightScroll() { - var height = (94-100*$("#classListHolder").offset().top / window.innerHeight) + "vh"; - $("#classListHolder").css("height", height); - $("#classListHolder").parent().css("height", height); -}