diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css index 5d25170..4e12108 100644 --- a/hourglass/client/login/login.css +++ b/hourglass/client/login/login.css @@ -78,6 +78,7 @@ h2.text { p.text { font-size: 150%; + margin-bottom: 5%; } #loginButton { diff --git a/hourglass/client/login/login.html b/hourglass/client/login/login.html index 0369fde..3591c9c 100644 --- a/hourglass/client/login/login.html +++ b/hourglass/client/login/login.html @@ -6,7 +6,7 @@
-
+

Hourglass

diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css index b063a7b..3ce1268 100644 --- a/hourglass/client/profile/profile.css +++ b/hourglass/client/profile/profile.css @@ -4,6 +4,10 @@ cursor: pointer; } +.radio { + cursor: pointer; +} + .changeInput { font-size: 100%; padding: 0; @@ -93,10 +97,11 @@ transition: opacity 0.4s ease; } -.profOptions p { +.profOptionText { font-size: 150%; + min-width: 10%; + padding: 20px; margin: 0; - padding: 20%; text-align: center; cursor: pointer; @@ -376,6 +381,7 @@ #save h2 { font-weight: 200; + width: 100%; padding: 8%; -webkit-filter: none; diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html index 02fc6e2..42a674c 100644 --- a/hourglass/client/profile/profile.html +++ b/hourglass/client/profile/profile.html @@ -22,10 +22,10 @@ {{grade}}
-

9th

-

10th

-

11th

-

12th

+

9th

+

10th

+

11th

+

12th

@@ -56,9 +56,9 @@ Members
- {{#each myclasses}} +
{{/if}} @@ -110,17 +110,17 @@

Privacy:

-

Public

-

Private

+

Public

+

Private

Category:

-

Class

-

Club

-

Other

+

Class

+

Club

+

Other

Submit Request

diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js index 79d522d..065d82c 100644 --- a/hourglass/client/profile/profile.js +++ b/hourglass/client/profile/profile.js @@ -111,7 +111,7 @@ Template.profile.helpers({ }, grade() { if(Meteor.user().profile.grade !== undefined) { - return Meteor.user().profile.grade; + return Meteor.user().profile.grade+"th"; } else { return "Click here to edit..."; } @@ -145,13 +145,13 @@ Template.profile.helpers({ autocompleteClasses() { return Session.get("autocompleteDivs"); }, - myclasses() { + /*myclasses() { if (Meteor.user().profile.classes === undefined || Meteor.user().profile.classes.length === 0) { return []; } else { return Meteor.user().profile.classes; } - }, + },*/ notfound() { return Session.get("notfound"); }, @@ -403,7 +403,11 @@ Template.profile.events({ }) function openDivFade(div) { - div.style.display = "block"; + if(div.className === "profOptions") { + div.style.display = "inline-block"; + } else { + div.style.display = "block"; + } div.style.opacity = "0"; setTimeout(function() { div.style.opacity = "1";