diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index e2963ed..8741dc4 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -1267,7 +1267,6 @@ input, textarea { height: 9vh; margin: -6.5vh 0 0 -5.25vh; - border: 0.5vh solid #0D0D0D; -moz-border-radius: 50%; -webkit-border-radius: 50%; border-radius: 50%; diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index dba55a8..58c9a56 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -266,7 +266,7 @@ Template.main.helpers({ } }, avatar() { // Returns avatar. - return Session.get("user").avatar; + return Meteor.user().services.google.picture; }, username() { // Returns user name. return Session.get("user").name; @@ -1051,7 +1051,7 @@ function formReadable(input, val) { // Makes work information readable by users. }); resort[re].user = user.profile.name; resort[re].date = moment(comments[k].date).fromNow(); - resort[re].avatar = user.profile.avatar; + resort[re].avatar = user.services.google.picture; resort[re].email = user.services.google.email; } return resort; @@ -1064,7 +1064,7 @@ function formReadable(input, val) { // Makes work information readable by users. input.done[i] = { "user": user.profile.name, - "avatar": user.profile.avatar, + "avatar": user.service.google.picture, "email": user.services.google.email }; } @@ -1094,7 +1094,7 @@ function formReadable(input, val) { // Makes work information readable by users. case "avatar": return Meteor.users.findOne({ _id: input.creator - }).profile.avatar; + }).services.google.picture; case "creator": return Meteor.users.findOne({ _id: input.creator