diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index e64dfba..b95e9bd 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -324,10 +324,11 @@ input, textarea { .sideClass { width: 100%; - height: 10%; + height: 5vh; padding: 5%; background-color: rgba(255,255,255,0.1); + cursor: pointer; -webkit-transition: background-color 0.4s ease; -moz-transition: background-color 0.4s ease; @@ -353,10 +354,10 @@ input, textarea { } .fa-dot-circle-o { - font-size: 150%; + font-size: 3vh; color: #53BD42; - margin-top: -10%; - margin-right: 10%; + margin-top: -4vh; + margin-right: 4vh; float: right; @@ -864,6 +865,10 @@ input, textarea { padding: 5%; } +#prefCont .changeInput { + width: 70%; +} + .inputRadioPref { margin-top: 6%; } @@ -960,7 +965,7 @@ input, textarea { } #done { - height: 60%; + height: 37vh; top: 0; overflow-y: auto; } diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index 911dfa1..0c4c47e 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -246,10 +246,10 @@

{{name}}

{{hour}}

+ {{#if selected}} + + {{/if}}
- {{#if selected}} - - {{/if}} diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index a073655..d71a51b 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -160,7 +160,7 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective thisWork[j].reportLength = thisWork[j].reports.length; var hoverHighlight = Session.get("classDispHover"); // Highlight/scale related class works on hover. - if (hoverHighlight !== null && hoverHighlight === found._id) { + if (hoverHighlight !== null && hoverHighlight === found._id && Session.equals("mode","classes")) { thisWork[j].scale = "-ms-transform: scale(1.12)-webkit-transform: scale(1.12);transform: scale(1.12)"; } else { thisWork[j].scale = ""; @@ -210,6 +210,7 @@ Template.main.helpers({ }, defaultMode() { //Loads the default display mode for user. if(load) Session.set("mode",Session.get("user").preferences.mode); + load = false; return; }, bgSrc() { // Returns background. @@ -342,6 +343,7 @@ Template.main.helpers({ var id = works[i].className; var index = id.indexOf("workevent"); id = id.substring(index + 10, index + 27); + console.log(id); if (id === hoverHighlight) { works[i].style.webkitTransform = 'scale(1.12)'; works[i].style.msTransform = 'scale(1.12)'; @@ -625,7 +627,7 @@ Template.main.events({ if (event.target.id !== "workDate") input.value = ele.childNodes[0].nodeValue; input.className = "changeInput"; - input.style.width = "70%"; + input.style.padding = "0.1%"; input.id = ele.id + "a"; ele.parentNode.appendChild(input); diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js index efb4062..21719ca 100644 --- a/hourglass/client/profile/profile.js +++ b/hourglass/client/profile/profile.js @@ -424,7 +424,7 @@ Template.profile.events({ input.value = ele.childNodes[0].nodeValue; input.className = "changeInput"; input.style.height = 0.9 * dim.height.toString() + "px"; - input.style.width = "70%"; + input.style.width = "55%"; input.style.padding = "0.1%"; input.id = ele.id + "a"; input.setAttribute("opc", ele.getAttribute("opc"));