Merge branch 'develop' into AnitaYCheng-conditional-buy-gem

HabitRPG · Oct 8, 2015 · 7fc8add · 7fc8add
2 parents c3bb951 + 51355f7
commit 7fc8add
Show file tree

Hide file tree

Showing 33 changed files with 3,745 additions and 3,685 deletions.
diff --git a/common/dist/sprites/habitrpg-shared.css b/common/dist/sprites/habitrpg-shared.css
diff --git a/common/dist/sprites/spritesmith-largeSprites-0.css b/common/dist/sprites/spritesmith-largeSprites-0.css
@@ -42,7 +42,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -291px -843px;
+  background-position: -837px -843px;
   width: 90px;
   height: 90px;
 }
@@ -66,7 +66,7 @@
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -837px -843px;
+  background-position: -291px -843px;
   width: 90px;
   height: 90px;
 }
@@ -216,7 +216,7 @@
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -668px;
+  background-position: 0px -668px;
   width: 330px;
   height: 83px;
 }
@@ -240,7 +240,7 @@
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -668px;
+  background-position: -331px -668px;
   width: 330px;
   height: 83px;
 }

diff --git a/common/dist/sprites/spritesmith-largeSprites-0.png b/common/dist/sprites/spritesmith-largeSprites-0.png