diff --git a/.nodemonignore b/.nodemonignore index 17de44ee85..19c17340c6 100644 --- a/.nodemonignore +++ b/.nodemonignore @@ -1,4 +1,5 @@ public/* views/* +build build/* Gruntfile.js \ No newline at end of file diff --git a/public/css/game-pane.styl b/public/css/game-pane.styl index 0d501563fa..0a60fa1f9d 100644 --- a/public/css/game-pane.styl +++ b/public/css/game-pane.styl @@ -41,13 +41,7 @@ height 500px .buttonList li - margin: 5px; + margin: 5px .option-group .option-time - padding: 0px 5px - -.chat-btn - margin-right: 5px; - -.personal-options .btn - margin-right: 5px; \ No newline at end of file + padding: 0px 5px \ No newline at end of file diff --git a/public/css/index.styl b/public/css/index.styl index fbb9913e4a..db87cfb184 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -165,4 +165,7 @@ a cursor: pointer #modalMember p - word-wrap: break-word; \ No newline at end of file + word-wrap: break-word; + +.btn + margin-right: 5px; \ No newline at end of file diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index ba89b388d7..1503279908 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -142,7 +142,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A } $scope.reject = function(guild){ - var i = _.findIndex(User.user.invitations.guilds, {id:guild._id}); + var i = _.findIndex(User.user.invitations.guilds, {id:guild.id}); if (~i){ User.user.invitations.guilds.splice(i, 1); User.set('invitations.guilds', User.user.invitations.guilds); diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 0d230e254d..a59a6c4ce2 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -272,7 +272,7 @@ api.invite = function(req, res, next) { } function sendInvite (){ - if(group.type = 'guild'){ + if(group.type === 'guild'){ if(!invite.invitations.guilds) invite.invitations.guilds = [] //necessary invite.invitations.guilds.push({id: group._id, name: group.name}); }else{