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

Merge branch 'develop' into client-monorepo

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-10-12 12:49:13 +02:00
parent a625e83b53 0ecafb4a2e
commit d62653f0fd
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "habitica", "name": "habitica",
"version": "4.116.4", "version": "4.116.6",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.116.4", "version": "4.116.6",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@google-cloud/trace-agent": "^4.0.0", "@google-cloud/trace-agent": "^4.0.0",

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

@@ -47,7 +47,7 @@
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
.avatar { .avatar {
width: 140px; width: 141px;
height: 147px; height: 147px;
image-rendering: pixelated; image-rendering: pixelated;
position: relative; position: relative;
@@ -136,7 +136,7 @@ export default {
return this.overrideTopPadding; return this.overrideTopPadding;
} }
let val = '28px'; let val = '27px';
if (!this.avatarOnly) { if (!this.avatarOnly) {
if (this.member.items.currentPet) val = '24px'; if (this.member.items.currentPet) val = '24px';

22
website/client/src/components/inventory/equipment/equipGearModal.vue
View File

@@ -40,8 +40,8 @@
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/colors.scss'; @import '~client/assets/scss/colors.scss';
@import '~@/assets/scss/modal.scss'; @import '~client/assets/scss/modal.scss';
#equipgear-modal { #equipgear-modal {
@include centeredModal(); @include centeredModal();
@@ -105,7 +105,7 @@
margin: 0 auto; margin: 0 auto;
.character-sprites span { .character-sprites span {
left: 25px; left: 24px;
} }
} }
@@ -117,16 +117,16 @@
</style> </style>
<script> <script>
import { mapState } from '@/libs/store'; import { mapState } from 'client/libs/store';
import svgClose from '@/assets/svg/close.svg'; import svgClose from 'assets/svg/close.svg';
import svgWarrior from '@/assets/svg/warrior.svg'; import svgWarrior from 'assets/svg/warrior.svg';
import svgWizard from '@/assets/svg/wizard.svg'; import svgWizard from 'assets/svg/wizard.svg';
import svgRogue from '@/assets/svg/rogue.svg'; import svgRogue from 'assets/svg/rogue.svg';
import svgHealer from '@/assets/svg/healer.svg'; import svgHealer from 'assets/svg/healer.svg';
import Avatar from '@/components/avatar'; import Avatar from 'client/components/avatar';
import attributesGrid from '@/components/inventory/equipment/attributesGrid.vue'; import attributesGrid from 'client/components/inventory/equipment/attributesGrid.vue';
export default { export default {
components: { components: {

4
website/client/tests/unit/components/avatar.spec.js
View File

@@ -78,9 +78,9 @@ context('avatar.vue', () => {
}; };
}); });
it('defaults to 28px', () => { it('defaults to 27px', () => {
vm.avatarOnly = true; vm.avatarOnly = true;
expect(vm.paddingTop).to.equal('28px'); expect(vm.paddingTop).to.equal('27px');
}); });
it('is 24px if user has a pet', () => { it('is 24px if user has a pet', () => {

1
website/common/locales/en/content.json
View File

@@ -298,6 +298,7 @@
"hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "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) %>.", "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",
"premiumPotionUnlimitedNotes": "Not usable on quest pet eggs.",
"foodMeat": "Meat", "foodMeat": "Meat",
"foodMeatThe": "the Meat", "foodMeatThe": "the Meat",

2
website/common/script/content/hatching-potions.js
View File

@@ -196,6 +196,7 @@ const premium = {
text: t('hatchingPotionBronze'), text: t('hatchingPotionBronze'),
limited: true, limited: true,
canBuy: hasQuestAchievementFunction('bronze'), canBuy: hasQuestAchievementFunction('bronze'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
}, },
Watery: { Watery: {
value: 2, value: 2,
@@ -208,6 +209,7 @@ const premium = {
text: t('hatchingPotionSilver'), text: t('hatchingPotionSilver'),
limited: true, limited: true,
canBuy: hasQuestAchievementFunction('silver'), canBuy: hasQuestAchievementFunction('silver'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
}, },
Shadow: { Shadow: {
value: 2, value: 2,