diff --git a/common/img/sprites/spritesmith/npcs/npc_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png index 385d1548f6..d5940b986b 100644 Binary files a/common/img/sprites/spritesmith/npcs/npc_bailey.png and b/common/img/sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js index 2cf594965d..6bdd4c0b83 100644 --- a/website/public/js/controllers/authCtrl.js +++ b/website/public/js/controllers/authCtrl.js @@ -84,14 +84,12 @@ angular.module('habitrpg') $scope._expandedMenu = ($scope._expandedMenu == menu) ? null : menu; }; - function selectNotificationValue(mysteryValue, invitationValue, holidayCardValue, unallocatedValue, messageValue, noneValue) { + function selectNotificationValue(mysteryValue, invitationValue, unallocatedValue, messageValue, noneValue) { var user = $scope.user; if (user.purchased && user.purchased.plan && user.purchased.plan.mysteryItems && user.purchased.plan.mysteryItems.length) { return mysteryValue; } else if ((user.invitations.party && user.invitations.party.id) || (user.invitations.guilds && user.invitations.guilds.length > 0)) { return invitationValue; - } else if ((user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0])) { - return holidayCardValue; } else if (user.flags.classSelected && !(user.preferences && user.preferences.disableClasses) && user.stats.points) { return unallocatedValue; } else if (!(_.isEmpty(user.newMessages))) { @@ -105,14 +103,13 @@ angular.module('habitrpg') return selectNotificationValue( "glyphicon-gift", "glyphicon-user", - "glyphicon-envelope", "glyphicon-plus-sign", "glyphicon-comment", "glyphicon-comment inactive"); }; $scope.hasNoNotifications = function() { - return selectNotificationValue(false, false, false, false, false, true); + return selectNotificationValue(false, false, false, false, true); } // ------ Social ---------- diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade index a90ebe977e..6ddb58fa21 100644 --- a/website/views/options/inventory/inventory.jade +++ b/website/views/options/inventory/inventory.jade @@ -244,7 +244,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') p | 20  span.shop_gold - div + // div button.customize-option(popover='{{::Content.spells.special.valentine.notes()}}', popover-title='{{::Content.spells.special.valentine.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.valentine)', class='inventory_special_valentine') p | {{Content.spells.special.valentine.value}} diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index adb5e7231f..cd7a08b00f 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -202,7 +202,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') span {{v.name}} a(ng-click='Groups.seenMessage(k)', popover=env.t('clear'),popover-placement='right',popover-trigger='mouseenter',popover-append-to-body='true') span.glyphicon.glyphicon-remove-circle - li(ng-if='user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0]') + // li(ng-if='user.items.special.valentineReceived[0] || user.items.special.nyeReceived[0]') a(ng-click='$state.go("options.inventory.drops"); expandMenu(null)') span.glyphicon.glyphicon-envelope span=env.t('holidayCard')