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 Aug 29, 2018
2 parents 1d59703 + d27ed7c commit 972631e
Show file tree
Hide file tree
Showing 127 changed files with 7,006 additions and 6,292 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.58.0",
"version": "4.59.0",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",
Expand Down
16 changes: 11 additions & 5 deletions website/client/assets/css/sprites/spritesmith-largeSprites-0.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
.promo_armoire_backgrounds_201808 {
.promo_animal_tails {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -421px -223px;
width: 141px;
height: 441px;
}
.promo_ember_potions {
.promo_armoire_backgrounds_201808 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -563px -223px;
width: 141px;
height: 441px;
}
.promo_ember_potions {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -734px 0px;
width: 141px;
height: 441px;
}
.promo_ios {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -337px;
Expand All @@ -24,19 +30,19 @@
}
.promo_mystery_201808 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -734px -251px;
background-position: -876px -251px;
width: 78px;
height: 81px;
}
.promo_take_this {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -734px -181px;
background-position: -876px -181px;
width: 96px;
height: 69px;
}
.promo_unconventional_armor {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -734px 0px;
background-position: -876px 0px;
width: 180px;
height: 180px;
}
Expand Down
Loading

0 comments on commit 972631e

Please sign in to comment.