From 4d3a359d6b00a0e2aa569eb9da5dbf78dde8e0dd Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 8 Dec 2013 09:38:24 -0700 Subject: [PATCH] fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify button, remove reroll from store) --- public/js/controllers/tasksCtrl.js | 2 +- views/options/inventory/inventory.jade | 8 ++++---- views/shared/tasks/task.jade | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/js/controllers/tasksCtrl.js b/public/js/controllers/tasksCtrl.js index 975907d499..ec3ad92e90 100644 --- a/public/js/controllers/tasksCtrl.js +++ b/public/js/controllers/tasksCtrl.js @@ -110,7 +110,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', ' /* Figure out whether we wanna put this in habitrpg-shared */ - sorted = [updated.weapon, updated.armor, updated.head, updated.shield, updated.potion, updated.reroll]; + sorted = [updated.weapon, updated.armor, updated.head, updated.shield, updated.potion]; $scope.itemStore = sorted; } diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 721b9e9a47..22bcbbb78b 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -80,7 +80,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') li.customize-menu menu.pets-menu(label='Services') div - button.btn(popover='Return all tasks to neutral value (yellow color).', popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true') Fortify - div - | 4 - span.Pet_Currency_Gem1x.inline-gems \ No newline at end of file + // Once grunt-spritesmith is merged, let's use https://github.com/browserquest/BrowserQuest/blob/master/client/img/1/item-firepotion.png + button.btn(popover='Return all tasks to neutral value (yellow color).', popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true') + | Fortify 4 + span.Pet_Currency_Gem1x.inline-gems \ No newline at end of file diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 6d81fdf2a0..a1a6600f92 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -157,10 +157,10 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!"}', ng-click='task.challenge.id || (task.priority="!!")') Medium button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!!"}', ng-click='task.challenge.id || (task.priority="!!!")') Hard //span(ng-if='task.type=="daily" && !task.challenge.id') - p - span(ng-if='task.type=="daily"') - legend.option-title Restore Streak - input.option-content(type='number', ng-model='task.streak') + br + span(ng-if='task.type=="daily"') + legend.option-title Restore Streak + input.option-content(type='number', ng-model='task.streak') button.task-action-btn.tile.spacious(type='submit') Save & Close div(class='{{obj._id}}{{task.id}}-chart', ng-show='charts[obj._id+task.id]')