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

Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite

Browse source
This commit is contained in:
Tyler Renelle 2013-09-05 22:33:41 -04:00
commit 86552c9296
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assets/css/game-pane.styl
View file

@ -22,6 +22,9 @@
&.highlight
background #EEE
label
margin-right:5px
#market-tab
position relative

2
assets/css/inventory.styl
View file

@ -58,7 +58,7 @@
.Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px}
.inventory-list p
display: none
//display: none
.inventory-list li
clear:both
.pets-menu > div

5
views/options/inventory.jade
View file

@ -17,7 +17,10 @@
h3 Hatch Your Egg
p(ng-show='userHatchingPotions.length < 1') You don't have any hatching potions yet.
div(ng-show='userHatchingPotions')
p Which hatching potion will you pour on your {{_hatchEgg.text}} egg?
p
| Which hatching potion will you pour on your
| <b> {{selectedEgg.text}} </b>
| egg?
form
select(ng-options='hatchingPotion for hatchingPotion in userHatchingPotions', ng-model="selectedPotion")
button(ng-click="pour()") Pour