diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css index 2a21458..410e8d1 100644 --- a/hourglass/client/login/login.css +++ b/hourglass/client/login/login.css @@ -12,14 +12,14 @@ height: 4px; background-color: #33ADFF; position: absolute; - top: 13vh; + top: 11vh; z-index: 51; } #loginHeader { font-weight: 600; width: 100%; - height: 13vh; + height: 11vh; background-color: #EBEBEB; box-shadow: 2px 2px 5px 3px #666; @@ -31,10 +31,10 @@ } #logo { - height: 10vh; - width: 10vh; + height: 8vh; + width: 8vh; padding: 1.5vh; - line-height: 13vh; + line-height: 11vh; float: left; @@ -45,8 +45,8 @@ #loginTitle { font-size: 5vh; color: #000 !important; - height: 13vh; - line-height: 13vh; + height: 11vh; + line-height: 11vh; padding: 0 0 0 1vw; -webkit-filter: none; @@ -55,15 +55,15 @@ #loginMain { width: 100%; - height: 80vh; + height: 84vh; background-color: #E5E5E5; background-image: url("banner100.jpg"); - background-size: 100vw 80vh; + background-size: 100vw 84vh; display: table-row; position: absolute; - top: 13vh; + top: 11vh; } #circle { @@ -148,25 +148,33 @@ p.text { #loginFooter { width: 100%; - height: 8vh; + height: 6vh; box-shadow: 2px 2px 5px 3px #666; background-color: #EBEBEB; position: absolute; bottom: 0; } -#github { - font-size: 3vh; +#github, #version { + font-size: 2.3vh; color: #000 !important; + + height: 6vh; margin: 0; - height: 8vh; - line-height: 8vh; padding: 0 0 0 1vw; + line-height: 6vh; + display: inline-block; + -webkit-filter: drop-shadow(2px 2px 5px #444); filter: drop-shadow(2px 2px 5px #444); } +#version { + float: right; + margin-right: 1%; +} + a { color: #0099CC; text-decoration: none; diff --git a/hourglass/client/login/login.html b/hourglass/client/login/login.html index 15d4eef..6a42bfa 100644 --- a/hourglass/client/login/login.html +++ b/hourglass/client/login/login.html @@ -16,6 +16,7 @@ {{> loginButtons}} diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index b30e7e2..c80051b 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -471,6 +471,7 @@ input, textarea { .classInfo { padding: 6%; background-color: rgba(255,255,255,0.3); /* remove when class color */ + cursor: pointer; } .mainClassName { diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js index ba990ad..b9bd82e 100644 --- a/hourglass/client/profile/profile.js +++ b/hourglass/client/profile/profile.js @@ -76,15 +76,15 @@ Template.profile.helpers({ return Session.get("user").name; }, motd() { // Returns the current user's description - if (Session.get("user").description !== "") return Session.get("user").description; + if (Session.get("user").description !== undefined) return Session.get("user").description; return "Say something about yourself!"; }, school() { // Returns the current user's school's name - if (Session.get("user").school !== "") return Session.get("user").school; + if (Session.get("user").school !== undefined) return Session.get("user").school; return "Click here to edit..."; }, grade() { // Returns the current user's grade - if (Session.get("user").grade !== "") return Session.get("user").grade + "th"; + if (Session.get("user").grade !== undefined) return Session.get("user").grade + "th"; return "Click here to edit..."; }, classes() { // Loads all of the possible classes ( Limit of twenty shown ) ( Sorts by class size )