Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2022-02-01 15:29:35 -06:00
parent 9a9449e001 f43a12acb2
commit ca4df96902
17 changed files with 248 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/assets/css/sprites/spritesmith-main.css
+17 -17
View File
@@ -450,8 +450,8 @@
}
.achievement-zodiac2x {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-zodiac2x.png');
width: 68px;
height: 68px;
width: 60px;
height: 64px;
}
.background_afternoon_picnic {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_afternoon_picnic.png');
@@ -25078,6 +25078,21 @@
width: 114px;
height: 90px;
}
.shop_eyewear_mystery_202202 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202202.png');
width: 68px;
height: 68px;
}
.shop_head_mystery_202202 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202202.png');
width: 68px;
height: 68px;
}
.shop_set_mystery_202202 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202202.png');
width: 68px;
height: 68px;
}
.broad_armor_mystery_301404 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
width: 90px;
@@ -33343,21 +33358,11 @@
width: 68px;
height: 68px;
}
.shop_eyewear_mystery_202202 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202202.png');
width: 68px;
height: 68px;
}
.shop_gem {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_gem.png');
width: 68px;
height: 68px;
}
.shop_head_mystery_202202 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202202.png');
width: 68px;
height: 68px;
}
.shop_opaquePotion {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_opaquePotion.png');
width: 68px;
@@ -33388,11 +33393,6 @@
width: 68px;
height: 68px;
}
.shop_set_mystery_202202 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202202.png');
width: 68px;
height: 68px;
}
.shop_shinySeed {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shinySeed.png');
width: 68px;
website/client/src/components/notifications.vue
+10 -1
View File
@@ -442,6 +442,14 @@ const NOTIFICATIONS = {
achievement: 'shadeOfItAll',
},
},
ACHIEVEMENT_ZODIAC_ZOOKEEPER: {
achievement: true,
label: $t => `${$t('achievement')}: ${$t('achievementZodiacZookeeper')}`,
modalId: 'generic-achievement',
data: {
achievement: 'zodiacZookeeper',
},
},
};
export default {
@@ -505,7 +513,7 @@ export default {
'ACHIEVEMENT_BONE_COLLECTOR', 'ACHIEVEMENT_SKELETON_CREW', 'ACHIEVEMENT_SEEING_RED',
'ACHIEVEMENT_RED_LETTER_DAY', 'ACHIEVEMENT_LEGENDARY_BESTIARY', 'ACHIEVEMENT_SEASONAL_SPECIALIST',
'ACHIEVEMENT_VIOLETS_ARE_BLUE', 'ACHIEVEMENT_WILD_BLUE_YONDER', 'ACHIEVEMENT_DOMESTICATED',
'ACHIEVEMENT_SHADY_CUSTOMER', 'ACHIEVEMENT_SHADE_OF_IT_ALL',
'ACHIEVEMENT_SHADY_CUSTOMER', 'ACHIEVEMENT_SHADE_OF_IT_ALL', 'ACHIEVEMENT_ZODIAC_ZOOKEEPER',
].forEach(type => {
handledNotifications[type] = true;
});
@@ -939,6 +947,7 @@ export default {
case 'ACHIEVEMENT_DOMESTICATED':
case 'ACHIEVEMENT_SHADY_CUSTOMER':
case 'ACHIEVEMENT_SHADE_OF_IT_ALL':
case 'ACHIEVEMENT_ZODIAC_ZOOKEEPER':
case 'GENERIC_ACHIEVEMENT':
this.showNotificationWithModal(notification);
break;