Merge branch 'release' into develop

jshekhawat · Sep 1, 2020 · 01ae56f · 01ae56f
2 parents f1469b5 + 7b020e1
commit 01ae56f
Show file tree

Hide file tree

Showing 25 changed files with 1,223 additions and 1,128 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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.154.1",
+  "version": "4.155.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.11.4",

diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -12,7 +12,7 @@
 }
 .promo_golden_achievements {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -295px -383px;
+  background-position: -419px -540px;
   width: 246px;
   height: 112px;
 }
@@ -22,6 +22,12 @@
   width: 294px;
   height: 156px;
 }
+.promo_mystery_202009 {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -295px -383px;
+  width: 282px;
+  height: 147px;
+}
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -800px -168px;
@@ -40,6 +46,12 @@
   width: 141px;
   height: 167px;
 }
+.scene_achievement {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -540px;
+  width: 210px;
+  height: 210px;
+}
 .scene_public_space {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -187px;
@@ -48,13 +60,13 @@
 }
 .scene_reading {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -208px -540px;
+  background-position: -578px -383px;
   width: 171px;
   height: 144px;
 }
 .scene_rewards {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -540px;
+  background-position: -211px -540px;
   width: 207px;
   height: 180px;
 }