diff --git a/Dockerfile-Production b/Dockerfile-Production index e7a800f6df..42bdc8eff6 100644 --- a/Dockerfile-Production +++ b/Dockerfile-Production @@ -17,7 +17,7 @@ RUN npm install -g gulp-cli mocha # Clone Habitica repo and install dependencies RUN mkdir -p /usr/src/habitrpg WORKDIR /usr/src/habitrpg -RUN git clone --branch v4.34.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN git clone --branch v4.35.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg RUN npm install RUN gulp build:prod --force diff --git a/package-lock.json b/package-lock.json index 92512095a7..c1f832bcf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.35.0", + "version": "4.35.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 68c1976074..ad1cae586c 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.35.0", + "version": "4.35.1", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/website/client/assets/css/sprites.css b/website/client/assets/css/sprites.css index 3b50e94b11..906e3bc5a2 100755 --- a/website/client/assets/css/sprites.css +++ b/website/client/assets/css/sprites.css @@ -100,34 +100,7 @@ [class*="Mount_Head_"], [class*="Mount_Body_"] { - margin-top: 18px; /* Sprite accommodates 105x123 box */ - left: 28px; - top: 34px; -} - -[class*="Mount_"], -[class*="Pet-"] { - transform: scale(0.333, 0.333); - -ms-transform: scale(0.333, 0.333); - -webkit-transform: scale(0.333, 0.333); -} - -[class*="_Sabretooth"], -[class*="_TRex"], -[class*="_Wolf"] { - left: 18px; - top: 25px; -} - -[class*="_JackOLantern"] { - left: 32px; -} - -[class*="_Cuttlefish"], -[class*="_Frog"], -[class*="_MagicalBee"], -[class*="_Mammoth"] { - top: 30px; + margin-top:18px; /* Sprite accommodates 105x123 box */ } .Pet_Currency_Gem { diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index a0ba5100b3..e293abeed0 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -12,7 +12,7 @@ } .promo_mystery_201803 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -674px -335px; + background-position: -915px -148px; width: 114px; height: 90px; } @@ -24,10 +24,16 @@ } .promo_seasonalshop_spring { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -674px -196px; + background-position: -674px -344px; width: 162px; height: 138px; } +.promo_shiny_seeds { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -674px 0px; + width: 360px; + height: 147px; +} .promo_spring_fling_2018 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px -244px; @@ -36,7 +42,7 @@ } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -789px -335px; + background-position: -915px -239px; width: 114px; height: 87px; } @@ -48,7 +54,7 @@ } .scene_todos { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -674px 0px; + background-position: -674px -148px; width: 240px; height: 195px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 84ae6fe165..90e73ece94 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/assets/scss/animals.scss b/website/client/assets/scss/animals.scss index ca2bb92043..a75f6dcb17 100644 --- a/website/client/assets/scss/animals.scss +++ b/website/client/assets/scss/animals.scss @@ -7,7 +7,7 @@ left: 0; &:not([class*="FlyingPig"]) { - top: -8px !important; + top: -28px !important; } } diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index e62965e78a..a4acea6cc0 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -1,6 +1,10 @@