Merge remote-tracking branch 'upstream/release' into yesterdailies-3

This commit is contained in:
Keith Holliday 2017-07-03 09:46:34 -05:00
commit 71d632f6f0
321 changed files with 8250 additions and 7643 deletions

18
Dockerfile-prod Normal file
View file

@ -0,0 +1,18 @@
FROM node:boron
# Install global packages
RUN npm install -g gulp grunt-cli bower mocha
# Clone Habitica repo and install dependencies
RUN mkdir -p /usr/src/habitrpg
WORKDIR /usr/src/habitrpg
RUN git clone --branch v3.99.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
RUN npm install
RUN bower install --allow-root
# Create Build dir
RUN mkdir -p ./website/build
# Start Habitica
EXPOSE 3000
CMD ["npm", "start"]

2
npm-shrinkwrap.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "3.98.1",
"version": "3.99.1",
"dependencies": {
"@gulp-sourcemaps/map-sources": {
"version": "1.0.0",

View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "3.98.1",
"version": "3.99.1",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",

View file

@ -596,7 +596,7 @@ describe('Purchasing a group plan for group', () => {
let updatedUser = await User.findById(recipient._id).exec();
expect(updatedUser.purchased.plan.extraMonths).to.within(7, 8);
expect(updatedUser.purchased.plan.extraMonths).to.within(7, 9);
});
it('adds months to members with existing recurring subscription and ignores existing negative extraMonths', async () => {

View file

@ -1,7 +1,7 @@
import axios from 'axios';
import generateStore from 'client/store';
describe('tasks actions', () => {
describe('user actions', () => {
let store;
beforeEach(() => {

View file

@ -1,30 +1,36 @@
.promo_android {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -180px;
background-position: -1712px -356px;
width: 175px;
height: 175px;
}
.promo_aquatic_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -982px -148px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201602 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -563px -1042px;
background-position: -704px -1042px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201603 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -847px -1042px;
background-position: -846px -1042px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201604 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -282px -1042px;
background-position: -1432px -442px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201605 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1150px 0px;
background-position: -282px -1042px;
width: 140px;
height: 441px;
}
@ -42,67 +48,67 @@
}
.promo_backgrounds_armoire_201608 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -994px -600px;
background-position: -423px -1042px;
width: 140px;
height: 439px;
}
.promo_backgrounds_armoire_201609 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -423px -1042px;
background-position: -564px -1042px;
width: 139px;
height: 438px;
}
.promo_backgrounds_armoire_201610 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1291px 0px;
background-position: -1291px -442px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201611 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1291px -442px;
background-position: -1291px 0px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201612 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1432px 0px;
background-position: -1150px -442px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201701 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px -1042px;
background-position: -1150px 0px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201702 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -568px -600px;
background-position: -852px -600px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201703 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -840px -148px;
background-position: -710px -600px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201704 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -982px -148px;
background-position: -840px -148px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -710px -600px;
background-position: -568px -600px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -142px -600px;
background-position: -426px -600px;
width: 141px;
height: 441px;
}
@ -114,7 +120,7 @@
}
.promo_bundle_feathered {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -426px -600px;
background-position: -142px -600px;
width: 141px;
height: 441px;
}
@ -132,19 +138,19 @@
}
.promo_checkin_incentives {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -705px -1042px;
background-position: -988px -1042px;
width: 141px;
height: 294px;
}
.promo_classes_fall_2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -563px -1337px;
background-position: -704px -1337px;
width: 321px;
height: 100px;
}
.promo_classes_fall_2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -989px -1190px;
background-position: -1130px -1190px;
width: 377px;
height: 99px;
}
@ -162,7 +168,7 @@
}
.promo_contrib_spotlight_Keith {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -903px;
background-position: -1802px -1477px;
width: 87px;
height: 111px;
}
@ -180,19 +186,19 @@
}
.promo_contrib_spotlight_blade {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -791px;
background-position: -1712px -1477px;
width: 89px;
height: 111px;
}
.promo_contrib_spotlight_cantras {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1124px;
background-position: -1573px -900px;
width: 87px;
height: 109px;
}
.promo_contrib_spotlight_dewines {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1015px;
background-position: -1573px -791px;
width: 89px;
height: 108px;
}
@ -210,7 +216,7 @@
}
.promo_cow {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1150px -442px;
background-position: -141px -1042px;
width: 140px;
height: 441px;
}
@ -222,7 +228,7 @@
}
.promo_dilatoryDistress {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1183px -1632px;
background-position: -182px -1632px;
width: 90px;
height: 90px;
}
@ -234,7 +240,7 @@
}
.promo_enchanted_armoire {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -885px -1337px;
background-position: -1026px -1337px;
width: 374px;
height: 76px;
}
@ -252,7 +258,7 @@
}
.promo_enchanted_armoire_201509 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -91px -1632px;
background-position: -637px -1632px;
width: 90px;
height: 90px;
}
@ -264,7 +270,7 @@
}
.promo_enchanted_armoire_201601 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -546px -1632px;
background-position: 0px -1632px;
width: 90px;
height: 90px;
}
@ -282,13 +288,13 @@
}
.promo_ghost_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -141px -1042px;
background-position: -1432px 0px;
width: 140px;
height: 441px;
}
.promo_habitica {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -356px;
background-position: -1712px -180px;
width: 175px;
height: 175px;
}
@ -300,7 +306,7 @@
}
.promo_habitoween_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1432px -442px;
background-position: 0px -1042px;
width: 140px;
height: 441px;
}
@ -312,7 +318,7 @@
}
.promo_holly_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -852px -600px;
background-position: -994px -600px;
width: 141px;
height: 440px;
}
@ -336,13 +342,13 @@
}
.promo_mystery_201405 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -455px -1632px;
background-position: -364px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201406 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1150px -884px;
background-position: -1432px -884px;
width: 90px;
height: 96px;
}
@ -354,13 +360,13 @@
}
.promo_mystery_201408 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1824px -1477px;
background-position: -1507px -1042px;
width: 60px;
height: 71px;
}
.promo_mystery_201409 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px -1632px;
background-position: -1494px -1484px;
width: 90px;
height: 90px;
}
@ -372,7 +378,7 @@
}
.promo_mystery_201411 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -273px -1632px;
background-position: -91px -1632px;
width: 90px;
height: 90px;
}
@ -384,31 +390,31 @@
}
.promo_mystery_201501 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -1568px;
background-position: -1663px -791px;
width: 48px;
height: 63px;
}
.promo_mystery_201502 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -819px -1632px;
background-position: -910px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201503 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1001px -1632px;
background-position: -1092px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201504 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1260px -1337px;
background-position: -1508px -1190px;
width: 60px;
height: 69px;
}
.promo_mystery_201505 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1274px -1632px;
background-position: -1585px -1484px;
width: 90px;
height: 90px;
}
@ -420,31 +426,31 @@
}
.promo_mystery_201507 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1340px;
background-position: -1573px -1222px;
width: 90px;
height: 105px;
}
.promo_mystery_201508 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1306px -1484px;
background-position: -1150px -884px;
width: 93px;
height: 90px;
}
.promo_mystery_201509 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -182px -1632px;
background-position: -273px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201510 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1494px -1484px;
background-position: -1413px -1042px;
width: 93px;
height: 90px;
}
.promo_mystery_201511 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -364px -1632px;
background-position: -455px -1632px;
width: 90px;
height: 90px;
}
@ -462,37 +468,37 @@
}
.promo_mystery_201602 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -637px -1632px;
background-position: -728px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201603 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -728px -1632px;
background-position: -819px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201604 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1461px -1190px;
background-position: -1306px -1484px;
width: 93px;
height: 90px;
}
.promo_mystery_201605 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -910px -1632px;
background-position: -1001px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201606 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1432px -884px;
background-position: -1573px -1010px;
width: 90px;
height: 105px;
}
.promo_mystery_201607 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1092px -1632px;
background-position: -546px -1632px;
width: 90px;
height: 90px;
}
@ -504,7 +510,7 @@
}
.promo_mystery_201609 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1367px -1190px;
background-position: -1291px -884px;
width: 93px;
height: 90px;
}
@ -516,7 +522,7 @@
}
.promo_mystery_201611 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1291px -884px;
background-position: -1573px -1328px;
width: 90px;
height: 99px;
}
@ -528,7 +534,7 @@
}
.promo_mystery_201701 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1234px;
background-position: -1573px -1116px;
width: 90px;
height: 105px;
}
@ -540,25 +546,7 @@
}
.promo_mystery_201703 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -989px -1042px;
background-position: -1130px -1042px;
width: 282px;
height: 147px;
}
.promo_mystery_201704 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1588px -1484px;
width: 90px;
height: 90px;
}
.promo_mystery_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1272px -1042px;
width: 282px;
height: 147px;
}
.promo_mystery_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -1477px;
width: 111px;
height: 90px;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 984 KiB

