sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-16 00:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove stable flickering, fixes #1557

Browse source
This commit is contained in:
Matteo Pagliazzi 2013-09-29 16:43:01 +02:00
parent 602c78c1be
commit bb8bbe4e0f
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bower.json
View file

@ -36,8 +36,7 @@
},
"resolutions": {
"jquery": "~2.0.3",
"angular": "1.2.0-rc.2",
"angular-mocks": "1.2.0-rc.2"
"bootstrap": "v2.3.2"
},
"devDependencies": {
"angular-mocks": "1.2.0-rc.2"

4
public/css/inventory.styl
View file

@ -36,6 +36,10 @@
width:6.5em
height:2.5em
menu.pets div
display: inline-block
padding-top: -30px
.current-pet
left: 0px
bottom: 0px

17
views/options/pets.jade
View file

@ -13,20 +13,17 @@
| at all the pets you can collect.
h4 {{userPets.length}} / {{totalPets}} Pets Found
table.pets(ng-repeat='pet in pets')
tbody
tr
td(ng-repeat='potion in hatchingPotions', tooltip='{{potion.name}} {{pet.name}}')
menu.pets(type='list')
li.customize-menu(ng-repeat='pet in pets')
menu
div(ng-repeat='potion in hatchingPotions', tooltip='{{potion.name}} {{pet.name}}')
button(class="pet-button Pet-{{pet.name}}-{{potion.name}}", ng-show='hasPet(pet.name, potion.name)', ng-class="{active: isCurrentPet(pet.name, potion.name)}", ng-click='choosePet(pet.name, potion.name)')
button(class="pet-button pet-not-owned", ng-hide='hasPet(pet.name, potion.name)')
img(src='/bower_components/habitrpg-shared/img/PixelPaw.png')
h4 Rare Pets
table
tr
td
menu
div(ng-if='hasPet("Wolf", "Cerberus")')
button(class="pet-button Pet-Wolf-Veteran", ng-show='hasPet("Wolf", "Veteran")', ng-class='{active: isCurrentPet("Wolf", "Veteran")}', ng-click='choosePet("Wolf", "Veteran")', tooltip='Veteran Wolf')
button(class="pet-button pet-not-owned", ng-hide='hasPet("Wolf", "Veteran")')
img(src='/bower_components/habitrpg-shared/img/PixelPaw.png')
td(ng-if='hasPet("Wolf", "Cerberus")')
div(ng-if='hasPet("Wolf", "Cerberus")')
button(class="pet-button Pet-Wolf-Cerberus", ng-class='{active: isCurrentPet("Wolf", "Cerberus")}', ng-click='choosePet("Wolf", "Cerberus")', tooltip='Cerberus Pup')