Skip to content

Commit

Permalink
Merge branch 'release' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreCat committed Jan 1, 2020
2 parents 9b29367 + 927c4ef commit 44bb304
Show file tree
Hide file tree
Showing 44 changed files with 4,251 additions and 4,240 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.128.1",
"version": "4.128.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.7.7",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,78 +1,60 @@
.promo_achievement_white {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -862px -233px;
width: 204px;
height: 102px;
}
.promo_armoire_backgrounds_201912 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -475px;
background-position: 0px -175px;
width: 423px;
height: 147px;
}
.promo_g1g1_2019 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -469px -327px;
background-position: 0px -471px;
width: 357px;
height: 144px;
}
.promo_mystery_201912 {
.promo_mystery_202001 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -623px;
width: 282px;
background-position: -241px -616px;
width: 279px;
height: 147px;
}
.promo_snowballs {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -441px 0px;
background-position: 0px 0px;
width: 420px;
height: 174px;
}
.promo_take_this {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -862px -336px;
background-position: -358px -471px;
width: 96px;
height: 69px;
}
.promo_winter_potions_2020 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -475px;
background-position: -424px -175px;
width: 423px;
height: 147px;
}
.promo_winter_quests_bundle {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -623px;
background-position: 0px -323px;
width: 423px;
height: 147px;
}
.promo_winter_wonderland_2019 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -441px -175px;
background-position: -424px -323px;
width: 402px;
height: 147px;
}
.promo_winter_wonderland_2020 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -327px;
background-position: -421px 0px;
width: 468px;
height: 147px;
}
.scene_studying_hard {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -862px 0px;
width: 220px;
height: 232px;
}
.scene_tavern {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px 0px;
width: 440px;
height: 326px;
}
.scene_todos {
.scene_list {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -771px;
background-position: 0px -616px;
width: 240px;
height: 195px;
}
Loading

0 comments on commit 44bb304

Please sign in to comment.