mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-04-14 19:47:03 +00:00
Squashed commit of the following:
commit 83096869224d78e9c7ce30189fa495e3ddfcf1d9
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 25 15:41:41 2024 -0400
melior updates - loading screen & menu bar
commit 53608dd6883415274b2a9b57604c480b9fb86426
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Jun 24 22:12:09 2024 +0200
fix food
commit eecae8645466ce30b227f199eef75d931d9e1e87
Merge: 95c562fdbc 960e262f19
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jun 24 16:05:04 2024 -0400
Merge branch '2024-07-content-prebuild' into subs-private
commit 960e262f19dede157e4841f0a1840602f1498d03
Merge: c5bbadaacd 7ec8b84b01
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jun 24 16:03:40 2024 -0400
Merge branch '2024-07-content-prebuild' of https://github.com/HabitRPG/habitica-private into 2024-07-content-prebuild
commit c5bbadaacdc3167a7991cd93820f760128503798
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jun 24 16:03:23 2024 -0400
add missing string info to July mystery items
commit 7ec8b84b01d925ae4b1ef75b726fcded2e2c9cba
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jun 24 11:29:17 2024 -0400
add missing info to mystery item strings
commit 95c562fdbc35dd7a8673a8a95df3425de96a15ee
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Jun 21 11:12:18 2024 +0200
Fix serving memoized content
commit 877fe48225
Author: Phillip Thelen <phillip@habitica.com>
Date: Thu Jun 20 12:23:24 2024 +0200
correctly memoize conent api
commit e0f6f79c5b
Author: Phillip Thelen <phillip@habitica.com>
Date: Thu Jun 20 10:11:27 2024 +0200
don’t build multiple times on heroku
commit f62254d68e
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 19:40:20 2024 +0200
fix client command
commit d054e6fc16
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 19:36:57 2024 +0200
correct build call
commit 7231f699c1
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 19:32:32 2024 +0200
try setting up with heroku buildpack
commit 1dae0793fd
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:50:32 2024 +0200
call gulp build:prod
commit f18fbe86b6
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:40:53 2024 +0200
build client
commit 61a61724ca
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:33:18 2024 +0200
testing
commit 93cf30eb18
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:20:25 2024 +0200
integration fix
commit cff08adcd0
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:13:20 2024 +0200
specify dev docker file
commit 4da2ed4a1f
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:10:07 2024 +0200
initialize stub
commit 11c5b26c59
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:08:45 2024 +0200
test heroku file
commit ac85bb2e2d
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:03:15 2024 +0200
fix stub reference
commit 74dfb2710f
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 18:01:27 2024 +0200
test fixes
commit 8dbd3c3db1
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 17:37:04 2024 +0200
fix canOwn test
commit 74b3b348ff
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 17:32:31 2024 +0200
fix buy test
commit 3386d61fde
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 17:30:37 2024 +0200
fix debug tests
commit 19da14531c
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 17:05:25 2024 +0200
add chameleon to featured quests
commit 254dd80f24
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 17:05:14 2024 +0200
fix import
commit 0bc3f16b4b
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 16:33:22 2024 +0200
add new content to new release file
commit 5184973bd5
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 16:33:11 2024 +0200
fix release date tests
commit b6accca5ca
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 16:33:06 2024 +0200
fix armoire tests
commit fec68e6211
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Jun 19 16:02:03 2024 +0200
fix tests
commit fc63c906dd
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Jun 10 14:44:21 2024 +0200
Improve test coverage
commit 3333f8f0f5
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Jun 10 14:24:59 2024 +0200
allow hatching potions to have a release date
commit 89a3ac3dde
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Jun 10 14:11:38 2024 +0200
allow eggs to have a release date
# Conflicts:
# test/content/armoire.test.js
commit 16551ec83f
Merge: f5f4974a73 2645bf6023
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 15:03:12 2024 -0400
Merge branch '2024-07-content-prebuild' into subs-private
commit 2645bf6023
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 15:02:47 2024 -0400
update habitica images
commit f5f4974a73
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 14:58:13 2024 -0400
update habitica-images
commit 162e337d14
Merge: f2506c3231 21a7d36b7b
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 13:46:03 2024 -0400
Merge branch '2024-07-content-prebuild' into subs-private
commit 21a7d36b7b
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 13:45:09 2024 -0400
update sprites
commit f2506c3231
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 13:24:21 2024 -0400
updated sprites css
commit d47641e25a
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 18 12:46:59 2024 -0400
typo fix
commit fb8479ad1e
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jun 17 13:44:36 2024 -0400
finish July prebuild
commit 3810cf3ef3
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Jun 14 10:42:47 2024 -0400
add chameleon quest
commit d05da3722c
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Jun 13 17:12:43 2024 -0400
add June background notes
commit b8a3440ef2
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Jun 13 16:40:04 2024 -0400
fix mystery item and background description
commit 44d63032d8
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Jun 13 15:38:23 2024 -0400
add subscriber gear, enchanted armoire, and background
commit 9d7da91ec6
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Jun 13 14:44:59 2024 -0400
add sprites
This commit is contained in:
Sabe Jones
parent
f55d836398
commit
de9aac0988
3 changed files with 18 additions and 4 deletions
|
|
@ -27,8 +27,15 @@
|
|||
</head>
|
||||
<body>
|
||||
<div id="loading-screen">
|
||||
<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M31.62 28.86c-.32-.706-1.057-1.048-1.538-.706-.48.341-1.147.393-1.78.24-.633-.153-.753-1.604-.616-3.278.136-1.673.363-2.318.506-2.925.162-.61.877-.562.962-.084.086.479.582.479 1.307-.391.724-.87.617-3.409-.218-5.474-.836-2.065.326-1.865.664-1.66.337.205.544-.102.462-1.28-.082-1.178-1.166-2.098-2.039-2.663-.873-.564-1.936-1.186-1.911-2.697.025-1.511 2.08-1.464 2.358-1.439.279.025.815-.093.506-1.663-.31-1.57-1.43-1.869-2.133-1.826-.703.042-1.177.428-2.17.053-.995-.376-1.655-.23-2.58-.023-.926.206-2.138.776-3.646 1.183-.795.219-1.064.274-1.93.288-.532.008-.755.653-.043 1.444.563.643 1.839.814 2.606.707.494-.07.608.258.563.74a8.013 8.013 0 0 0-.01 1.795c.08.6.18 1.62-.103 2.286-.14.326-.545.677-.98.653-.565-.034-1.022-.7-1.414-1.49-.825-1.662-1.793-2.014-5.404-3.535-3.248-1.367-5.007-3.5-6.096-4.874-.969-1.217-1.939-.756-1.85.342.07.852.592 3.604 1.912 5.257 1.623 2.525 4.128 3.67 7.013 3.895.755.06 1.226.208 1.29.553.095.735-.622 1.244-1.959 1.09-1.336-.157-1.907.087-1.641.848.85 1.79 2.809 1.869 3.623 1.942.275.05 1.246 0 1.764.143.605.166.735 1.005-.14 1.459-1.558.76-2.237 1.391-3.025 2.83-.595 1.13-1.108 3.022-.574 5.745.513 2.648-3.337 2.733-5 2.357-.716-.151-1.47-1.512.287-2.65 1.421-.922 1.708-1.49 1.645-2.657-.074-1.36-.824-1.458-.822-2.64v-2.82a.435.435 0 0 0-.435-.435H7.698a.435.435 0 0 1-.435-.434v-1.7a.435.435 0 0 0-.435-.435H5.501a.435.435 0 0 1-.435-.435v-1.524a.435.435 0 0 0-.435-.435H3.015a.435.435 0 0 1-.435-.435v-1.603a.435.435 0 0 0-.435-.434H.435a.435.435 0 0 0-.435.434v1.705c0 .24.195.435.435.435h1.62c.24 0 .435.195.435.435v6.076c0 .241.195.435.435.435h1.71c.241 0 .436.196.436.435v1.988c0 .24.195.434.435.434h2.402c.734-.052.862.934.854 1.286-.016.803-.923 1.06-1.352 1.395-1.145.884-2.031 1.783-1.513 3.512l.013.036c.945 2.007 3.542 1.8 5.183 1.8h10.326c.584 0 1.184.135 1.046-.545-.136-.68-.425-1.61-1.265-1.61-.84 0-.703.467-1.524.228-.821-.238-.822-1.348.411-3.279 1.276-1.649 3.46-1.524 4.781-.358 1.32 1.166.93 3.191.653 4.354-.158.82.218 1.224.669 1.213h5.242c.806-.014.647-.556.185-1.614h.003z" fill="#fff"/>
|
||||
<svg width="80" height="80" viewBox="0 0 80 80" xmlns="http://www.w3.org/2000/svg">
|
||||
<path
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
fill-rule="evenodd"
|
||||
clip-rule="evenodd"
|
||||
d="M79.05 72.15c-.8-1.766-2.643-2.62-3.845-1.766-1.201.855-2.867.985-4.448.602-1.584-.385-1.885-4.01-1.543-8.195.342-4.184.909-5.795 1.267-7.314.404-1.524 2.191-1.404 2.405-.209.215 1.196 1.454 1.196 3.266-.979 1.811-2.175 1.543-8.52-.546-13.684-2.088-5.163.817-4.661 1.66-4.149.844.513 1.362-.255 1.156-3.2-.204-2.945-2.916-5.247-5.096-6.657-2.184-1.41-4.842-2.967-4.78-6.745.063-3.777 5.2-3.658 5.897-3.596.697.063 2.037-.233 1.264-4.157-.773-3.924-3.575-4.673-5.332-4.567-1.758.106-2.943 1.071-5.427.133-2.484-.938-4.136-.572-6.45-.057-2.313.515-5.343 1.94-9.112 2.959-1.989.545-2.661.683-4.828.718-1.33.02-1.885 1.633-.106 3.61 1.408 1.608 4.597 2.036 6.515 1.768 1.236-.174 1.521.645 1.407 1.85a20.023 20.023 0 0 0-.024 4.488c.198 1.5.45 4.051-.258 5.713-.35.817-1.361 1.693-2.449 1.633-1.413-.084-2.555-1.75-3.537-3.726-2.06-4.152-4.48-5.033-13.509-8.835-8.12-3.417-12.516-8.749-15.24-12.185-2.421-3.042-4.846-1.89-4.626.855.179 2.128 1.48 9.008 4.781 13.141 4.058 6.314 10.32 9.177 17.534 9.739 1.885.149 3.065.52 3.225 1.383.236 1.835-1.557 3.11-4.898 2.722-3.341-.39-4.768.22-4.103 2.121 2.123 4.477 7.021 4.672 9.058 4.857.686.122 3.114 0 4.41.355 1.51.418 1.836 2.514-.353 3.648-3.892 1.903-5.59 3.479-7.561 7.075-1.486 2.826-2.77 7.555-1.435 14.365 1.283 6.62-8.342 6.83-12.497 5.89-1.793-.377-3.675-3.778.716-6.625 3.553-2.305 4.269-3.724 4.111-6.642-.184-3.4-2.058-3.644-2.053-6.598v-7.05c0-.602-.488-1.088-1.087-1.088h-3.334a1.087 1.087 0 0 1-1.087-1.087v-4.25c0-.602-.488-1.087-1.088-1.087h-3.317a1.087 1.087 0 0 1-1.087-1.088v-3.81c0-.602-.489-1.087-1.088-1.087h-4.04a1.087 1.087 0 0 1-1.089-1.088V26.25c0-.602-.488-1.088-1.087-1.088H1.088C.485 25.161 0 25.65 0 26.25v4.26c0 .602.488 1.087 1.088 1.087h4.049c.602 0 1.087.489 1.087 1.088v15.192c0 .602.489 1.087 1.088 1.087h4.277c.602 0 1.088.489 1.088 1.088v4.968c0 .602.488 1.087 1.087 1.087h6.005c1.836-.13 2.156 2.335 2.137 3.214-.04 2.007-2.308 2.652-3.382 3.487-2.861 2.21-5.077 4.459-3.78 8.781l.032.09c2.362 5.017 8.855 4.499 12.956 4.499h25.817c1.459 0 2.959.339 2.614-1.362-.342-1.7-1.063-4.024-3.162-4.024-2.1 0-1.758 1.166-3.81.57-2.054-.597-2.057-3.371 1.027-8.198 3.19-4.122 8.652-3.81 11.952-.895 3.301 2.915 2.325 7.978 1.633 10.885-.396 2.048.545 3.06 1.67 3.032H78.58c2.015-.035 1.62-1.391.464-4.035h.008z"
|
||||
fill="#fff"
|
||||
>
|
||||
</path>
|
||||
</svg>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,10 +16,13 @@
|
|||
class="brand"
|
||||
aria-label="Habitica"
|
||||
>
|
||||
<div
|
||||
<router-link to="/">
|
||||
<div
|
||||
class="logo svg-icon svg color gryphon"
|
||||
v-html="icons.melior"
|
||||
></div>
|
||||
></div>
|
||||
<div class="svg-icon"></div>
|
||||
</router-link>
|
||||
<div class="svg-icon"></div>
|
||||
</b-navbar-brand>
|
||||
<b-navbar-toggle
|
||||
|
|
|
|||
|
|
@ -991,6 +991,10 @@
|
|||
"backgroundRiverBottomText": "River Bottom",
|
||||
"backgroundRiverBottomNotes": "Explore a River Bottom.",
|
||||
|
||||
"backgrounds072024": "SET 122: Released July 2024",
|
||||
"backgroundRiverBottomText": "River Bottom",
|
||||
"backgroundRiverBottomNotes": "Explore a River Bottom.",
|
||||
|
||||
"timeTravelBackgrounds": "Steampunk Backgrounds",
|
||||
"backgroundAirshipText": "Airship",
|
||||
"backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
|
||||
|
|
|
|||
Loading…
Reference in a new issue