From 9e86248120b18d4a67939a111c3586ae488a7689 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 15 Apr 2013 02:03:32 -0400 Subject: [PATCH] "unlock all the pets" style stable layout --- public/img/paw.png | Bin 0 -> 5815 bytes src/app/helpers.coffee | 2 ++ styles/app/inventory.styl | 14 +++++++++++++ views/app/pets.html | 40 +++++++++++++++++++++++++------------- 4 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 public/img/paw.png diff --git a/public/img/paw.png b/public/img/paw.png new file mode 100644 index 0000000000000000000000000000000000000000..a7efea4eabca8d2daa40af025d88aaf4fd0f6591 GIT binary patch literal 5815 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 BM=AgS literal 0 HcmV?d00001 diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee index 24b3050e4c..6ba2bf9315 100644 --- a/src/app/helpers.coffee +++ b/src/app/helpers.coffee @@ -149,4 +149,6 @@ viewHelpers = (view) -> classes += ' color-best' return classes + view.fn 'ownsPet', (pet, userPets) -> userPets?.indexOf(pet) != -1 + module.exports = { viewHelpers, removeWhitespace, randomVal, daysBetween, dayMapping, username } diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 4ae647a728..9668099c8d 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -48,3 +48,17 @@ float:left .hatchingPotions-menu > div float:left + +.pet-button + border: none + background: none white +.pet-not-owned + width: 81px; + height: 99px; + /* Would use css3 filters and just display the original pet image with a black hue, + but doesn't seem to work in Firefox or Opera */ + /*filter: brightness(0%) + -webkit-filter: brightness(0%) + -moz-filter: brightness(0%) + -o-filter: brightness(0%) + -ms-filter: brightness(0%)*/ diff --git a/views/app/pets.html b/views/app/pets.html index d68f41ea38..dec9fc7b19 100644 --- a/views/app/pets.html +++ b/views/app/pets.html @@ -86,16 +86,30 @@ - {#if _user.items.pets} - -
  • - - {#each _user.items.pets as :pet} - - {/} - -
  • -
    - {else} -

    You don't have any pets yet.

    - {/} + + {{#each _items.pets as :pet}} + + {{#each _items.hatchingPotions as :potion}} + + {{/}} + + {{/}} +
    + +
    + + + +
    + {{#if ownsPet(@string, _user.items.pets)}} + + {{else}} + + {{/}} +
    \ No newline at end of file