Merge branch 'release' into develop

HabitRPG · Mar 20, 2019 · e7979a9 · e7979a9
2 parents 9a6aa5f + 5c648af
commit e7979a9
Show file tree

Hide file tree

Showing 89 changed files with 7,161 additions and 6,706 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.87.3",
+  "version": "4.88.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.5.2",

diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,30 +1,42 @@
 .promo_armoire_backgrounds_201903 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -327px;
+  background-position: 0px -490px;
   width: 423px;
   height: 147px;
 }
+.promo_classes_spring2019 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -327px;
+  width: 432px;
+  height: 162px;
+}
+.promo_egg_hunt {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -769px -148px;
+  width: 354px;
+  height: 147px;
+}
 .promo_mystery_201902 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -475px;
+  background-position: -769px -296px;
   width: 240px;
   height: 147px;
 }
 .promo_mythical_marvels_bundle {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -475px;
+  background-position: -769px 0px;
   width: 423px;
   height: 147px;
 }
-.promo_pi_day {
+.promo_seasonalshop_spring {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -327px;
-  width: 273px;
-  height: 147px;
+  background-position: -1010px -296px;
+  width: 162px;
+  height: 138px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -665px -475px;
+  background-position: -769px -444px;
   width: 96px;
   height: 69px;
 }