From f8cdcd2e75c7baab4760adae2f0920cbd78a0bb7 Mon Sep 17 00:00:00 2001 From: Melissa Mcewen Date: Sun, 28 Dec 2014 23:35:47 -0600 Subject: [PATCH 1/3] Inconsistent alignment of Gem prices in Seasonal Shop #4434 --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index e3fc8a077c..df93bb1001 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -41,7 +41,7 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html div(ng-repeat='quest in ::getSeasonalShopQuests()') button.customize-option(popover="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : quest.notes() | htmlDecode}}", popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', class='inventory_quest_scroll', ng-class='::{locked: quest.previous && !user.achievements.quests[quest.previous]}') p - | {{::quest.value}} + | {{::quest.value}}  span.Pet_Currency_Gem1x.inline-gems script(type='text/ng-template', id='partials/options.inventory.timetravelers.html') From c4e62fc79ba16d55344f391a9b6b8f049d0afadd Mon Sep 17 00:00:00 2001 From: Melissa Mcewen Date: Sun, 28 Dec 2014 23:51:37 -0600 Subject: [PATCH 2/3] Private Message (PM / DM) textbox is too small #4425 --- views/shared/modals/members.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index 0255ab8e6d..7132477b4b 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -46,7 +46,7 @@ script(type='text/ng-template', id='modals/private-message.html') .modal-header h4=env.t('pmHeading', {name: "{{profile.profile.name}}"}) .modal-body - textarea.form-control(type='text',ng-model='_message') + textarea.form-control(type='text',rows='5', ng-model='_message') .modal-footer button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel') From 8bdc0d55b9cdce680b9f352e3a234db42f0bf873 Mon Sep 17 00:00:00 2001 From: Melissa Mcewen Date: Sun, 28 Dec 2014 23:53:15 -0600 Subject: [PATCH 3/3] Private Message (PM / DM) textbox is too small #4425 --- views/shared/modals/members.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index 7132477b4b..1499c9753e 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -46,7 +46,7 @@ script(type='text/ng-template', id='modals/private-message.html') .modal-header h4=env.t('pmHeading', {name: "{{profile.profile.name}}"}) .modal-body - textarea.form-control(type='text',rows='5', ng-model='_message') + textarea.form-control(type='text',rows='5',ng-model='_message') .modal-footer button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel')