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

correct position of pets in the profile overview - fixes #10104 (#10144)

Browse source
This commit is contained in:
negue 2018-03-17 21:13:35 +01:00 committed by Matteo Pagliazzi
parent 9287098e70
commit 0fcc1f2080
4 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
website/client/assets/scss/animals.scss Normal file
View file

@ -0,0 +1,20 @@
.Pet {
margin: auto !important;
display: block;
position: relative;
right: 0;
bottom: 0;
left: 0;
&:not([class*="FlyingPig"]) {
top: -28px !important;
}
}
.Pet[class*="FlyingPig"] {
top: 7px !important;
}
.Pet.Pet-Dragon-Hydra {
top: -16px !important;
}

1
website/client/assets/scss/index.scss
View file

@ -33,3 +33,4 @@
@import './banner';
@import './progress-bar';
@import './pin';
@import './animals';

12
website/client/components/inventory/stable/index.vue
View file

@ -276,18 +276,6 @@
display: inline-block;
}
.stable .item .item-content.Pet:not(.FlyingPig) {
top: -28px;
}
.stable .item .item-content.FlyingPig {
top: 7px;
}
.stable .item .item-content.Pet-Dragon-Hydra {
top: -16px !important;
}
.hatchablePopover {
width: 180px
}

6
website/client/components/userMenu/profile.vue
View file

@ -189,7 +189,7 @@ div
.row.col-12
.col-12.col-md-4
.box(:class='{white: user.items.currentPet}')
.pet(:class="`Pet-${user.items.currentPet}`")
.Pet(:class="`Pet-${user.items.currentPet}`")
.col-12.col-md-8
div
| {{ formatAnimal(user.items.currentPet, 'pet') }}
@ -340,10 +340,6 @@ div
margin-bottom: 2em;
}
.pet {
margin-top: -1.4em !important;
}
.mount {
margin-top: -0.2em !important;
}