From ffe8d34acbd443649e7c87d6ebbad8575757c0be Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 22 Sep 2020 16:35:47 +0200 Subject: [PATCH 1/5] Revert "fix(gem icon in menu): add hover animation" This reverts commit 74428d0727df9e9caf70c457b911404bfb9fd74c. --- website/client/src/components/header/menu.vue | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue index 2df4793aa7..928e754e86 100644 --- a/website/client/src/components/header/menu.vue +++ b/website/client/src/components/header/menu.vue @@ -679,31 +679,8 @@ body.modal-open #habitica-menu { margin-left: 24px; } - @keyframes rotateGemColors { - /* Gems are green by default, so we rotate through ROYGBIV starting with green. */ - 20% { - fill: #46A7D9; /* Blue */ - } - 40% { - fill: #925CF3; /* Purple */ - } - 60% { - fill: #DE3F3F; /* Red */ - } - 80% { - fill: #FA8537; /* Orange */ - } - 100% { - fill: #FFB445; /* Yellow */ - } - } - .gem:hover { cursor: pointer; - - & ::v-deep path:nth-child(1) { - animation: rotateGemColors 3s linear infinite alternate; - } } .message-count { From 48193dce595972920853891b6c19221cf2bf3277 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 22 Sep 2020 16:39:01 +0200 Subject: [PATCH 2/5] Revert "Revert "fix(gem icon in menu): add hover animation"" This reverts commit ffe8d34acbd443649e7c87d6ebbad8575757c0be. --- website/client/src/components/header/menu.vue | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue index 928e754e86..2df4793aa7 100644 --- a/website/client/src/components/header/menu.vue +++ b/website/client/src/components/header/menu.vue @@ -679,8 +679,31 @@ body.modal-open #habitica-menu { margin-left: 24px; } + @keyframes rotateGemColors { + /* Gems are green by default, so we rotate through ROYGBIV starting with green. */ + 20% { + fill: #46A7D9; /* Blue */ + } + 40% { + fill: #925CF3; /* Purple */ + } + 60% { + fill: #DE3F3F; /* Red */ + } + 80% { + fill: #FA8537; /* Orange */ + } + 100% { + fill: #FFB445; /* Yellow */ + } + } + .gem:hover { cursor: pointer; + + & ::v-deep path:nth-child(1) { + animation: rotateGemColors 3s linear infinite alternate; + } } .message-count { From 0455f08ec5ddbf3dedb0fb2d6257647b899ffad6 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 22 Sep 2020 16:46:27 +0200 Subject: [PATCH 3/5] fix(gem icon): update gem icon --- website/client/src/assets/svg/gem.svg | 23 +++++++++++-------- .../src/components/groups/publicGuildItem.vue | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/website/client/src/assets/svg/gem.svg b/website/client/src/assets/svg/gem.svg index 6d3331ce47..907c10d492 100755 --- a/website/client/src/assets/svg/gem.svg +++ b/website/client/src/assets/svg/gem.svg @@ -1,10 +1,15 @@ - - - - - - - - + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/website/client/src/components/groups/publicGuildItem.vue b/website/client/src/components/groups/publicGuildItem.vue index ea2946a2a7..c7dbbbcbe8 100644 --- a/website/client/src/components/groups/publicGuildItem.vue +++ b/website/client/src/components/groups/publicGuildItem.vue @@ -202,7 +202,7 @@ margin-top: 2em; .gem { - width: 25px; + width: 24px; display: inline-block; vertical-align: bottom; margin-right: .8em; From f28c5a563a7eef2f995a5151e4c47fc760ef0bbd Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 22 Sep 2020 09:48:58 -0500 Subject: [PATCH 4/5] fix(news): missing Bailey paragraph --- website/server/controllers/api-v3/news.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 3504c1730d..a432f33561 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -63,6 +63,21 @@ api.getNews = { Everyone has hastened down to the Flourishing Fields to celebrate this spooky harvest festival. Be sure to check out all the outfits that people are sporting!

+

Fall Gem Sale! September 22-30

+

+ For the first time ever, Habitica is offering a Gem sale to kick off the fun of Fall + Festival! Receive bonus Gems with each Gem purchase on web or mobile - the more Gems you + buy, the bigger the bonus! Use them to grab past Fall Festival Gear from the Seasonal + Shop, Quests, Magic Hatching Potions, and more. Find more details via Menu > Gems on + mobile, or tapping the Gem on the top menu bar on web. +

+

+ Be sure to update your mobile app to see details, although the promo will still work even + if you can't see the promotional information. +

+

+ Thanks so much for your support. 💜 Gem purchases help keep us running ad-free! +

`, }); From cfa4d03e452401e1b86be0a9f1240e2ca84705f3 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 22 Sep 2020 09:49:16 -0500 Subject: [PATCH 5/5] 4.159.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05a182d5d9..f2b7bd230c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.159.0", + "version": "4.159.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 86b0ec7a69..6e11e1825c 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.159.0", + "version": "4.159.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.11.6",