diff --git a/bower.json b/bower.json index 60228a30c9..431214359b 100644 --- a/bower.json +++ b/bower.json @@ -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" diff --git a/public/css/inventory.styl b/public/css/inventory.styl index 1c5fa3b1b4..9aaec70c7a 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -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 diff --git a/views/options/pets.jade b/views/options/pets.jade index edd8e48358..f905d93b07 100644 --- a/views/options/pets.jade +++ b/views/options/pets.jade @@ -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') \ No newline at end of file