diff --git a/package-lock.json b/package-lock.json index e6cb51b041..61d2c699cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.140.0", + "version": "4.140.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5347632ec0..ad284fb3d4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.140.0", + "version": "4.140.3", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.9.0", diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css index 6a3f8369a7..d9d29f1bba 100644 --- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,6 +1,6 @@ .promo_april_fools_2020 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -433px -337px; + background-position: -445px -184px; width: 423px; height: 147px; } @@ -12,19 +12,31 @@ } .promo_egg_quest { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -648px; + background-position: -355px -648px; width: 354px; height: 147px; } .promo_mystery_202004 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -355px -648px; + background-position: -875px 0px; width: 282px; height: 147px; } +.promo_pastel_skin_hair { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px -648px; + width: 354px; + height: 147px; +} +.customize-option.promo_pastel_skin_hair { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -25px -663px; + width: 60px; + height: 60px; +} .promo_seasonal_shop_spring { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -638px -648px; + background-position: -875px -299px; width: 162px; height: 138px; } @@ -48,13 +60,13 @@ } .promo_spring_potions_2020 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -445px -184px; + background-position: -433px -337px; width: 423px; height: 147px; } .promo_take_this { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -875px -151px; + background-position: -1026px -148px; width: 96px; height: 69px; } @@ -66,7 +78,7 @@ } .scene_meditation { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -875px 0px; + background-position: -875px -148px; width: 150px; height: 150px; } diff --git a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png index 8ae2722bf5..ecc47528fb 100644 Binary files a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/src/components/shops/market/categoryRow.vue b/website/client/src/components/shops/market/categoryRow.vue index eb4a79b6c4..92012294b6 100644 --- a/website/client/src/components/shops/market/categoryRow.vue +++ b/website/client/src/components/shops/market/categoryRow.vue @@ -11,6 +11,12 @@ {{ $t('maxBuyGems') }}

{{ item.text }}

+
+ {{ limitedString }} +