sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop

Browse source
This commit is contained in:
Blade Barringer 2014-12-29 18:33:14 -06:00
commit 0ddbbc93a3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
views/options/inventory/inventory.jade
View file

@ -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')

2
views/shared/modals/members.jade
View file

@ -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')