sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-15 00:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2020-09-22 09:49:49 -05:00
commit 265fb7c5f6
5 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.159.0",
"version": "4.159.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View file

@ -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",

23
website/client/src/assets/svg/gem.svg
View file

@ -1,10 +1,15 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<g fill="none" fill-rule="evenodd">
<path fill="#24CC8F" d="M0 9l5-7h14l5 7-12 13z"/>
<path fill="#FFF" d="M7 8.8L6 4h6zM17 8.8L18 4h-6z" opacity=".25"/>
<path fill="#FFF" d="M7 8.8L12 4l5 4.8zM2.6 8.8L6 4l1 4.8z" opacity=".5"/>
<path fill="#1B996B" d="M21.4 8.8L18 4l-1 4.8zM2.6 8.8H7l5 10.3z" opacity=".35"/>
<path fill="#FFF" d="M21.4 8.8H17l-5 10.3z" opacity=".5"/>
<path fill="#FFF" d="M7 8.8h10l-5 10.3z" opacity=".25"/>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Icon/Currency/Gem/24x24" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="-g-Gem" transform="translate(0.000000, 2.000000)">
<polygon id="Shape" fill="#24CC8F" points="0 7 5 0 19 0 24 7 12 20"></polygon>
<polygon id="Shape" fill="#FFFFFF" opacity="0.25" points="7 6.8 6 2 12 2"></polygon>
<polygon id="Shape" fill="#FFFFFF" opacity="0.25" points="17 6.8 18 2 12 2"></polygon>
<polygon id="Shape" fill="#FFFFFF" opacity="0.5" points="7 6.8 12 2 17 6.8"></polygon>
<polygon id="Shape" fill="#FFFFFF" opacity="0.5" points="2.6 6.8 6 2 7 6.8"></polygon>
<polygon id="Shape" fill="#34313A" opacity="0.11" points="21.4 6.8 18 2 17 6.8"></polygon>
<polygon id="Shape" fill="#34313A" opacity="0.11" points="2.6 6.8 7 6.8 12 17.1"></polygon>
<polygon id="Shape" fill="#FFFFFF" opacity="0.5" points="21.4 6.8 17 6.8 12 17.1"></polygon>
<polygon id="Shape" fill="#FFFFFF" opacity="0.25" points="7 6.8 17 6.8 12 17.1"></polygon>
</g>
</g>
</svg>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 1.2 KiB

2
website/client/src/components/groups/publicGuildItem.vue
View file

@ -202,7 +202,7 @@
margin-top: 2em;
.gem {
width: 25px;
width: 24px;
display: inline-block;
vertical-align: bottom;
margin-right: .8em;

15
website/server/controllers/api-v3/news.js
View file

@ -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!
</p>
<h3>Fall Gem Sale! September 22-30</h3>
<p>
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.
</p>
<p>
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.
</p>
<p>
Thanks so much for your support. 💜 Gem purchases help keep us running ad-free!
</p>
</div>
`,
});