krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release

Browse Source
This commit is contained in:
Sabe Jones
2020-04-02 15:09:54 -05:00
parent 87b26c4cfb 28bc843779
commit 3ac69d5e75
34 changed files with 618 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/src/components/avatar.vue
View File

@@ -186,7 +186,7 @@ export default {
return this.overrideTopPadding;
}
let val = '27px';
let val = '24px';
if (!this.avatarOnly) {
if (this.member.items.currentPet) val = '24px';