diff --git a/public/img/sprites/PetEggs.css b/public/img/sprites/PetEggs.css index b334806c84..63b3d0de7c 100644 --- a/public/img/sprites/PetEggs.css +++ b/public/img/sprites/PetEggs.css @@ -1,25 +1,25 @@ .Pet_Egg_Wolf, .Pet_Egg_TigerCub, .Pet_Egg_PolarBear, .Pet_Egg_PandaCub, .Pet_Egg_LionCub, .Pet_Egg_Fox, .Pet_Egg_FlyingPig, .Pet_Egg_Dragon, .Pet_Egg_Cactus, .Pet_Egg_BearCub, .Pet_HatchingPotion_Base, .Pet_HatchingPotion_White, .Pet_HatchingPotion_Desert, .Pet_HatchingPotion_Red, .Pet_HatchingPotion_Shade, .Pet_HatchingPotion_Skeleton, .Pet_HatchingPotion_Zombie, .Pet_HatchingPotion_CottonCandyPink, .Pet_HatchingPotion_CottonCandyBlue, .Pet_HatchingPotion_Golden, .Pet_Currency_Gem, .Pet_Currency_Gem2x, .Pet_Currency_Gem1x {background: url("/img/sprites/Egg_Sprite_Sheet.png") no-repeat} -.Pet_Egg_Wolf {background-position: 0px 0px; width: 48px; height: 51px} -.Pet_Egg_TigerCub {background-position: 0px -51px; width: 48px; height: 51px} -.Pet_Egg_PolarBear {background-position: 0px -102px; width: 48px; height: 51px} -.Pet_Egg_PandaCub {background-position: 0px -153px; width: 48px; height: 51px} -.Pet_Egg_LionCub {background-position: 0px -204px; width: 48px; height: 51px} -.Pet_Egg_Fox {background-position: 0px -255px; width: 48px; height: 51px} -.Pet_Egg_FlyingPig {background-position: 0px -306px; width: 48px; height: 51px} -.Pet_Egg_Dragon {background-position: 0px -357px; width: 48px; height: 51px} -.Pet_Egg_Cactus {background-position: 0px -408px; width: 48px; height: 51px} -.Pet_Egg_BearCub {background-position: 0px -459px; width: 48px; height: 51px} +.Pet_Egg_Wolf {background-position: 0px 0px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_TigerCub {background-position: 0px -51px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_PolarBear {background-position: 0px -102px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_PandaCub {background-position: 0px -153px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_LionCub {background-position: 0px -204px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_Fox {background-position: 0px -255px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_FlyingPig {background-position: 0px -306px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_Dragon {background-position: 0px -357px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_Cactus {background-position: 0px -408px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_BearCub {background-position: 0px -459px; width: 48px; height: 53px; margin-left: 1.25em;} -.Pet_HatchingPotion_Base {background-position: -48px -0px; width: 48px; height: 51px} -.Pet_HatchingPotion_White {background-position: -48px -51px; width: 48px; height: 51px} -.Pet_HatchingPotion_Desert {background-position: -48px -102px; width: 48px; height: 51px} -.Pet_HatchingPotion_Red {background-position: -48px -153px; width: 48px; height: 51px} -.Pet_HatchingPotion_Shade {background-position: -48px -204px; width: 48px; height: 51px} -.Pet_HatchingPotion_Skeleton {background-position: -48px -255px; width: 48px; height: 51px} -.Pet_HatchingPotion_Zombie {background-position: -48px -306px; width: 48px; height: 51px} -.Pet_HatchingPotion_CottonCandyPink {background-position: -48px -357px; width: 48px; height: 51px} -.Pet_HatchingPotion_CottonCandyBlue {background-position: -48px -408px; width: 48px; height: 51px} -.Pet_HatchingPotion_Golden {background-position: -48px -459px; width: 48px; height: 51px} +.Pet_HatchingPotion_Base {background-position: -48px -0px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_White {background-position: -48px -51px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Desert {background-position: -48px -102px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Red {background-position: -48px -153px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Shade {background-position: -48px -204px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Skeleton {background-position: -48px -255px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Zombie {background-position: -48px -306px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_CottonCandyPink {background-position: -48px -357px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_CottonCandyBlue {background-position: -48px -408px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Golden {background-position: -48px -459px; width: 48px; height: 53px; margin-left: 1.25em;} .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} diff --git a/src/app/index.coffee b/src/app/index.coffee index 89cd993836..70e096bce5 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -138,7 +138,8 @@ ready (model) -> # remember that the properties are set from uObj & paths AFTER the return of this callback return if _.isEmpty(paths) or (paths['lastCron'] and _.size(paths) is 1) # for everyone else, we need to reset dom - too many changes have been made and won't it breaks dom listeners. - if lostHp = delete paths['stats.hp'] # we'll set this manually so we can get a cool animation + if paths['stats.hp'] + delete paths['stats.hp'] # we'll set this manually so we can get a cool animation setTimeout -> browser.resetDom(model) user.set 'stats.hp', uObj.stats.hp diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl index c24db0d7d6..532238c638 100644 --- a/styles/app/game-pane.styl +++ b/styles/app/game-pane.styl @@ -21,6 +21,7 @@ padding-top:15px padding-bottom:15px border-bottom 1px solid #ddd + word-wrap:break-word &.highlight background #EEE diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 891d570a68..5ba49c9d41 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -57,20 +57,30 @@ .Pet_Currency_Gem2x {background-position: -55px -513px; width: 34px; height: 30px} .Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px} +.inventory-list p + display: none .inventory-list li clear:both .pets-menu > div - float:left + display:inline-block + vertical-align:top padding:.3em + width:6em + margin-top:1em p text-align:center - width:3em + width:6em + margin-top:-.5em .hatchingPotion-menu > div - float:left + display:inline-block + vertical-align:top padding:.3em + width:6em + margin-top:1em p text-align:center - width:3em + width:6em + margin-top:-.5em .pet-button border: none diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 7a9be98804..73894b3372 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -327,7 +327,7 @@ form .option-short .option-content - width: 3em + width: 4em display: inline-block .input-suffix vertical-align: 20%