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

Merge pull request #4328 from SabreCat/gems

Browse source 
Add available Gems counter to Market
This commit is contained in:
Sabe Jones 2014-12-04 20:30:46 -06:00
commit aa346c9271
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/css/inventory.styl
View file

@ -71,7 +71,7 @@ menu.pets div
p
text-align:center
//width:6em
margin-top:-.5em
margin-top:-.3em
.hatchingPotion-menu > div
display:inline-block
vertical-align:top

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

@ -199,8 +199,9 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
| 4
span.Pet_Currency_Gem1x.inline-gems
div(ng-if='user.purchased.plan.planId')
button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})')
button.customize-option(popover=env.t('subGemPop'), popover-title=env.t('subGemName'), popover-trigger='mouseenter', popover-placement='top',ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})')
span.Pet_Currency_Gem.inline-gems
.badge.badge-success.stack-count {{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}}
p
| 20
span.shop_gold