From 4b0ce7ffc19513fa3ce261c437bfc49dca0ec3a9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 10 Oct 2019 14:10:07 -0500 Subject: [PATCH 1/6] fix(potions): correct Bronze/Silver string fixes #11395 --- website/common/locales/en/content.json | 1 + website/common/script/content/hatching-potions.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index dce755e033..3fdca1f98f 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -298,6 +298,7 @@ "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.", + "premiumPotionUnlimitedNotes": "Not usable on quest pet eggs.", "foodMeat": "Meat", "foodMeatThe": "the Meat", diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index a5e64449a2..cbc241e66b 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -198,6 +198,7 @@ let premium = { text: t('hatchingPotionBronze'), limited: true, canBuy: hasQuestAchievementFunction('bronze'), + _addlNotes: t('premiumPotionUnlimitedNotes'), }, Watery: { value: 2, @@ -210,6 +211,7 @@ let premium = { text: t('hatchingPotionSilver'), limited: true, canBuy: hasQuestAchievementFunction('silver'), + _addlNotes: t('premiumPotionUnlimitedNotes'), }, Shadow: { value: 2, From c96d3c8ec51ab52f02adc0f72bd455056713f208 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 10 Oct 2019 14:18:20 -0500 Subject: [PATCH 2/6] fix(task-modal): don't submit task without title --- website/client/components/tasks/taskModal.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue index cd55e3cdc2..a989d3e7e5 100644 --- a/website/client/components/tasks/taskModal.vue +++ b/website/client/components/tasks/taskModal.vue @@ -920,6 +920,7 @@ export default { } }, async submit () { + if (!this.task.title) return; if (this.newChecklistItem) this.addChecklistItem(); // TODO Fix up permissions on task.group so we don't have to keep doing these hacks From 3eaf993c1b1c59060436b43bf9ad34967a13d4a9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 11 Oct 2019 14:49:37 -0500 Subject: [PATCH 3/6] fix(sprites): more pixel alignment --- website/client/components/avatar.vue | 2 +- .../client/components/inventory/equipment/equipGearModal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index db56336a60..ad98ebfe92 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -136,7 +136,7 @@ export default { return this.overrideTopPadding; } - let val = '28px'; + let val = '27px'; if (!this.avatarOnly) { if (this.member.items.currentPet) val = '24px'; diff --git a/website/client/components/inventory/equipment/equipGearModal.vue b/website/client/components/inventory/equipment/equipGearModal.vue index 415aa93167..ca6e0f8b17 100644 --- a/website/client/components/inventory/equipment/equipGearModal.vue +++ b/website/client/components/inventory/equipment/equipGearModal.vue @@ -105,7 +105,7 @@ margin: 0 auto; .character-sprites span { - left: 25px; + left: 24px; } } From d079b52c630af4ad890f36599530b1ab9333f7d3 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 11 Oct 2019 14:55:22 -0500 Subject: [PATCH 4/6] fix(avatar): use full background width --- website/client/components/avatar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index ad98ebfe92..a53d1b7c90 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -47,7 +47,7 @@ @import '~client/assets/scss/colors.scss'; .avatar { - width: 140px; + width: 141px; height: 147px; image-rendering: pixelated; position: relative; From 08f12ac1634e13cd21cab013da640d95082a813b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 11 Oct 2019 15:02:55 -0500 Subject: [PATCH 5/6] fix(test): correct px expectation --- test/client/unit/specs/components/avatar.vue.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/client/unit/specs/components/avatar.vue.test.js b/test/client/unit/specs/components/avatar.vue.test.js index 8de44ebb21..efebcda3f7 100644 --- a/test/client/unit/specs/components/avatar.vue.test.js +++ b/test/client/unit/specs/components/avatar.vue.test.js @@ -78,9 +78,9 @@ context('avatar.vue', () => { }; }); - it('defaults to 28px', () => { + it('defaults to 27px', () => { vm.avatarOnly = true; - expect(vm.paddingTop).to.equal('28px'); + expect(vm.paddingTop).to.equal('27px'); }); it('is 24px if user has a pet', () => { From 477743260a48020187ea61c0c6a4a17723a683f4 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 11 Oct 2019 15:16:51 -0500 Subject: [PATCH 6/6] 4.116.5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92cfbcf38e..fab3058f9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.116.4", + "version": "4.116.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 239d0787c2..bf7c553384 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.116.4", + "version": "4.116.5", "main": "./website/server/index.js", "dependencies": { "@google-cloud/trace-agent": "^4.0.0",