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 pull request #2917 from benmanley/stable-styles

Browse source 
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
This commit is contained in:
Matteo Pagliazzi 2014-02-22 15:25:01 +01:00
commit 35a997c690
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/css/inventory.styl
View file

@ -111,6 +111,10 @@ menu.pets .customize-menu
.PixelPaw
margin-top: 36px // align paw with pets, at the bottom of the button
// styles for pets that have been fed until they evolve into a mount
.pet-evolved
opacity: 0.1
.selectableInventory
background-color: lightgreen !important
border-radius: 50%

6
views/options/inventory/stable.jade
View file

@ -58,9 +58,7 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html')
.progress-bar.progress-bar-success(style="width:{{user.items.pets[pet]/.5}}%")
button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]')
.PixelPaw
// How to apply this style in stylus files?
button(class="pet-button Pet-{{pet}}" ng-if='user.items.pets[pet]<0',style='opacity:0.1;filter:alpha(opacity=10)')
//if this could be changed to the opacity talked about? can't figure it out
button(class="pet-evolved pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]<0')
.col-md-12
h4=env.t('questPets')
menu.pets(type='list')
@ -72,7 +70,7 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html')
.progress-bar.progress-bar-success(style="width:{{user.items.pets[pet]/.5}}%")
button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]')
.PixelPaw
button(class="pet-button Pet-{{pet}}" ng-if='user.items.pets[pet]<0',style='opacity:0.1;filter:alpha(opacity=10)')
button(class="pet-evolved pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]<0')
.col-md-12
h4=env.t('rarePets')