Merge pull request #8268 from Tallestthomas/develop

Show link leading to the Food Preferences Wiki page.
This commit is contained in:
Keith Holliday 2016-12-10 14:41:17 -06:00 committed by GitHub
commit 6f112c29f2
3 changed files with 5 additions and 1 deletions

View file

@ -67,6 +67,7 @@ menu.pets div
z-index: 1
padding-bottom: 0
.inventory-list
p
//display: none

View file

@ -92,5 +92,7 @@
"petsReleased": "Pets released.",
"mountsAndPetsReleased": "Mounts and pets released",
"mountsReleased": "Mounts released",
"gemsEach": "gems each"
"gemsEach": "gems each",
"foodWikiText": "What does my pet like to eat?",
"foodWikiUrl": "http://habitica.wikia.com/wiki/Food_Preferences"
}

View file

@ -62,6 +62,7 @@ mixin petList(eggSource, potionSource)
menu.inventory-list(type='list', ng-if='foodCount > 0')
li.customize-menu
menu.pets-menu(label=env.t('food'))
a(href=env.t('foodWikiUrl'), target='_blank')=env.t('foodWikiText')
div(ng-repeat='(food,points) in ownedItems(user.items.food)')
button.customize-option(popover-append-to-body='true', popover='{{:: Content.food[food].notes()}}', popover-title='{{:: Content.food[food].text()}}', popover-trigger='mouseenter', popover-placement='top', ng-click='chooseFood(food)', ng-class='{selectableInventory: selectedFood == Content.food[food]}', class='Pet_Food_{{::food}}')
.badge.badge-info.stack-count {{points}}