Merge branch 'release' into develop

jshekhawat · Sep 29, 2020 · 205d275 · 205d275
2 parents 8c31f94 + efe7ea5
commit 205d275
Show file tree

Hide file tree

Showing 55 changed files with 5,086 additions and 5,018 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.160.1",
+  "version": "4.161.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.11.6",

diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,36 +1,42 @@
 .promo_armoire_backgrounds_202009 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -434px;
+  background-position: 0px -452px;
   width: 423px;
   height: 147px;
 }
-.promo_fall_festival_2019 {
+.promo_fall_customizations {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -244px;
+  width: 336px;
+  height: 207px;
+}
+.promo_fall_festival_2019 {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -532px 0px;
   width: 360px;
   height: 189px;
 }
 .promo_fall_festival_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -532px 0px;
+  background-position: -532px -190px;
   width: 360px;
   height: 174px;
 }
 .promo_mystery_202009 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -532px -175px;
+  background-position: 0px -600px;
   width: 282px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -532px -323px;
+  background-position: -532px -365px;
   width: 96px;
   height: 69px;
 }
 .promo_vampire_potions {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -434px;
+  background-position: -424px -452px;
   width: 423px;
   height: 147px;
 }
@@ -42,7 +48,7 @@
 }
 .scene_squall {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -361px -244px;
+  background-position: -337px -244px;
   width: 141px;
   height: 169px;
 }