From 05c3e71a922ecd7b7321e92169fa1b2e43aedc71 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 10 Nov 2013 19:18:06 -0800 Subject: [PATCH] mounts: fixes to starter food css --- public/css/inventory.styl | 17 +++++++++++++---- views/options/inventory/inventory.jade | 2 +- views/options/inventory/stable.jade | 8 ++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/public/css/inventory.styl b/public/css/inventory.styl index 3ba84b2bb6..77820be8ba 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -52,15 +52,24 @@ menu.pets div padding-right:20px padding-bottom:20px -.Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Veteran, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base, .Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base, .Pet_Food_SugarCube, .Pet_Food_Strawberry, .Pet_Food_Rotten, .Pet_Food_Licorice, .Pet_Food_Golden, .Pet_Food_Cream, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Chocolate, .Pet_Food_Base, .Pet_Food_Zombie, .Pet_Food_White, .Pet_Food_Skeleton, .Pet_Food_Shade, .Pet_Food_Red, .Pet_Food_Golden, .Pet_Food_Desert, .Pet_Food_CottonCandyPink, .Pet_Food_CottonCandyBlue, .Pet_Food_Base - background: url("/bower_components/habitrpg-shared/img/hatching_powder.png") no-repeat - width:34px - height:34px +// we'll remove this and place it into habitrpg-shared when we have art to work with +menu button[class*="Pet_Food_"] + width:48px + height:53px + margin-left: 1.25em .Pet_Currency_Gem, .Pet_Currency_Gem2x, .Pet_Currency_Gem1x background: url("/bower_components/habitrpg-shared/img/sprites/Egg_Sprite_Sheet.png") no-repeat display:block +.food-tray + position:fixed + right:0px + bottom:0px + width:30% + height: 50% + overflow-y: scroll + .Pet_Currency_Gem {background-position: 0px -510px; width: 51px; height: 45px} /* Not an egg or potion so has a different size */ .Pet_Currency_Gem2x {background-position: -55px -513px; width: 34px; height: 30px} .Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px} diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 95b5ff2be0..405ab408d9 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -23,7 +23,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') p {{pot}} li.customize-menu - menu.food-menu(label='Food ({{foodCount}})') + menu.pets-menu(label='Food ({{foodCount}})') p(ng-show='foodCount < 1') You don't have any food yet. div(ng-repeat='(food,points) in ownedItems(user.items.food)') button.customize-option(tooltip='{{food}}', ng-click='chooseFood(food)', class='Pet_Food_{{food}}') diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 2d551a30cb..13c1435483 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -70,11 +70,11 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover="Click the gold paw to learn more about how you can obtain this rare pet through contributing to HabitRPG!", popover-title='How to Get this Pet!') img(src='/bower_components/habitrpg-shared/img/PixelPaw-Gold.png') - .well(style='position:fixed;right:0px;top:50%;width:200px') - menu.inventory-list(type='list') + .well.food-tray + p(ng-show='foodCount < 1') You don't have any food yet. + menu.inventory-list(type='list', ng-if='foodCount > 0') li.customize-menu - menu.food-menu(label='Food') - p(ng-show='foodCount < 1') You don't have any food yet. + menu.pets-menu(label='Food') div(ng-repeat='(food,points) in ownedItems(user.items.food)') button.customize-option(tooltip='{{food}}', ng-click='chooseFood(food)', class='Pet_Food_{{food}}') .badge.badge-info.stack-count {{points}}