Merge pull request #4328 from SabreCat/gems

Add available Gems counter to Market
2014-12-04 20:30:46 -06:00
parent f3fc6644b8 7dd16a06e6
commit aa346c9271
2 changed files with 3 additions and 2 deletions
@@ -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
@@ -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