After

Width:  |  Height:  |  Size: 932 KiB

View file

@ -1,12 +1,30 @@
.promo_mystery_201704 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -833px -343px;
width: 90px;
height: 90px;
}
.promo_mystery_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -151px;
width: 282px;
height: 147px;
}
.promo_mystery_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1547px -1177px;
width: 111px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -615px -1517px;
background-position: -904px -1517px;
width: 217px;
height: 90px;
}
.promo_new_hair_fall2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -707px -927px;
background-position: -425px -927px;
width: 140px;
height: 441px;
}
@ -18,7 +36,7 @@
}
.promo_partyhats {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1459px;
background-position: -1547px -1268px;
width: 115px;
height: 47px;
}
@ -72,13 +90,13 @@
}
.promo_rainbow_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1875px -1098px;
background-position: -1875px -1246px;
width: 92px;
height: 103px;
}
.promo_seasonal_shop_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -446px;
background-position: -1667px -594px;
width: 279px;
height: 147px;
}
@ -114,7 +132,7 @@
}
.promo_spooky_sparkles_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -151px;
background-position: -1667px -299px;
width: 140px;
height: 294px;
}
@ -132,19 +150,19 @@
}
.promo_springclasses2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1368px;
background-position: -326px -1517px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -326px -1517px;
background-position: -615px -1517px;
width: 288px;
height: 90px;
}
.promo_staff_spotlight_Lemoness {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1808px -299px;
background-position: -1808px -447px;
width: 102px;
height: 146px;
}
@ -162,7 +180,7 @@
}
.promo_steampunk_3017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -425px -927px;
background-position: -566px -927px;
width: 140px;
height: 441px;
}
@ -174,7 +192,7 @@
}
.promo_summer_classes_2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1279px;
background-position: -1667px -1427px;
width: 300px;
height: 88px;
}
@ -192,13 +210,13 @@
}
.promo_takeThis_gear {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1547px -1177px;
background-position: -1278px -1226px;
width: 114px;
height: 87px;
}
.promo_takethis_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1278px -1226px;
background-position: -199px -1628px;
width: 114px;
height: 87px;
}
@ -216,25 +234,25 @@
}
.promo_unconventional_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1890px -1001px;
background-position: -1890px -1149px;
width: 60px;
height: 60px;
}
.promo_unconventional_armor2 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1890px -926px;
background-position: -1890px -1074px;
width: 70px;
height: 74px;
}
.promo_updos {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1808px -151px;
background-position: -1808px -299px;
width: 156px;
height: 147px;
}
.promo_veteran_pets {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -986px -1517px;
background-position: -1275px -1517px;
width: 146px;
height: 75px;
}
@ -264,19 +282,19 @@
}
.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -566px -927px;
background-position: -707px -927px;
width: 140px;
height: 441px;
}
.customize-option.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -591px -942px;
background-position: -732px -942px;
width: 60px;
height: 60px;
}
.promo_winteryhair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -833px -1517px;
background-position: -1122px -1517px;
width: 152px;
height: 75px;
}
@ -288,7 +306,7 @@
}
.npc_viirus {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -199px -1628px;
background-position: 0px -1720px;
width: 108px;
height: 90px;
}
@ -300,7 +318,7 @@
}
.promo_backtoschool {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -573px;
background-position: -1396px -875px;
width: 150px;
height: 150px;
}
@ -312,7 +330,7 @@
}
.promo_startingover {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -875px;
background-position: -1396px -573px;
width: 150px;
height: 150px;
}
@ -336,13 +354,13 @@
}
.scene_buying_rewards {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1098px;
background-position: -1667px -1246px;
width: 207px;
height: 180px;
}
.scene_coding {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -1177px;
background-position: -1396px -1026px;
width: 150px;
height: 150px;
}
@ -354,7 +372,7 @@
}
.scene_eco_friendly {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -926px;
background-position: -1667px -1074px;
width: 222px;
height: 171px;
}
@ -384,7 +402,7 @@
}
.scene_phone_peek {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -1026px;
background-position: -1396px -1177px;
width: 150px;
height: 150px;
}
@ -408,7 +426,7 @@
}
.welcome_basic_avatars {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -760px;
background-position: -1667px -908px;
width: 246px;
height: 165px;
}
@ -420,7 +438,7 @@
}
.welcome_sample_tasks {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -594px;
background-position: -1667px -742px;
width: 246px;
height: 165px;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 944 KiB

After

Width:  |  Height:  |  Size: 961 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 158 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 128 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 163 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 142 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 160 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 147 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 KiB

After

Width:  |  Height:  |  Size: 181 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 165 KiB

View file

@ -1,138 +1,414 @@
.Pet-Wolf-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
.Pet-Turtle-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px 0px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Base {
.Pet-Turtle-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -400px;
width: 81px;
height: 99px;
}
.Pet-Turtle-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px 0px;
width: 81px;
height: 99px;
}
.Pet-Turtle-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -100px;
width: 81px;
height: 99px;
}
.Pet-Turtle-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Aquatic {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Cupid {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Fairy {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Floral {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Ghost {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Holly {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Peppermint {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shimmer {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Spooky {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Veteran {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -500px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Aquatic {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -490px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -49px -100px;
background-position: -49px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -98px -100px;
background-position: -98px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Cupid {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px 0px;
background-position: -147px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -52px;
background-position: -196px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Fairy {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -152px;
background-position: -245px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Floral {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -49px -152px;
background-position: -294px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Ghost {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -98px -152px;
background-position: -343px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -147px -152px;
background-position: -392px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Holly {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px -156px;
background-position: -441px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Peppermint {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -213px -52px;
background-position: -574px -500px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Purple {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -213px -104px;
background-position: -539px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -204px;
background-position: -588px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -49px -204px;
background-position: -656px 0px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -98px -204px;
background-position: -656px -52px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shimmer {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -147px -204px;
background-position: -656px -104px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -196px -204px;
background-position: -656px -156px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Spooky {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px 0px;
background-position: -656px -208px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px -52px;
background-position: -656px -260px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px -104px;
background-position: -656px -312px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -213px 0px;
background-position: -656px -364px;
width: 48px;
height: 51px;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View file

@ -1474,252 +1474,258 @@
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Base {
.Mount_Body_BearCub-Aquatic {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-CottonCandyBlue {
.Mount_Body_BearCub-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-CottonCandyPink {
.Mount_Body_BearCub-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Cupid {
.Mount_Body_BearCub-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Desert {
.Mount_Body_BearCub-Cupid {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Fairy {
.Mount_Body_BearCub-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Floral {
.Mount_Body_BearCub-Fairy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Ghost {
.Mount_Body_BearCub-Floral {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Golden {
.Mount_Body_BearCub-Ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -1166px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Holly {
.Mount_Body_BearCub-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Peppermint {
.Mount_Body_BearCub-Holly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Polar {
.Mount_Body_BearCub-Peppermint {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Red {
.Mount_Body_BearCub-Polar {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-RoyalPurple {
.Mount_Body_BearCub-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Shade {
.Mount_Body_BearCub-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Shimmer {
.Mount_Body_BearCub-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Skeleton {
.Mount_Body_BearCub-Shimmer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Spooky {
.Mount_Body_BearCub-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Thunderstorm {
.Mount_Body_BearCub-Spooky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-White {
.Mount_Body_BearCub-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Zombie {
.Mount_Body_BearCub-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1272px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Base {
.Mount_Body_BearCub-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1166px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-CottonCandyBlue {
.Mount_Body_Beetle-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1060px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-CottonCandyPink {
.Mount_Body_Beetle-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Desert {
.Mount_Body_Beetle-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Golden {
.Mount_Body_Beetle-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Red {
.Mount_Body_Beetle-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Shade {
.Mount_Body_Beetle-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Skeleton {
.Mount_Body_Beetle-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-White {
.Mount_Body_Beetle-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Zombie {
.Mount_Body_Beetle-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Base {
.Mount_Body_Beetle-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-CottonCandyBlue {
.Mount_Body_Bunny-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-CottonCandyPink {
.Mount_Body_Bunny-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Desert {
.Mount_Body_Bunny-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Golden {
.Mount_Body_Bunny-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Red {
.Mount_Body_Bunny-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Shade {
.Mount_Body_Bunny-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Skeleton {
.Mount_Body_Bunny-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-White {
.Mount_Body_Bunny-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Zombie {
.Mount_Body_Bunny-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Butterfly-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -440px;
@ -1780,246 +1786,252 @@
width: 105px;
height: 123px;
}
.Mount_Body_Cactus-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-CottonCandyBlue {
.Mount_Body_Cactus-Aquatic {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-CottonCandyPink {
.Mount_Body_Cactus-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Cupid {
.Mount_Body_Cactus-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Desert {
.Mount_Body_Cactus-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Fairy {
.Mount_Body_Cactus-Cupid {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Floral {
.Mount_Body_Cactus-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Ghost {
.Mount_Body_Cactus-Fairy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Golden {
.Mount_Body_Cactus-Floral {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Holly {
.Mount_Body_Cactus-Ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Peppermint {
.Mount_Body_Cactus-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Red {
.Mount_Body_Cactus-Holly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-RoyalPurple {
.Mount_Body_Cactus-Peppermint {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shade {
.Mount_Body_Cactus-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shimmer {
.Mount_Body_Cactus-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Skeleton {
.Mount_Body_Cactus-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1060px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Spooky {
.Mount_Body_Cactus-Shimmer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Thunderstorm {
.Mount_Body_Cactus-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-White {
.Mount_Body_Cactus-Spooky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Zombie {
.Mount_Body_Cactus-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Base {
.Mount_Body_Cactus-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-CottonCandyBlue {
.Mount_Body_Cactus-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-CottonCandyPink {
.Mount_Body_Cheetah-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Desert {
.Mount_Body_Cheetah-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Golden {
.Mount_Body_Cheetah-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Red {
.Mount_Body_Cheetah-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Shade {
.Mount_Body_Cheetah-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Skeleton {
.Mount_Body_Cheetah-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-White {
.Mount_Body_Cheetah-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Zombie {
.Mount_Body_Cheetah-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Base {
.Mount_Body_Cheetah-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-CottonCandyBlue {
.Mount_Body_Cheetah-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-CottonCandyPink {
.Mount_Body_Cow-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Desert {
.Mount_Body_Cow-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Golden {
.Mount_Body_Cow-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Red {
.Mount_Body_Cow-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Shade {
.Mount_Body_Cow-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Skeleton {
.Mount_Body_Cow-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-White {
.Mount_Body_Cow-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Zombie {
.Mount_Body_Cow-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cuttlefish-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -564px;
@ -2082,331 +2094,319 @@
}
.Mount_Body_Deer-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -212px;
background-position: -975px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -106px;
background-position: -848px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px 0px;
background-position: -742px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -785px;
background-position: -636px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -785px;
background-position: -530px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -785px;
background-position: -424px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -785px;
background-position: -318px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -785px;
background-position: -212px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -785px;
background-position: -106px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-CottonCandyPink {
.Mount_Body_Dragon-Aquatic {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Cupid {
.Mount_Body_Dragon-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Desert {
.Mount_Body_Dragon-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Fairy {
.Mount_Body_Dragon-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Floral {
.Mount_Body_Dragon-Cupid {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Ghost {
.Mount_Body_Dragon-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Golden {
.Mount_Body_Dragon-Fairy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Holly {
.Mount_Body_Dragon-Floral {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Peppermint {
.Mount_Body_Dragon-Ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Red {
.Mount_Body_Dragon-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-RoyalPurple {
.Mount_Body_Dragon-Holly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Shade {
.Mount_Body_Dragon-Peppermint {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Shimmer {
.Mount_Body_Dragon-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Skeleton {
.Mount_Body_Dragon-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Spooky {
.Mount_Body_Dragon-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Thunderstorm {
.Mount_Body_Dragon-Shimmer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-White {
.Mount_Body_Dragon-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Zombie {
.Mount_Body_Dragon-Spooky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Base {
.Mount_Body_Dragon-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-CottonCandyBlue {
.Mount_Body_Dragon-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-CottonCandyPink {
.Mount_Body_Dragon-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Desert {
.Mount_Body_Egg-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -564px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Golden {
.Mount_Body_Egg-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1421px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Shade {
.Mount_Body_Egg-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Skeleton {
.Mount_Body_Egg-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-White {
.Mount_Body_Egg-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1166px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Zombie {
.Mount_Body_Egg-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1060px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Base {
.Mount_Body_Egg-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-CottonCandyBlue {
.Mount_Body_Egg-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-CottonCandyPink {
.Mount_Body_Egg-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Desert {
.Mount_Body_Egg-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Golden {
.Mount_Body_Falcon-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Red {
.Mount_Body_Falcon-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -891px;
background-position: -424px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Skeleton {
.Mount_Body_Falcon-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-White {
.Mount_Body_Falcon-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Zombie {
.Mount_Body_Falcon-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Base {
.Mount_Body_Falcon-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-CottonCandyBlue {
.Mount_Body_Falcon-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-CottonCandyPink {
.Mount_Body_Falcon-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Desert {
.Mount_Body_Falcon-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Golden {
.Mount_Body_Falcon-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -106px;
width: 105px;
height: 105px;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 995 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 896 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 969 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 792 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 773 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 704 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 758 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 725 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 804 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 849 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 971 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 985 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -1,19 +1,20 @@
<!-- Entry point component for the entire app -->
<template lang="pug">
#app
app-menu(v-if="userLoggedIn")
.container-fluid(v-if="userLoggedIn")
app-header
router-view
router-view(v-if="!userLoggedIn")
router-view(v-if="!isUserLoggedIn || isStaticPage")
template(v-else)
#loading-screen.h-100.w-100.d-flex.justify-content-center.align-items-center(v-if="!isUserLoaded")
p Loading...
template(v-else)
app-menu
.container-fluid
app-header
router-view
</template>
<script>
import AppMenu from './components/appMenu';
import AppHeader from './components/appHeader';
import axios from 'axios';
import { mapState } from 'client/libs/store';
export default {
name: 'app',
@ -23,44 +24,32 @@ export default {
},
data () {
return {
userLoggedIn: false,
isUserLoaded: false,
};
},
async beforeCreate () {
computed: {
...mapState(['isUserLoggedIn']),
isStaticPage () {
return this.$route.meta.requiresLogin === false ? true : false;
},
},
created () {
// Setup listener for title
this.$store.watch(state => state.title, (title) => {
document.title = title;
});
// Mount the app when user and tasks are loaded
const userDataWatcher = this.$store.watch(state => [state.user.data, state.tasks.data], ([user, tasks]) => {
if (user && user._id && Array.isArray(tasks)) {
userDataWatcher(); // remove the watcher
// this.$mount('#app');
}
});
// @TODO: Move this to store?
let authSettings = localStorage.getItem('habit-mobile-settings');
if (!authSettings) return;
authSettings = JSON.parse(authSettings);
axios.defaults.headers.common['x-api-user'] = authSettings.auth.apiId;
axios.defaults.headers.common['x-api-key'] = authSettings.auth.apiToken;
// Load the user and the user tasks
await Promise.all([
this.$store.dispatch('user:fetch'),
this.$store.dispatch('tasks:fetchUserTasks'),
]).catch((err) => {
console.error('Impossible to fetch user. Copy into localStorage a valid habit-mobile-settings object.', err); // eslint-disable-line no-console
});
this.userLoggedIn = true;
},
mounted () { // Remove the loading screen when the app is mounted
let loadingScreen = document.getElementById('loading-screen');
if (loadingScreen) document.body.removeChild(loadingScreen);
if (this.isUserLoggedIn && !this.isStaticPage) {
// Load the user and the user tasks
Promise.all([
this.$store.dispatch('user:fetch'),
this.$store.dispatch('tasks:fetchUserTasks'),
]).then(() => {
this.isUserLoaded = true;
}).catch((err) => {
console.error('Impossible to fetch user. Clean up localStorage and refresh.', err); // eslint-disable-line no-console
});
}
},
};
</script>

View file

@ -1,30 +1,36 @@
.promo_android {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -180px;
background-position: -1712px -356px;
width: 175px;
height: 175px;
}
.promo_aquatic_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -982px -148px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201602 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -563px -1042px;
background-position: -704px -1042px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201603 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -847px -1042px;
background-position: -846px -1042px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201604 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -282px -1042px;
background-position: -1432px -442px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201605 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1150px 0px;
background-position: -282px -1042px;
width: 140px;
height: 441px;
}
@ -42,67 +48,67 @@
}
.promo_backgrounds_armoire_201608 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -994px -600px;
background-position: -423px -1042px;
width: 140px;
height: 439px;
}
.promo_backgrounds_armoire_201609 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -423px -1042px;
background-position: -564px -1042px;
width: 139px;
height: 438px;
}
.promo_backgrounds_armoire_201610 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1291px 0px;
background-position: -1291px -442px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201611 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1291px -442px;
background-position: -1291px 0px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201612 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1432px 0px;
background-position: -1150px -442px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201701 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px -1042px;
background-position: -1150px 0px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201702 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -568px -600px;
background-position: -852px -600px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201703 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -840px -148px;
background-position: -710px -600px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201704 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -982px -148px;
background-position: -840px -148px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -710px -600px;
background-position: -568px -600px;
width: 141px;
height: 441px;
}
.promo_backgrounds_armoire_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -142px -600px;
background-position: -426px -600px;
width: 141px;
height: 441px;
}
@ -114,7 +120,7 @@
}
.promo_bundle_feathered {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -426px -600px;
background-position: -142px -600px;
width: 141px;
height: 441px;
}
@ -132,19 +138,19 @@
}
.promo_checkin_incentives {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -705px -1042px;
background-position: -988px -1042px;
width: 141px;
height: 294px;
}
.promo_classes_fall_2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -563px -1337px;
background-position: -704px -1337px;
width: 321px;
height: 100px;
}
.promo_classes_fall_2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -989px -1190px;
background-position: -1130px -1190px;
width: 377px;
height: 99px;
}
@ -162,7 +168,7 @@
}
.promo_contrib_spotlight_Keith {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -903px;
background-position: -1802px -1477px;
width: 87px;
height: 111px;
}
@ -180,19 +186,19 @@
}
.promo_contrib_spotlight_blade {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -791px;
background-position: -1712px -1477px;
width: 89px;
height: 111px;
}
.promo_contrib_spotlight_cantras {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1124px;
background-position: -1573px -900px;
width: 87px;
height: 109px;
}
.promo_contrib_spotlight_dewines {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1015px;
background-position: -1573px -791px;
width: 89px;
height: 108px;
}
@ -210,7 +216,7 @@
}
.promo_cow {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1150px -442px;
background-position: -141px -1042px;
width: 140px;
height: 441px;
}
@ -222,7 +228,7 @@
}
.promo_dilatoryDistress {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1183px -1632px;
background-position: -182px -1632px;
width: 90px;
height: 90px;
}
@ -234,7 +240,7 @@
}
.promo_enchanted_armoire {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -885px -1337px;
background-position: -1026px -1337px;
width: 374px;
height: 76px;
}
@ -252,7 +258,7 @@
}
.promo_enchanted_armoire_201509 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -91px -1632px;
background-position: -637px -1632px;
width: 90px;
height: 90px;
}
@ -264,7 +270,7 @@
}
.promo_enchanted_armoire_201601 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -546px -1632px;
background-position: 0px -1632px;
width: 90px;
height: 90px;
}
@ -282,13 +288,13 @@
}
.promo_ghost_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -141px -1042px;
background-position: -1432px 0px;
width: 140px;
height: 441px;
}
.promo_habitica {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -356px;
background-position: -1712px -180px;
width: 175px;
height: 175px;
}
@ -300,7 +306,7 @@
}
.promo_habitoween_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1432px -442px;
background-position: 0px -1042px;
width: 140px;
height: 441px;
}
@ -312,7 +318,7 @@
}
.promo_holly_potions {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -852px -600px;
background-position: -994px -600px;
width: 141px;
height: 440px;
}
@ -336,13 +342,13 @@
}
.promo_mystery_201405 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -455px -1632px;
background-position: -364px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201406 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1150px -884px;
background-position: -1432px -884px;
width: 90px;
height: 96px;
}
@ -354,13 +360,13 @@
}
.promo_mystery_201408 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1824px -1477px;
background-position: -1507px -1042px;
width: 60px;
height: 71px;
}
.promo_mystery_201409 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px -1632px;
background-position: -1494px -1484px;
width: 90px;
height: 90px;
}
@ -372,7 +378,7 @@
}
.promo_mystery_201411 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -273px -1632px;
background-position: -91px -1632px;
width: 90px;
height: 90px;
}
@ -384,31 +390,31 @@
}
.promo_mystery_201501 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -1568px;
background-position: -1663px -791px;
width: 48px;
height: 63px;
}
.promo_mystery_201502 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -819px -1632px;
background-position: -910px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201503 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1001px -1632px;
background-position: -1092px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201504 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1260px -1337px;
background-position: -1508px -1190px;
width: 60px;
height: 69px;
}
.promo_mystery_201505 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1274px -1632px;
background-position: -1585px -1484px;
width: 90px;
height: 90px;
}
@ -420,31 +426,31 @@
}
.promo_mystery_201507 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1340px;
background-position: -1573px -1222px;
width: 90px;
height: 105px;
}
.promo_mystery_201508 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1306px -1484px;
background-position: -1150px -884px;
width: 93px;
height: 90px;
}
.promo_mystery_201509 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -182px -1632px;
background-position: -273px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201510 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1494px -1484px;
background-position: -1413px -1042px;
width: 93px;
height: 90px;
}
.promo_mystery_201511 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -364px -1632px;
background-position: -455px -1632px;
width: 90px;
height: 90px;
}
@ -462,37 +468,37 @@
}
.promo_mystery_201602 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -637px -1632px;
background-position: -728px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201603 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -728px -1632px;
background-position: -819px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201604 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1461px -1190px;
background-position: -1306px -1484px;
width: 93px;
height: 90px;
}
.promo_mystery_201605 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -910px -1632px;
background-position: -1001px -1632px;
width: 90px;
height: 90px;
}
.promo_mystery_201606 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1432px -884px;
background-position: -1573px -1010px;
width: 90px;
height: 105px;
}
.promo_mystery_201607 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1092px -1632px;
background-position: -546px -1632px;
width: 90px;
height: 90px;
}
@ -504,7 +510,7 @@
}
.promo_mystery_201609 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1367px -1190px;
background-position: -1291px -884px;
width: 93px;
height: 90px;
}
@ -516,7 +522,7 @@
}
.promo_mystery_201611 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1291px -884px;
background-position: -1573px -1328px;
width: 90px;
height: 99px;
}
@ -528,7 +534,7 @@
}
.promo_mystery_201701 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1573px -1234px;
background-position: -1573px -1116px;
width: 90px;
height: 105px;
}
@ -540,25 +546,7 @@
}
.promo_mystery_201703 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -989px -1042px;
background-position: -1130px -1042px;
width: 282px;
height: 147px;
}
.promo_mystery_201704 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1588px -1484px;
width: 90px;
height: 90px;
}
.promo_mystery_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1272px -1042px;
width: 282px;
height: 147px;
}
.promo_mystery_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -1712px -1477px;
width: 111px;
height: 90px;
}

View file

@ -1,12 +1,30 @@
.promo_mystery_201704 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -833px -343px;
width: 90px;
height: 90px;
}
.promo_mystery_201705 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -151px;
width: 282px;
height: 147px;
}
.promo_mystery_201706 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1547px -1177px;
width: 111px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -615px -1517px;
background-position: -904px -1517px;
width: 217px;
height: 90px;
}
.promo_new_hair_fall2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -707px -927px;
background-position: -425px -927px;
width: 140px;
height: 441px;
}
@ -18,7 +36,7 @@
}
.promo_partyhats {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1459px;
background-position: -1547px -1268px;
width: 115px;
height: 47px;
}
@ -72,13 +90,13 @@
}
.promo_rainbow_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1875px -1098px;
background-position: -1875px -1246px;
width: 92px;
height: 103px;
}
.promo_seasonal_shop_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -446px;
background-position: -1667px -594px;
width: 279px;
height: 147px;
}
@ -114,7 +132,7 @@
}
.promo_spooky_sparkles_fall_2016 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -151px;
background-position: -1667px -299px;
width: 140px;
height: 294px;
}
@ -132,19 +150,19 @@
}
.promo_springclasses2014 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1368px;
background-position: -326px -1517px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -326px -1517px;
background-position: -615px -1517px;
width: 288px;
height: 90px;
}
.promo_staff_spotlight_Lemoness {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1808px -299px;
background-position: -1808px -447px;
width: 102px;
height: 146px;
}
@ -162,7 +180,7 @@
}
.promo_steampunk_3017 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -425px -927px;
background-position: -566px -927px;
width: 140px;
height: 441px;
}
@ -174,7 +192,7 @@
}
.promo_summer_classes_2015 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1279px;
background-position: -1667px -1427px;
width: 300px;
height: 88px;
}
@ -192,13 +210,13 @@
}
.promo_takeThis_gear {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1547px -1177px;
background-position: -1278px -1226px;
width: 114px;
height: 87px;
}
.promo_takethis_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1278px -1226px;
background-position: -199px -1628px;
width: 114px;
height: 87px;
}
@ -216,25 +234,25 @@
}
.promo_unconventional_armor {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1890px -1001px;
background-position: -1890px -1149px;
width: 60px;
height: 60px;
}
.promo_unconventional_armor2 {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1890px -926px;
background-position: -1890px -1074px;
width: 70px;
height: 74px;
}
.promo_updos {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1808px -151px;
background-position: -1808px -299px;
width: 156px;
height: 147px;
}
.promo_veteran_pets {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -986px -1517px;
background-position: -1275px -1517px;
width: 146px;
height: 75px;
}
@ -264,19 +282,19 @@
}
.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -566px -927px;
background-position: -707px -927px;
width: 140px;
height: 441px;
}
.customize-option.promo_wintery_skins {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -591px -942px;
background-position: -732px -942px;
width: 60px;
height: 60px;
}
.promo_winteryhair {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -833px -1517px;
background-position: -1122px -1517px;
width: 152px;
height: 75px;
}
@ -288,7 +306,7 @@
}
.npc_viirus {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -199px -1628px;
background-position: 0px -1720px;
width: 108px;
height: 90px;
}
@ -300,7 +318,7 @@
}
.promo_backtoschool {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -573px;
background-position: -1396px -875px;
width: 150px;
height: 150px;
}
@ -312,7 +330,7 @@
}
.promo_startingover {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -875px;
background-position: -1396px -573px;
width: 150px;
height: 150px;
}
@ -336,13 +354,13 @@
}
.scene_buying_rewards {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -1098px;
background-position: -1667px -1246px;
width: 207px;
height: 180px;
}
.scene_coding {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -1177px;
background-position: -1396px -1026px;
width: 150px;
height: 150px;
}
@ -354,7 +372,7 @@
}
.scene_eco_friendly {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -926px;
background-position: -1667px -1074px;
width: 222px;
height: 171px;
}
@ -384,7 +402,7 @@
}
.scene_phone_peek {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1396px -1026px;
background-position: -1396px -1177px;
width: 150px;
height: 150px;
}
@ -408,7 +426,7 @@
}
.welcome_basic_avatars {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -760px;
background-position: -1667px -908px;
width: 246px;
height: 165px;
}
@ -420,7 +438,7 @@
}
.welcome_sample_tasks {
background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
background-position: -1667px -594px;
background-position: -1667px -742px;
width: 246px;
height: 165px;
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,138 +1,414 @@
.Pet-Wolf-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
.Pet-Turtle-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px 0px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Base {
.Pet-Turtle-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -400px;
width: 81px;
height: 99px;
}
.Pet-Turtle-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px 0px;
width: 81px;
height: 99px;
}
.Pet-Turtle-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -100px;
width: 81px;
height: 99px;
}
.Pet-Turtle-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Aquatic {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Cupid {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Fairy {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Floral {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Ghost {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Holly {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Peppermint {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -574px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shimmer {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -82px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Spooky {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -246px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Veteran {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -328px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -410px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -492px -500px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Aquatic {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Base {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -490px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -49px -100px;
background-position: -49px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -98px -100px;
background-position: -98px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Cupid {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px 0px;
background-position: -147px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Desert {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -164px -52px;
background-position: -196px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Fairy {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -152px;
background-position: -245px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Floral {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -49px -152px;
background-position: -294px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Ghost {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -98px -152px;
background-position: -343px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Golden {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -147px -152px;
background-position: -392px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Holly {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px -156px;
background-position: -441px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Peppermint {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -213px -52px;
background-position: -574px -500px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Purple {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -213px -104px;
background-position: -539px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Red {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: 0px -204px;
background-position: -588px -600px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -49px -204px;
background-position: -656px 0px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shade {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -98px -204px;
background-position: -656px -52px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shimmer {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -147px -204px;
background-position: -656px -104px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Skeleton {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -196px -204px;
background-position: -656px -156px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Spooky {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px 0px;
background-position: -656px -208px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px -52px;
background-position: -656px -260px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_White {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -262px -104px;
background-position: -656px -312px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Zombie {
background-image: url(/static/sprites/spritesmith-main-18.png);
background-position: -213px 0px;
background-position: -656px -364px;
width: 48px;
height: 51px;
}

View file

@ -1474,252 +1474,258 @@
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Base {
.Mount_Body_BearCub-Aquatic {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-CottonCandyBlue {
.Mount_Body_BearCub-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-CottonCandyPink {
.Mount_Body_BearCub-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Cupid {
.Mount_Body_BearCub-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Desert {
.Mount_Body_BearCub-Cupid {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Fairy {
.Mount_Body_BearCub-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Floral {
.Mount_Body_BearCub-Fairy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Ghost {
.Mount_Body_BearCub-Floral {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1315px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Golden {
.Mount_Body_BearCub-Ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -1166px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Holly {
.Mount_Body_BearCub-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Peppermint {
.Mount_Body_BearCub-Holly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Polar {
.Mount_Body_BearCub-Peppermint {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Red {
.Mount_Body_BearCub-Polar {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-RoyalPurple {
.Mount_Body_BearCub-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Shade {
.Mount_Body_BearCub-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Shimmer {
.Mount_Body_BearCub-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Skeleton {
.Mount_Body_BearCub-Shimmer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Spooky {
.Mount_Body_BearCub-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Thunderstorm {
.Mount_Body_BearCub-Spooky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-White {
.Mount_Body_BearCub-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1399px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Zombie {
.Mount_Body_BearCub-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1272px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Base {
.Mount_Body_BearCub-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1166px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-CottonCandyBlue {
.Mount_Body_Beetle-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1060px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-CottonCandyPink {
.Mount_Body_Beetle-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Desert {
.Mount_Body_Beetle-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Golden {
.Mount_Body_Beetle-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Red {
.Mount_Body_Beetle-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Shade {
.Mount_Body_Beetle-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Skeleton {
.Mount_Body_Beetle-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-White {
.Mount_Body_Beetle-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Zombie {
.Mount_Body_Beetle-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Base {
.Mount_Body_Beetle-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-CottonCandyBlue {
.Mount_Body_Bunny-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1209px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-CottonCandyPink {
.Mount_Body_Bunny-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Desert {
.Mount_Body_Bunny-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Golden {
.Mount_Body_Bunny-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Red {
.Mount_Body_Bunny-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Shade {
.Mount_Body_Bunny-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Skeleton {
.Mount_Body_Bunny-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-White {
.Mount_Body_Bunny-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Zombie {
.Mount_Body_Bunny-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Butterfly-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -440px;
@ -1780,246 +1786,252 @@
width: 105px;
height: 123px;
}
.Mount_Body_Cactus-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-CottonCandyBlue {
.Mount_Body_Cactus-Aquatic {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-CottonCandyPink {
.Mount_Body_Cactus-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Cupid {
.Mount_Body_Cactus-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Desert {
.Mount_Body_Cactus-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Fairy {
.Mount_Body_Cactus-Cupid {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Floral {
.Mount_Body_Cactus-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Ghost {
.Mount_Body_Cactus-Fairy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Golden {
.Mount_Body_Cactus-Floral {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Holly {
.Mount_Body_Cactus-Ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Peppermint {
.Mount_Body_Cactus-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Red {
.Mount_Body_Cactus-Holly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-RoyalPurple {
.Mount_Body_Cactus-Peppermint {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shade {
.Mount_Body_Cactus-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shimmer {
.Mount_Body_Cactus-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1187px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Skeleton {
.Mount_Body_Cactus-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1060px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Spooky {
.Mount_Body_Cactus-Shimmer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Thunderstorm {
.Mount_Body_Cactus-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-White {
.Mount_Body_Cactus-Spooky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Zombie {
.Mount_Body_Cactus-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Base {
.Mount_Body_Cactus-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-CottonCandyBlue {
.Mount_Body_Cactus-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-CottonCandyPink {
.Mount_Body_Cheetah-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Desert {
.Mount_Body_Cheetah-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Golden {
.Mount_Body_Cheetah-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Red {
.Mount_Body_Cheetah-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -997px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Shade {
.Mount_Body_Cheetah-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Skeleton {
.Mount_Body_Cheetah-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-White {
.Mount_Body_Cheetah-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Zombie {
.Mount_Body_Cheetah-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Base {
.Mount_Body_Cheetah-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-CottonCandyBlue {
.Mount_Body_Cheetah-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-CottonCandyPink {
.Mount_Body_Cow-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Desert {
.Mount_Body_Cow-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Golden {
.Mount_Body_Cow-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1081px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Red {
.Mount_Body_Cow-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Shade {
.Mount_Body_Cow-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Skeleton {
.Mount_Body_Cow-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-White {
.Mount_Body_Cow-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Zombie {
.Mount_Body_Cow-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Cuttlefish-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -564px;
@ -2082,331 +2094,319 @@
}
.Mount_Body_Deer-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -212px;
background-position: -975px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -106px;
background-position: -848px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px 0px;
background-position: -742px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -785px;
background-position: -636px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -785px;
background-position: -530px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -785px;
background-position: -424px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -785px;
background-position: -318px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -785px;
background-position: -212px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -785px;
background-position: -106px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -785px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-CottonCandyPink {
.Mount_Body_Dragon-Aquatic {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Cupid {
.Mount_Body_Dragon-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Desert {
.Mount_Body_Dragon-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Fairy {
.Mount_Body_Dragon-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Floral {
.Mount_Body_Dragon-Cupid {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Ghost {
.Mount_Body_Dragon-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Golden {
.Mount_Body_Dragon-Fairy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -869px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Holly {
.Mount_Body_Dragon-Floral {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Peppermint {
.Mount_Body_Dragon-Ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Red {
.Mount_Body_Dragon-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-RoyalPurple {
.Mount_Body_Dragon-Holly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Shade {
.Mount_Body_Dragon-Peppermint {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Shimmer {
.Mount_Body_Dragon-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Skeleton {
.Mount_Body_Dragon-RoyalPurple {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Spooky {
.Mount_Body_Dragon-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -679px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Thunderstorm {
.Mount_Body_Dragon-Shimmer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-White {
.Mount_Body_Dragon-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Dragon-Zombie {
.Mount_Body_Dragon-Spooky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Base {
.Mount_Body_Dragon-Thunderstorm {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-CottonCandyBlue {
.Mount_Body_Dragon-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-CottonCandyPink {
.Mount_Body_Dragon-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Desert {
.Mount_Body_Egg-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -564px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Golden {
.Mount_Body_Egg-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -1421px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Shade {
.Mount_Body_Egg-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Skeleton {
.Mount_Body_Egg-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1293px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-White {
.Mount_Body_Egg-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1166px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Egg-Zombie {
.Mount_Body_Egg-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1060px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Base {
.Mount_Body_Egg-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-CottonCandyBlue {
.Mount_Body_Egg-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -848px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-CottonCandyPink {
.Mount_Body_Egg-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -742px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Desert {
.Mount_Body_Egg-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Golden {
.Mount_Body_Falcon-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -530px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Red {
.Mount_Body_Falcon-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -424px -891px;
background-position: -424px -1103px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -318px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Skeleton {
.Mount_Body_Falcon-CottonCandyPink {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -212px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-White {
.Mount_Body_Falcon-Desert {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -106px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Falcon-Zombie {
.Mount_Body_Falcon-Golden {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -891px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Base {
.Mount_Body_Falcon-Red {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-CottonCandyBlue {
.Mount_Body_Falcon-Shade {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-CottonCandyPink {
.Mount_Body_Falcon-Skeleton {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Desert {
.Mount_Body_Falcon-White {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Golden {
.Mount_Body_Falcon-Zombie {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-Base {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Ferret-CottonCandyBlue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -975px -106px;
width: 105px;
height: 105px;
}

View file

@ -6,51 +6,79 @@
&-worst {
background: $maroon-100;
&-control {
&-control-habit {
background: darken($maroon-100, 12%);
}
&-control-daily-todo {
background: $maroon-500;
}
}
&-worse {
background: $red-100;
&-control {
&-control-habit {
background: darken($red-100, 12%);
}
&-control-daily-todo {
background: $red-500;
}
}
&-bad {
background: $orange-100;
&-control {
&-control-habit {
background: darken($orange-100, 12%);
}
&-control-daily-todo {
background: $orange-500;
}
}
&-neutral {
background: $yellow-50;
&-control {
&-control-habit {
background: darken($yellow-50, 12%);
}
&-control-daily-todo {
background: $yellow-500;
}
}
&-good {
background: $green-10;
&-control {
&-control-habit {
background: darken($green-10, 12%);
}
&-control-daily-todo {
background: $green-500;
}
}
&-better {
background: $blue-50;
&-control {
&-control-habit {
background: darken($blue-50, 12%);
}
&-control-daily-todo {
background: $blue-500;
}
}
&-best {
background: $teal-50;
&-control {
&-control-habit {
background: darken($teal-50, 12%);
}
&-control-daily-todo {
background: $teal-500;
}
}
&-reward {

View file

@ -1,7 +1,7 @@
<template lang="pug">
#app-header.row
member-details(:member="user", @click="$router.push({name: 'avatar'})")
.view-party
.view-party(v-if="user.party && user.party._id")
// TODO button should open the party members modal
router-link.btn.btn-primary(:active-class="''", :to="{name: 'party'}") {{ $t('viewParty') }}
.party-members.d-flex(v-if="partyMembers && partyMembers.length > 1")
@ -62,27 +62,13 @@
flex-wrap: nowrap;
}
.no-party, .party-members {
flex-grow: 1;
h3 {
color: $white;
margin-bottom: 4px;
}
.party-members {
overflow-x: auto;
}
.no-party {
.small-text {
color: $header-color;
}
h3 {
color: $white;
margin-bottom: 4px;
}
button {
margin-top: 16px;
}
.btn {
margin-top: 16px;
}
}
</style>
@ -119,12 +105,9 @@ export default {
this.expandedMember = memberId;
}
},
launchPartyModal () {
this.$root.$emit('show::modal', 'create-party-modal');
},
},
created () {
this.getPartyMembers();
if (this.user.party && this.user.party._id) this.getPartyMembers();
},
};
</script>

View file

@ -14,7 +14,7 @@ nav.navbar.navbar-inverse.fixed-top.navbar-toggleable-sm
router-link.dropdown-item(:to="{name: 'stable'}") {{ $t('stable') }}
router-link.nav-item(tag="li", :to="{name: 'shops'}", exact)
a.nav-link(v-once) {{ $t('shops') }}
router-link.nav-item.dropdown(:to="{name: 'party'}")
router-link.nav-item(tag="li", :to="{name: 'party'}")
a.nav-link(v-once) {{ $t('party') }}
router-link.nav-item.dropdown(tag="li", :to="{name: 'tavern'}", :class="{'active': $route.path.startsWith('/guilds')}")
a.nav-link(v-once) {{ $t('guilds') }}

View file

@ -1,7 +1,7 @@
<template lang="pug">
nav
a(href='/login') Login
a(href='/register') Register
router-link(:to="{name: 'login'}") Login
router-link(:to="{name: 'register'}") Register
</template>

View file

@ -2,11 +2,11 @@
.task.d-flex
// Habits left side control
.left-control.d-flex.align-items-center.justify-content-center(v-if="task.type === 'habit'", :class="controlClass.up")
.task-control.habit-control(:class="controlClass.up + '-control'")
.task-control.habit-control(:class="controlClass.up + '-control-habit'")
.svg-icon.positive(v-html="icons.positive")
// Dailies and todos left side control
.left-control.d-flex.align-items-center.justify-content-center(v-if="task.type === 'daily' || task.type === 'todo'", :class="controlClass")
.task-control.daily-todo-control(:class="controlClass + '-control'")
.task-control.daily-todo-control(:class="controlClass + '-control-daily-todo'")
.svg-icon.check(v-html="icons.check", v-if="task.completed")
// Task title, description and icons
.task-content(:class="contentClass")
@ -39,7 +39,7 @@
// Habits right side control
.right-control.d-flex.align-items-center.justify-content-center(v-if="task.type === 'habit'", :class="controlClass.down")
.task-control.habit-control(:class="controlClass.down + '-control'")
.task-control.habit-control(:class="controlClass.down + '-control-habit'")
.svg-icon.negative(v-html="icons.negative")
// Rewards right side control
.right-control.d-flex.align-items-center.justify-content-center.reward-control(v-if="task.type === 'reward'", :class="controlClass")

View file

@ -4,14 +4,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Habitica</title>
<!-- TODO load google fonts separately as @import is slow, find alternative -->
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,400i,700,700i|Roboto:400,400i,700,700i" rel="stylesheet">
</head>
<body>
<!-- #loading-screen needs to be rendered before vue, will be deleted once app is loaded -->
<div id="loading-screen" class="h-100 w-100 d-flex justify-content-center align-items-center">
<p>Loading...</p>
</div>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>

View file

@ -3,10 +3,9 @@
require('babel-polyfill');
import Vue from 'vue';
import axios from 'axios';
import AppComponent from './app';
import router from './router';
import generateStore from './store';
import getStore from './store';
import StoreModule from './libs/store';
import './filters/registerGlobals';
import i18n from './libs/i18n';
@ -26,18 +25,9 @@ Vue.config.productionTip = IS_PRODUCTION;
Vue.use(i18n);
Vue.use(StoreModule);
// TODO just until we have proper authentication
let authSettings = localStorage.getItem('habit-mobile-settings');
if (authSettings) {
authSettings = JSON.parse(authSettings);
axios.defaults.headers.common['x-api-user'] = authSettings.auth.apiId;
axios.defaults.headers.common['x-api-key'] = authSettings.auth.apiToken;
}
export default new Vue({
el: '#app',
router,
store: generateStore(),
store: getStore(),
render: h => h(AppComponent),
});

View file

@ -1,5 +1,6 @@
import Vue from 'vue';
import VueRouter from 'vue-router';
import getStore from 'client/store';
import EmptyView from './components/emptyView';
@ -38,7 +39,7 @@ const GuildPage = () => import(/* webpackChunkName: "guilds" */ './components/gu
Vue.use(VueRouter);
export default new VueRouter({
const router = new VueRouter({
mode: 'history',
base: process.env.NODE_ENV === 'production' ? '/new-app' : __dirname, // eslint-disable-line no-process-env
linkActiveClass: 'active',
@ -47,10 +48,11 @@ export default new VueRouter({
scrollBehavior () {
return { x: 0, y: 0 };
},
// requiresLogin is true by default, isStatic false
routes: [
{ name: 'home', path: '/home', component: Home },
{ name: 'register', path: '/register', component: RegisterLogin },
{ name: 'login', path: '/login', component: RegisterLogin },
{ name: 'home', path: '/home', component: Home, meta: {requiresLogin: false} },
{ name: 'register', path: '/register', component: RegisterLogin, meta: {requiresLogin: false} },
{ name: 'login', path: '/login', component: RegisterLogin, meta: {requiresLogin: false} },
{ name: 'tasks', path: '/', component: UserTasks },
{
path: '/inventory',
@ -115,3 +117,22 @@ export default new VueRouter({
},
],
});
const store = getStore();
router.beforeEach(function routerGuard (to, from, next) {
const isUserLoggedIn = store.state.isUserLoggedIn;
const routeRequiresLogin = to.meta.requiresLogin !== false;
if (!isUserLoggedIn && routeRequiresLogin) {
// Redirect to the login page unless the user is trying to reach the
// root of the website, in which case show the home page.
// TODO when redirecting to login if user login then redirect back to initial page
// so if you tried to go to /party you'll be redirected to /party after login/signup
return next({name: to.path === '/' ? 'home' : 'login'});
}
next();
});
export default router;

View file

@ -3,18 +3,40 @@ import deepFreeze from 'client/libs/deepFreeze';
import content from 'common/script/content/index';
import * as constants from 'common/script/constants';
import { asyncResourceFactory } from 'client/libs/asyncResource';
import axios from 'axios';
import actions from './actions';
import getters from './getters';
const IS_TEST = process.env.NODE_ENV === 'test'; // eslint-disable-line no-process-env
// Load user auth parameters and determine if it's logged in
// before trying to load data
let isUserLoggedIn = false;
let AUTH_SETTINGS = localStorage.getItem('habit-mobile-settings');
if (AUTH_SETTINGS) {
AUTH_SETTINGS = JSON.parse(AUTH_SETTINGS);
axios.defaults.headers.common['x-api-user'] = AUTH_SETTINGS.auth.apiId;
axios.defaults.headers.common['x-api-key'] = AUTH_SETTINGS.auth.apiToken;
isUserLoggedIn = true;
}
// Export a function that generates the store and not the store directly
// so that we can regenerate it multiple times for testing
// so that we can regenerate it multiple times for testing, when not testing
// always export the same route
let existingStore;
export default function () {
return new Store({
if (!IS_TEST && existingStore) return existingStore;
existingStore = new Store({
actions,
getters,
state: {
title: 'Habitica',
isUserLoggedIn,
user: asyncResourceFactory(),
tasks: asyncResourceFactory(), // user tasks
party: {
@ -30,4 +52,6 @@ export default function () {
constants: deepFreeze(constants),
},
});
return existingStore;
}

View file

@ -169,6 +169,7 @@
"hatchingPotionSpooky": "Призрачен цвят",
"hatchingPotionPeppermint": "Ментов цвят",
"hatchingPotionFloral": "Флорален цвят",
"hatchingPotionAquatic": "Воден цвят",
"hatchingPotionThunderstorm": "Буреносен цвят",
"hatchingPotionGhost": "Призрачен цвят",
"hatchingPotionRoyalPurple": "Царствено лилав цвят",

View file

@ -114,7 +114,7 @@
"messageRequired": "Нужно е съобщение.",
"toUserIDRequired": "Нужен е потребителски идентификатор",
"gemAmountRequired": "Нужен е брой диаманти",
"notAuthorizedToSendMessageToThisUser": "Не можете да изпратите съобщение до този потребител",
"notAuthorizedToSendMessageToThisUser": "You can't send a message to this player because they have chosen to block messages.",
"privateMessageGiftGemsMessage": "Здравейте, <%= receiverName %>, <%= senderName %> Ви изпрати <%= gemAmount %> диамант(а)!",
"privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> месеца абонамент!",
"cannotSendGemsToYourself": "Не можете да изпратите диаманти на себе си. Опитайте с абонамент.",

View file

@ -112,5 +112,6 @@
"dateEndApril": "19 април",
"dateEndMay": "17 май",
"dateEndJune": "14 юни",
"dateEndJuly": "29 юли",
"discountBundle": "пакет"
}

View file

@ -92,7 +92,7 @@
"questGoldenknight1CollectTestimony": "Показания",
"questGoldenknight1DropGoldenknight2Quest": "Златният рицар, част 2: Златен рицар (свитък)",
"questGoldenknight2Text": "Златният рицар, част 2: Златен рицар",
"questGoldenknight2Notes": "Въоръжен(а) със стотици показания на хабитиканци, ти най-после се изправяш срещу Златния рицар. Започваш да четеш оплакванията на хабитиканците срещу нея, едно по едно: „А @Pfeffernusse казва, че постоянното ти натякване…“ — рицарят вдига ръка, за да те спре, и казва надменно: „Моля те, тези хора просто завиждат на успеха ми. Вместо да се оплакват, може просто да работят усърдно като мен! Може би трябва да ти демонстрирам силата, която може да получиш, ако се стараеш като мен!“ — тя вдига боздугана си и се приготвя да те нападне!",
"questGoldenknight2Notes": "Armed with dozens of Habiticans' testimonies, you finally confront the Golden Knight. You begin to recite the Habitcans' complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!",
"questGoldenknight2Boss": "Златен рицар",
"questGoldenknight2DropGoldenknight3Quest": "Златният рицар, част 3: Железният рицар (свитък)",
"questGoldenknight3Text": "Златният рицар, част 3: Железният рицар",

View file

@ -11,7 +11,7 @@
"rebirthInList1": "Задачите, историята, екипировката и настройките си остават.",
"rebirthInList2": "Остават участията в предизвикателства, гилдии и група.",
"rebirthInList3": "Остават диамантите, както и нивата на подкрепа и дарител.",
"rebirthInList4": "Няма да загубите предметите, закупени с диаманти или получени като плячка (например любимци и превози), само че няма да можете да ги използвате, докато не ги отключите отново.",
"rebirthInList4": "Items obtained from Gems or drops (such as pets and mounts) remain.",
"rebirthEarnAchievement": "Също така ще спечелите постижение за започването на ново приключение!",
"beReborn": "Преродете се",
"rebirthAchievement": "Започнахте ново приключение! Това е прераждане №<%= number %> за Вас, а най-високото ниво, което сте достигали, е <%= level %>. За да спечелите отново това постижение, започнете ново приключение, когато достигнете още по-високо ниво!",

View file

@ -37,7 +37,7 @@
"subscribed": "Абониран",
"manageSub": "Щракнете за управление на абонамента",
"cancelSub": "Прекратяване на абонамента",
"cancelSubInfoGoogle": "Моля, идете в раздела „Моите приложения и игри > Абонаменти“ в магазина „Google Play“, за да видите кога изтича абонамента Ви, ако вече сте го прекратили. Тук не можете да разберете дали абонаментът Ви е бил прекратен.",
"cancelSubInfoGoogle": "Please go to the \"Account\" > \"Subscriptions\" section of the Google Play Store app to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
"cancelSubInfoApple": "Моля, следвайте <a href=\"https://support.apple.com/en-us/HT202039\">официалните инструкции на Апъл</a>, за да прекратите абонамента си, или да видите кога изтича той, ако вече сте го прекратили. Тук не можете да разберете дали абонаментът Ви е бил прекратен.",
"canceledSubscription": "Прекратен абонамент",
"cancelingSubscription": "Прекратяване на абонамента",
@ -168,5 +168,6 @@
"missingPaymentId": "Липсва „req.query.paymentId“",
"missingCustomerId": "Липсва „req.query.customerId“",
"missingPaypalBlock": "Липсва „req.session.paypalBlock“",
"missingSubKey": "Липсва „req.query.sub“"
"missingSubKey": "Липсва „req.query.sub“",
"paypalCanceled": "Your subscription has been canceled"
}

View file

@ -1,7 +1,7 @@
{
"clearCompleted": "Изтриване на завършените",
"lotOfToDos": "Тук можете да видите последните си 30 завършени задачи. Можете да видите по-старите си завършени задачи от „Данни > Инструмент за показване на данните“ или „Данни > Изнасяне на данни > Потребителски данни.",
"deleteToDosExplanation": "Ако натиснете този бутон, всички завършени и архивирани задачи ще бъдат изтрити завинаги. Ако искате да запазите информацията за тях, първо ги изнесете.",
"deleteToDosExplanation": "If you click the button below, all of your completed To-Dos and archived To-Dos will be permanently deleted, except for To-Dos from active challenges and Group Plans. Export them first if you want to keep a record of them.",
"addmultiple": "Добавяне на няколко",
"addsingle": "Добавяне поотделно",
"habit": "Навик",

View file

@ -169,6 +169,7 @@
"hatchingPotionSpooky": "Strašidelný",
"hatchingPotionPeppermint": "Peprmintový",
"hatchingPotionFloral": "Květinový",
"hatchingPotionAquatic": "Aquatic",
"hatchingPotionThunderstorm": "Bouře",
"hatchingPotionGhost": "Duch",
"hatchingPotionRoyalPurple": "Královská fialová",

View file

@ -114,7 +114,7 @@
"messageRequired": "Je požadována zpráva.",
"toUserIDRequired": "Je požadováno ID uživatele",
"gemAmountRequired": "Je požadován určitý počet drahokamů",
"notAuthorizedToSendMessageToThisUser": "Nelze posílat zprávy tomuto uživateli.",
"notAuthorizedToSendMessageToThisUser": "You can't send a message to this player because they have chosen to block messages.",
"privateMessageGiftGemsMessage": "Hello <%= receiverName %>, <%= senderName %> has sent you <%= gemAmount %> gems!",
"privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> měsíců předplatného!",
"cannotSendGemsToYourself": "Nemůžete sám sobě poslat drahokamy. Raději zkuste předplatné.",

View file

@ -112,5 +112,6 @@
"dateEndApril": "April 19",
"dateEndMay": "May 17",
"dateEndJune": "June 14",
"dateEndJuly": "July 29",
"discountBundle": "bundle"
}

View file

@ -67,14 +67,14 @@
"firstDrop": "Odemknuto nalézání předmětů! Od teď máš malou šanci nalézt předmět při dokončení úkolů, včetně vajec, lektvarů a jídla! Právě nalezeno <strong> vejce zvířátka <%= eggText %></strong>! <%= eggNotes %>",
"useGems": "Pokud ti padlo oko na zvířátko a nemůžeš se dočkat až ti padne, použij Drahokamy v <strong> Inventář > Trh </strong> a kup si ho!",
"hatchAPot": "<%= potion %> <%= egg %>, jsi si jistý?",
"hatchedPet": "Vylíhl se ti <%= potion %> <%= egg %>!",
"hatchedPet": "You hatched a new <%= potion %> <%= egg %>!",
"displayNow": "Zobrazit hned",
"displayLater": "Zobrazit později",
"petNotOwned": "Nevlastníte tohoto mazlíčka.",
"earnedCompanion": "Za svou pracovitost sis vysloužil nového kamaráda. Nakrm ho, aby vyrostl!",
"feedPet": "Myslíš, že <%= name %> si pochutná na něčem takovém jako je <%= article %><%= text %> ?",
"useSaddle": "Koho osedláme? Bude to <%= pet %>?",
"raisedPet": "Vyrostl ti <%= pet %>!",
"raisedPet": "You grew your <%= pet %>!",
"earnedSteed": "Za splnění úkolů sis vysloužil věrné zvíře k ježdění!",
"rideNow": "Osedlat hned",
"rideLater": "Osedlat později",

Some files were not shown because too many files have changed in this diff Show more