sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-24 22:55:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3507 from yafinee/no_bubble_if_mount

Browse source 
#3054 - When feeding/saddling, ineligible pets should not get the green ...
This commit is contained in:
deilann 2014-05-21 13:40:10 -07:00
commit c879f46c07
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ mixin petList(source)
li.customize-menu(ng-repeat='egg in #{source}')
menu
div(ng-repeat='potion in Content.hatchingPotions', popover-trigger='mouseenter', popover=env.t('petName', {potion: '{{potion.text()}}', egg: '{{egg.text()}}'}), popover-placement='bottom', ng-init='pet = egg.key+"-"+potion.key')
button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood}', ng-click='choosePet(egg.key, potion.key)')
button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood && !user.items.mounts[pet]}', ng-click='choosePet(egg.key, potion.key)')
.progress(ng-show='!user.items.mounts[pet] && egg.key!="Egg"')
.progress-bar.progress-bar-success(style="width:{{user.items.pets[pet]/.5}}%")
button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]')