sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1150 from onduhray/develop

Browse source 
Fixes #1028: weird inventory item spacing for eggs and potions.
This commit is contained in:
Tyler Renelle 2013-06-11 14:16:32 -07:00
commit 1d2f62be2b
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
styles/app/inventory.styl
View file

@ -20,13 +20,20 @@
width: 100% width: 100%
td td
padding: 0.5em padding: 0.5em
width: 25% //width: 25%
&.active-pet &.active-pet
background-color: $bad background-color: $bad
outline: 1px solid rgba(0,0,0,0.1) outline: 1px solid rgba(0,0,0,0.1)
outline-offset: -1px outline-offset: -1px
&:hover, &:focus &:hover, &:focus
background-color: darken($better, 10%) background-color: darken($better, 10%)
> div
margin:auto
margin-bottom:.5em
p
text-align:center
width:6.5em
height:2.5em
.current-pet .current-pet
left: 0px left: 0px
@ -54,8 +61,14 @@
clear:both clear:both
.pets-menu > div .pets-menu > div
float:left float:left
.hatchingPotions-menu > div padding:.3em
p
text-align:center
.hatchingPotion-menu > div
float:left float:left
padding:.3em
p
text-align:center
.pet-button .pet-button
border: none border: none

2
views/app/game-pane.html
View file

@ -111,7 +111,7 @@
{/} {/}
<h4>Hatching Potions</h4> <h4>Hatching Potions</h4>
{#with _items.hatchingPotions as :hatchingPotion} {#with _items.hatchingPotions as :hatchingPotion}
<table> <table class="tab-pane pet-grid">
<tr> <tr>
{#with :hatchingPotion[0]}<app:pets:hatchingPotion />{/} {#with :hatchingPotion[0]}<app:pets:hatchingPotion />{/}
{#with :hatchingPotion[1]}<app:pets:hatchingPotion />{/} {#with :hatchingPotion[1]}<app:pets:hatchingPotion />{/}

4
views/app/pets.html
View file

@ -33,13 +33,13 @@
<hatchingPotion:> <hatchingPotion:>
<td class="active-hatchingPotion" x-bind="click:buyHatchingPotion" data-hatchingPotion='{.name}'> <td class="active-hatchingPotion" x-bind="click:buyHatchingPotion" data-hatchingPotion='{.name}'>
<div class="Pet_HatchingPotion_{.name}"></div> <div class="Pet_HatchingPotion_{.name}"></div>
{.text}<br/><small>{.value} Gems<small> <p>{.text}<br/><small>{.value} Gems<small></p>
</td> </td>
<egg:> <egg:>
<td class="active-egg" x-bind="click:buyEgg" data-egg='{.name}'> <td class="active-egg" x-bind="click:buyEgg" data-egg='{.name}'>
<div rel=tooltip class="Pet_Egg_{.name}"></div> <div rel=tooltip class="Pet_Egg_{.name}"></div>
{.text}<br/><small>{.value} Gems<small> <p>{.text}<br/><small>{.value} Gems<small></p>
</td> </td>
<inventory:> <inventory:>