diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-1.css b/website/assets/sprites/dist/spritesmith-largeSprites-1.css
index 1e529a68ad..3c0ef88dfb 100644
--- a/website/assets/sprites/dist/spritesmith-largeSprites-1.css
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-1.css
@@ -1,12 +1,12 @@
.promo_mystery_201702 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -742px;
+ background-position: -1538px -890px;
width: 279px;
height: 147px;
}
.promo_mystery_201703 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -151px;
+ background-position: -1538px -299px;
width: 282px;
height: 147px;
}
@@ -18,85 +18,85 @@
}
.promo_mystery_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -299px;
+ background-position: -1538px -447px;
width: 282px;
height: 147px;
}
.promo_mystery_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1278px -1226px;
+ background-position: -796px -1695px;
width: 111px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -1228px;
+ background-position: -578px -1695px;
width: 217px;
height: 90px;
}
.promo_new_hair_fall2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -425px -927px;
+ background-position: -565px -969px;
width: 140px;
height: 441px;
}
.promo_orca {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -114px -1779px;
+ background-position: -1254px -589px;
width: 105px;
height: 105px;
}
.promo_partyhats {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1459px;
+ background-position: -1679px -819px;
width: 115px;
height: 47px;
}
.promo_pastel_skin {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -983px -1369px;
+ background-position: -793px -1411px;
width: 330px;
height: 83px;
}
.customize-option.promo_pastel_skin {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1008px -1384px;
+ background-position: -818px -1426px;
width: 60px;
height: 60px;
}
.promo_pastel_skin_hair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -848px -1078px;
+ background-position: -1107px -969px;
width: 354px;
height: 147px;
}
.customize-option.promo_pastel_skin_hair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -873px -1093px;
+ background-position: -1132px -984px;
width: 60px;
height: 60px;
}
.promo_peppermint_flame {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1249px -927px;
+ background-position: -1848px -755px;
width: 140px;
height: 147px;
}
.promo_pet_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1254px -589px;
+ background-position: -1848px -903px;
width: 140px;
height: 147px;
}
.customize-option.promo_pet_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1279px -604px;
+ background-position: -1873px -918px;
width: 60px;
height: 60px;
}
.promo_pyromancer {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1779px;
+ background-position: -1848px -1642px;
width: 113px;
height: 113px;
}
@@ -106,111 +106,129 @@
width: 92px;
height: 103px;
}
+.promo_seafoam {
+ background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+ background-position: -1396px -442px;
+ width: 141px;
+ height: 441px;
+}
.promo_seasonal_shop_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -890px;
+ background-position: -1538px -1038px;
width: 279px;
height: 147px;
}
.promo_shimmer_hair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1314px -1369px;
+ background-position: -1067px -1316px;
width: 330px;
height: 83px;
}
.promo_shimmer_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -927px;
+ background-position: 0px -969px;
width: 141px;
height: 441px;
}
.promo_shinySeeds {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -142px -927px;
+ background-position: -1396px 0px;
width: 141px;
height: 441px;
}
+.promo_splashy_skins {
+ background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+ background-position: 0px -782px;
+ width: 375px;
+ height: 186px;
+}
+.customize-option.promo_splashy_skins {
+ background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+ background-position: -25px -797px;
+ width: 60px;
+ height: 60px;
+}
.promo_splashyskins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -453px -1628px;
+ background-position: 0px -1786px;
width: 198px;
height: 91px;
}
.customize-option.promo_splashyskins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -478px -1643px;
+ background-position: -25px -1801px;
width: 60px;
height: 60px;
}
.promo_spooky_sparkles_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -447px;
+ background-position: -1538px -595px;
width: 140px;
height: 294px;
}
.promo_spring_classes_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -620px -1369px;
+ background-position: -430px -1411px;
width: 362px;
height: 102px;
}
.promo_spring_classes_2017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1369px;
+ background-position: -1538px 0px;
width: 309px;
height: 147px;
}
.promo_springclasses2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -615px -1517px;
+ background-position: 0px -1695px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -326px -1517px;
+ background-position: -289px -1695px;
width: 288px;
height: 90px;
}
.promo_staff_spotlight_Lemoness {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1808px -595px;
+ background-position: -1848px -1347px;
width: 102px;
height: 146px;
}
.promo_staff_spotlight_Viirus {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1547px -926px;
+ background-position: -1848px -1199px;
width: 119px;
height: 147px;
}
.promo_staff_spotlight_paglias {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1547px -1077px;
+ background-position: -1848px -1494px;
width: 99px;
height: 147px;
}
.promo_steampunk_3017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -566px -927px;
+ background-position: -283px -969px;
width: 140px;
height: 441px;
}
.promo_summer_classes_2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -848px -1226px;
+ background-position: 0px -1411px;
width: 429px;
height: 102px;
}
.promo_summer_classes_2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1370px;
+ background-position: -534px -1514px;
width: 300px;
height: 88px;
}
.promo_summer_classes_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -848px -927px;
+ background-position: -706px -969px;
width: 400px;
height: 150px;
}
@@ -222,103 +240,103 @@
}
.promo_takeThis_gear {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -767px -1628px;
+ background-position: -835px -1514px;
width: 114px;
height: 87px;
}
.promo_takethis_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -652px -1628px;
+ background-position: -950px -1514px;
width: 114px;
height: 87px;
}
.promo_task_planning {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -377px;
+ background-position: -706px -1120px;
width: 240px;
height: 195px;
}
.promo_turkey_day_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -284px -927px;
+ background-position: -424px -969px;
width: 140px;
height: 441px;
}
.promo_unconventional_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1604px -745px;
+ background-position: -1761px -1261px;
width: 60px;
height: 60px;
}
.promo_unconventional_armor2 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1183px -277px;
+ background-position: -1761px -1186px;
width: 70px;
height: 74px;
}
.promo_updos {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1808px -447px;
+ background-position: -1679px -595px;
width: 156px;
height: 147px;
}
.promo_veteran_pets {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1057px -1517px;
+ background-position: -1124px -1411px;
width: 146px;
height: 75px;
}
.promo_winter_classes_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -932px -782px;
+ background-position: -706px -1316px;
width: 360px;
height: 90px;
}
.promo_winter_classes_2017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -782px;
+ background-position: -376px -782px;
width: 432px;
height: 144px;
}
.promo_winter_fireworks {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1203px -1078px;
+ background-position: -1848px -1051px;
width: 138px;
height: 147px;
}
.promo_winterclasses2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1517px;
+ background-position: -208px -1514px;
width: 325px;
height: 110px;
}
.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -707px -927px;
+ background-position: -142px -969px;
width: 140px;
height: 441px;
}
.customize-option.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -732px -942px;
+ background-position: -167px -984px;
width: 60px;
height: 60px;
}
.promo_winteryhair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -904px -1517px;
+ background-position: -1679px -743px;
width: 152px;
height: 75px;
}
.avatar_variety {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -433px -782px;
+ background-position: -809px -782px;
width: 498px;
height: 95px;
}
.npc_viirus {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -220px -1779px;
+ background-position: -908px -1695px;
width: 108px;
height: 90px;
}
@@ -330,7 +348,7 @@
}
.promo_backtoschool {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -926px;
+ background-position: -1848px -604px;
width: 150px;
height: 150px;
}
@@ -342,19 +360,19 @@
}
.promo_startingover {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -302px -1628px;
+ background-position: -1848px -151px;
width: 150px;
height: 150px;
}
.promo_valentines {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -310px -1369px;
+ background-position: -1188px -1120px;
width: 309px;
height: 147px;
}
.promo_working_out {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px 0px;
+ background-position: -1538px -148px;
width: 300px;
height: 150px;
}
@@ -366,13 +384,13 @@
}
.scene_buying_rewards {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -745px;
+ background-position: 0px -1514px;
width: 207px;
height: 180px;
}
.scene_coding {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -151px -1628px;
+ background-position: -1848px -302px;
width: 150px;
height: 150px;
}
@@ -384,7 +402,7 @@
}
.scene_eco_friendly {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -573px;
+ background-position: -1538px -1186px;
width: 222px;
height: 171px;
}
@@ -408,13 +426,13 @@
}
.scene_meditation {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1628px;
+ background-position: -1848px 0px;
width: 150px;
height: 150px;
}
.scene_phone_peek {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -1077px;
+ background-position: -1848px -453px;
width: 150px;
height: 150px;
}
@@ -426,7 +444,7 @@
}
.scene_todos {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -181px;
+ background-position: -947px -1120px;
width: 240px;
height: 195px;
}
@@ -436,21 +454,3 @@
width: 339px;
height: 342px;
}
-.welcome_basic_avatars {
- background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1204px;
- width: 246px;
- height: 165px;
-}
-.welcome_promo_party {
- background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px 0px;
- width: 270px;
- height: 180px;
-}
-.welcome_sample_tasks {
- background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1038px;
- width: 246px;
- height: 165px;
-}
diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-1.png b/website/assets/sprites/dist/spritesmith-largeSprites-1.png
index 2c215e63c9..dfaaee2cd5 100644
Binary files a/website/assets/sprites/dist/spritesmith-largeSprites-1.png and b/website/assets/sprites/dist/spritesmith-largeSprites-1.png differ
diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-2.css b/website/assets/sprites/dist/spritesmith-largeSprites-2.css
new file mode 100644
index 0000000000..6b5e289422
--- /dev/null
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-2.css
@@ -0,0 +1,18 @@
+.welcome_basic_avatars {
+ background-image: url(/static/sprites/spritesmith-largeSprites-2.png);
+ background-position: -271px 0px;
+ width: 246px;
+ height: 165px;
+}
+.welcome_promo_party {
+ background-image: url(/static/sprites/spritesmith-largeSprites-2.png);
+ background-position: 0px 0px;
+ width: 270px;
+ height: 180px;
+}
+.welcome_sample_tasks {
+ background-image: url(/static/sprites/spritesmith-largeSprites-2.png);
+ background-position: 0px -181px;
+ width: 246px;
+ height: 165px;
+}
diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-2.png b/website/assets/sprites/dist/spritesmith-largeSprites-2.png
new file mode 100644
index 0000000000..a7944aeb8b
Binary files /dev/null and b/website/assets/sprites/dist/spritesmith-largeSprites-2.png differ
diff --git a/website/assets/sprites/spritesmith_large/promo/promo_seafoam.png b/website/assets/sprites/spritesmith_large/promo/promo_seafoam.png
new file mode 100644
index 0000000000..9a2a2b76eb
Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_seafoam.png differ
diff --git a/website/assets/sprites/spritesmith_large/promo/promo_splashy_skins.png b/website/assets/sprites/spritesmith_large/promo/promo_splashy_skins.png
new file mode 100644
index 0000000000..44ed12f1c9
Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_splashy_skins.png differ
diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-1.css b/website/client/assets/css/sprites/spritesmith-largeSprites-1.css
index 1e529a68ad..3c0ef88dfb 100644
--- a/website/client/assets/css/sprites/spritesmith-largeSprites-1.css
+++ b/website/client/assets/css/sprites/spritesmith-largeSprites-1.css
@@ -1,12 +1,12 @@
.promo_mystery_201702 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -742px;
+ background-position: -1538px -890px;
width: 279px;
height: 147px;
}
.promo_mystery_201703 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -151px;
+ background-position: -1538px -299px;
width: 282px;
height: 147px;
}
@@ -18,85 +18,85 @@
}
.promo_mystery_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -299px;
+ background-position: -1538px -447px;
width: 282px;
height: 147px;
}
.promo_mystery_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1278px -1226px;
+ background-position: -796px -1695px;
width: 111px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -1228px;
+ background-position: -578px -1695px;
width: 217px;
height: 90px;
}
.promo_new_hair_fall2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -425px -927px;
+ background-position: -565px -969px;
width: 140px;
height: 441px;
}
.promo_orca {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -114px -1779px;
+ background-position: -1254px -589px;
width: 105px;
height: 105px;
}
.promo_partyhats {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1459px;
+ background-position: -1679px -819px;
width: 115px;
height: 47px;
}
.promo_pastel_skin {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -983px -1369px;
+ background-position: -793px -1411px;
width: 330px;
height: 83px;
}
.customize-option.promo_pastel_skin {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1008px -1384px;
+ background-position: -818px -1426px;
width: 60px;
height: 60px;
}
.promo_pastel_skin_hair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -848px -1078px;
+ background-position: -1107px -969px;
width: 354px;
height: 147px;
}
.customize-option.promo_pastel_skin_hair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -873px -1093px;
+ background-position: -1132px -984px;
width: 60px;
height: 60px;
}
.promo_peppermint_flame {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1249px -927px;
+ background-position: -1848px -755px;
width: 140px;
height: 147px;
}
.promo_pet_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1254px -589px;
+ background-position: -1848px -903px;
width: 140px;
height: 147px;
}
.customize-option.promo_pet_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1279px -604px;
+ background-position: -1873px -918px;
width: 60px;
height: 60px;
}
.promo_pyromancer {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1779px;
+ background-position: -1848px -1642px;
width: 113px;
height: 113px;
}
@@ -106,111 +106,129 @@
width: 92px;
height: 103px;
}
+.promo_seafoam {
+ background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+ background-position: -1396px -442px;
+ width: 141px;
+ height: 441px;
+}
.promo_seasonal_shop_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -890px;
+ background-position: -1538px -1038px;
width: 279px;
height: 147px;
}
.promo_shimmer_hair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1314px -1369px;
+ background-position: -1067px -1316px;
width: 330px;
height: 83px;
}
.promo_shimmer_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -927px;
+ background-position: 0px -969px;
width: 141px;
height: 441px;
}
.promo_shinySeeds {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -142px -927px;
+ background-position: -1396px 0px;
width: 141px;
height: 441px;
}
+.promo_splashy_skins {
+ background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+ background-position: 0px -782px;
+ width: 375px;
+ height: 186px;
+}
+.customize-option.promo_splashy_skins {
+ background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+ background-position: -25px -797px;
+ width: 60px;
+ height: 60px;
+}
.promo_splashyskins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -453px -1628px;
+ background-position: 0px -1786px;
width: 198px;
height: 91px;
}
.customize-option.promo_splashyskins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -478px -1643px;
+ background-position: -25px -1801px;
width: 60px;
height: 60px;
}
.promo_spooky_sparkles_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -447px;
+ background-position: -1538px -595px;
width: 140px;
height: 294px;
}
.promo_spring_classes_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -620px -1369px;
+ background-position: -430px -1411px;
width: 362px;
height: 102px;
}
.promo_spring_classes_2017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1369px;
+ background-position: -1538px 0px;
width: 309px;
height: 147px;
}
.promo_springclasses2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -615px -1517px;
+ background-position: 0px -1695px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -326px -1517px;
+ background-position: -289px -1695px;
width: 288px;
height: 90px;
}
.promo_staff_spotlight_Lemoness {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1808px -595px;
+ background-position: -1848px -1347px;
width: 102px;
height: 146px;
}
.promo_staff_spotlight_Viirus {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1547px -926px;
+ background-position: -1848px -1199px;
width: 119px;
height: 147px;
}
.promo_staff_spotlight_paglias {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1547px -1077px;
+ background-position: -1848px -1494px;
width: 99px;
height: 147px;
}
.promo_steampunk_3017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -566px -927px;
+ background-position: -283px -969px;
width: 140px;
height: 441px;
}
.promo_summer_classes_2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -848px -1226px;
+ background-position: 0px -1411px;
width: 429px;
height: 102px;
}
.promo_summer_classes_2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1370px;
+ background-position: -534px -1514px;
width: 300px;
height: 88px;
}
.promo_summer_classes_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -848px -927px;
+ background-position: -706px -969px;
width: 400px;
height: 150px;
}
@@ -222,103 +240,103 @@
}
.promo_takeThis_gear {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -767px -1628px;
+ background-position: -835px -1514px;
width: 114px;
height: 87px;
}
.promo_takethis_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -652px -1628px;
+ background-position: -950px -1514px;
width: 114px;
height: 87px;
}
.promo_task_planning {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -377px;
+ background-position: -706px -1120px;
width: 240px;
height: 195px;
}
.promo_turkey_day_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -284px -927px;
+ background-position: -424px -969px;
width: 140px;
height: 441px;
}
.promo_unconventional_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1604px -745px;
+ background-position: -1761px -1261px;
width: 60px;
height: 60px;
}
.promo_unconventional_armor2 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1183px -277px;
+ background-position: -1761px -1186px;
width: 70px;
height: 74px;
}
.promo_updos {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1808px -447px;
+ background-position: -1679px -595px;
width: 156px;
height: 147px;
}
.promo_veteran_pets {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1057px -1517px;
+ background-position: -1124px -1411px;
width: 146px;
height: 75px;
}
.promo_winter_classes_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -932px -782px;
+ background-position: -706px -1316px;
width: 360px;
height: 90px;
}
.promo_winter_classes_2017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -782px;
+ background-position: -376px -782px;
width: 432px;
height: 144px;
}
.promo_winter_fireworks {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1203px -1078px;
+ background-position: -1848px -1051px;
width: 138px;
height: 147px;
}
.promo_winterclasses2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1517px;
+ background-position: -208px -1514px;
width: 325px;
height: 110px;
}
.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -707px -927px;
+ background-position: -142px -969px;
width: 140px;
height: 441px;
}
.customize-option.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -732px -942px;
+ background-position: -167px -984px;
width: 60px;
height: 60px;
}
.promo_winteryhair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -904px -1517px;
+ background-position: -1679px -743px;
width: 152px;
height: 75px;
}
.avatar_variety {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -433px -782px;
+ background-position: -809px -782px;
width: 498px;
height: 95px;
}
.npc_viirus {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -220px -1779px;
+ background-position: -908px -1695px;
width: 108px;
height: 90px;
}
@@ -330,7 +348,7 @@
}
.promo_backtoschool {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -926px;
+ background-position: -1848px -604px;
width: 150px;
height: 150px;
}
@@ -342,19 +360,19 @@
}
.promo_startingover {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -302px -1628px;
+ background-position: -1848px -151px;
width: 150px;
height: 150px;
}
.promo_valentines {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -310px -1369px;
+ background-position: -1188px -1120px;
width: 309px;
height: 147px;
}
.promo_working_out {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px 0px;
+ background-position: -1538px -148px;
width: 300px;
height: 150px;
}
@@ -366,13 +384,13 @@
}
.scene_buying_rewards {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -745px;
+ background-position: 0px -1514px;
width: 207px;
height: 180px;
}
.scene_coding {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -151px -1628px;
+ background-position: -1848px -302px;
width: 150px;
height: 150px;
}
@@ -384,7 +402,7 @@
}
.scene_eco_friendly {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -573px;
+ background-position: -1538px -1186px;
width: 222px;
height: 171px;
}
@@ -408,13 +426,13 @@
}
.scene_meditation {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: 0px -1628px;
+ background-position: -1848px 0px;
width: 150px;
height: 150px;
}
.scene_phone_peek {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -1077px;
+ background-position: -1848px -453px;
width: 150px;
height: 150px;
}
@@ -426,7 +444,7 @@
}
.scene_todos {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px -181px;
+ background-position: -947px -1120px;
width: 240px;
height: 195px;
}
@@ -436,21 +454,3 @@
width: 339px;
height: 342px;
}
-.welcome_basic_avatars {
- background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1204px;
- width: 246px;
- height: 165px;
-}
-.welcome_promo_party {
- background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1396px 0px;
- width: 270px;
- height: 180px;
-}
-.welcome_sample_tasks {
- background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
- background-position: -1667px -1038px;
- width: 246px;
- height: 165px;
-}
diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-2.css b/website/client/assets/css/sprites/spritesmith-largeSprites-2.css
new file mode 100644
index 0000000000..6b5e289422
--- /dev/null
+++ b/website/client/assets/css/sprites/spritesmith-largeSprites-2.css
@@ -0,0 +1,18 @@
+.welcome_basic_avatars {
+ background-image: url(/static/sprites/spritesmith-largeSprites-2.png);
+ background-position: -271px 0px;
+ width: 246px;
+ height: 165px;
+}
+.welcome_promo_party {
+ background-image: url(/static/sprites/spritesmith-largeSprites-2.png);
+ background-position: 0px 0px;
+ width: 270px;
+ height: 180px;
+}
+.welcome_sample_tasks {
+ background-image: url(/static/sprites/spritesmith-largeSprites-2.png);
+ background-position: 0px -181px;
+ width: 246px;
+ height: 165px;
+}
diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js
index ae030199ac..5a3e978133 100644
--- a/website/common/script/content/appearance/sets.js
+++ b/website/common/script/content/appearance/sets.js
@@ -18,6 +18,6 @@ module.exports = prefill({
pastelSkins: {setPrice: 5, availableUntil: '2017-05-02', text: t('pastelSkins')},
spookySkins: {setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins')},
supernaturalSkins: {setPrice: 5, availableUntil: '2016-11-01', text: t('supernaturalSkins')},
- splashySkins: {setPrice: 5, availableUntil: '2016-01-01', text: t('splashySkins')},
+ splashySkins: {setPrice: 5, availableUntil: '2017-08-02', text: t('splashySkins')},
winterySkins: {setPrice: 5, availableFrom: '2015-12-18', availableUntil: '2016-02-02', text: t('winterySkins')},
});
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index e0bca9e112..e65af41c61 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -312,6 +312,7 @@ shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, lang
};
const AVAILABLE_SPELLS = [
+ 'seafoam',
];
const AVAILABLE_QUESTS = [
diff --git a/website/static/sprites/spritesmith-largeSprites-1.png b/website/static/sprites/spritesmith-largeSprites-1.png
index 2c215e63c9..dfaaee2cd5 100644
Binary files a/website/static/sprites/spritesmith-largeSprites-1.png and b/website/static/sprites/spritesmith-largeSprites-1.png differ
diff --git a/website/static/sprites/spritesmith-largeSprites-2.png b/website/static/sprites/spritesmith-largeSprites-2.png
new file mode 100644
index 0000000000..a7944aeb8b
Binary files /dev/null and b/website/static/sprites/spritesmith-largeSprites-2.png differ
diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade
index fb82c3024b..01f212560b 100644
--- a/website/views/options/inventory/seasonal-shop.jade
+++ b/website/views/options/inventory/seasonal-shop.jade
@@ -19,7 +19,7 @@
div
| {{item.value}}
span(ng-class="{ 'shop_gold': item.currency === 'gold', 'Pet_Currency_Gem1x inline-gems': item.currency === 'gems'}")
- div(ng-if='category.identifier === "spells"')
+ // div(ng-if='category.identifier === "spells"')
button.customize-option(class='inventory_special_nye',
popover='{{::Content.spells.special.nye.notes()}}',
popover-title='{{::Content.spells.special.nye.text()}}',
diff --git a/website/views/options/profile/index.jade b/website/views/options/profile/index.jade
index 2aae385253..c9ed3f2cec 100644
--- a/website/views/options/profile/index.jade
+++ b/website/views/options/profile/index.jade
@@ -176,7 +176,7 @@ mixin customizeProfile(mobile)
+buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled')
+buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled')
+buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins', 'disabled')
- +buyPref('skin', ['clownfish','deepocean','merblue','mergold','mergreen','merruby','shark','tropicalwater'], 'splashySkins', 'disabled')
+ +buyPref('skin', ['clownfish','deepocean','merblue','mergold','mergreen','merruby','shark','tropicalwater'], 'splashySkins')
+buyPref('skin', ['aurora','dapper','festive','holly','polar','sugar','snowy','winterstar'], 'winterySkins', 'disabled')
include ./achievements
diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade
index 8c443ac564..f2935eac48 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,29 +1,54 @@
-.promo_backgrounds_armoire_201707.pull-right
-h2 7/3/2017 - JULY BACKGROUNDS, ARMOIRE ITEMS, AND TAKE THIS CHALLENGE
+.scene_dailies.pull-right
+h2 7/5/2017 - RECORD YESTERDAY'S ACTIVITY, SPLASHY SKINS, AND SEAFOAM
hr
tr
td
- h3 July Backgrounds and Armoire Items!
- p We’ve added three new backgrounds to the Background Shop! Now your avatar can lounge in a Seashell, swim through a Kelp Forest, and rest by a Midnight Lake.
- br
- p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Swan Dancer. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
- p.small.muted by Manostion, Lilith of Alfheim, Reesachan, and AnnDeLune
+ h3 Record Yesterday's Activity
+ p Great news! We've added a new feature to protect you if you accidentally forget to check off some of the previous day's Dailies. Now the first time that you sign into Habitica each day, a pop-up will let you note any Dailies that you completed but weren't able to check off. Record Yesterday's Activity will be automatically available on the Habitica website, as well as on our iOS and Android apps! There's nothing you need to do to enable the feature aside from updating to the most recent version of the apps. We hope this helps you get even more out of your Dailies list. Enjoy your added productivity!
+ p.small.muted by TheHollidayInn, SabreCat, Alys, viirus, and all our awesome testers!
tr
td
- .promo_takeThis_gear.pull-left.slight-right-margin
- h3 New Take This Challenge!
- p The next Take This Challenge has launched, "Test Thy Courage!", with a focus on positive social interactions. Be sure to check it out to earn additional pieces of the Take This armor set!
+ .promo_splashy_skins.center-block
+ .promo_seafoam.pull-left.slight-right-margin
+ h3 Splashy Skins
+ p The Seasonal Edition Splashy Skins are available until July 31st! You can complete your summer avatar look with Clownfish, Deep Ocean, Tropical Water, Mergold, Mergreen, Merblue, Merruby, and Shark Skins.
br
- p Take This is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.
+ p This Seasonal Edition customization set will only be available to purchase until July 31st, after which they'll be gone until next year, so be sure to swoop them up now!
+ p.small.muted by Lemoness and UncommonCriminal
+ tr
+ td
+ h3 Seafoam
+ p Throw some Seafoam at your friends and they will turn into a cheerful sea star until their next cron! You can buy the Seafoam in the Seasonal Shop for gold. Plus, you and your pal will both receive the Aquatic Friends badge!
br
- p Congratulations to the winners of the last Take This Challenge, "I Am the Night!": grand prize winner Chandramani Adil, and runners-up racherinh, auburntouch, lavraiedre, celedine, and 长颈鹿的尾巴. Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't already completed it. It is located in your Rewards column. Enjoy!
- p.small.muted by Doctor B, the Take This team, Lemoness, and SabreCat
+ p Don't want to be a sea star? Just buy some Sand from the Rewards Store to reverse it.
+ br
+ p Seafoam will be available in the Seasonal Shop until July 31st!
+ p.small.muted by Lemoness
if menuItem !== 'oldNews'
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ h2 7/3/2017 - JULY BACKGROUNDS, ARMOIRE ITEMS, AND TAKE THIS CHALLENGE
+ .promo_backgrounds_armoire_201707.pull-right
+ tr
+ td
+ h3 July Backgrounds and Armoire Items!
+ p We’ve added three new backgrounds to the Background Shop! Now your avatar can lounge in a Seashell, swim through a Kelp Forest, and rest by a Midnight Lake.
+ br
+ p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Swan Dancer. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+ p.small.muted by Manostion, Lilith of Alfheim, Reesachan, and AnnDeLune
+ tr
+ td
+ .promo_takeThis_gear.pull-left.slight-right-margin
+ h3 New Take This Challenge!
+ p The next Take This Challenge has launched, "Test Thy Courage!", with a focus on positive social interactions. Be sure to check it out to earn additional pieces of the Take This armor set!
+ br
+ p Take This is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.
+ br
+ p Congratulations to the winners of the last Take This Challenge, "I Am the Night!": grand prize winner Chandramani Adil, and runners-up racherinh, auburntouch, lavraiedre, celedine, and 长颈鹿的尾巴. Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't already completed it. It is located in your Rewards column. Enjoy!
+ p.small.muted by Doctor B, the Take This team, Lemoness, and SabreCat
h2 6/29/2017 - AQUATIC HATCHING POTIONS AND LAST CHANCE FOR JUNE SUBSCRIBER ITEMS
.promo_aquatic_potions.pull-right
tr