diff --git a/AquaNet/public/assets/fonts/GothicA1.woff2 b/AquaNet/public/assets/fonts/GothicA1.woff2 new file mode 100644 index 00000000..d288a385 Binary files /dev/null and b/AquaNet/public/assets/fonts/GothicA1.woff2 differ diff --git a/AquaNet/public/assets/fonts/ZenMaru.woff2 b/AquaNet/public/assets/fonts/ZenMaru.woff2 new file mode 100644 index 00000000..3510581c Binary files /dev/null and b/AquaNet/public/assets/fonts/ZenMaru.woff2 differ diff --git a/AquaNet/src/App.svelte b/AquaNet/src/App.svelte index cdb7a27b..159605d2 100644 --- a/AquaNet/src/App.svelte +++ b/AquaNet/src/App.svelte @@ -7,8 +7,10 @@ import { USER } from "./libs/sdk"; import type { AquaNetUser } from "./libs/generalTypes"; import Settings from "./pages/User/Settings.svelte"; - import { pfp } from "./libs/ui" import MaiPhoto from "./pages/MaiPhoto.svelte"; + import { pfp, tooltip } from "./libs/ui" + import { ANNOUNCEMENT } from "./libs/config"; + import { t } from "./libs/i18n"; console.log(`%c ┏━┓ ┳━┓━┓┏━ @@ -37,13 +39,18 @@ AquaNet {/if} - home -
alert("Coming soon™")} on:keydown={e => e.key === "Enter" && alert("Coming soon™")} - role="button" tabindex="0">maps
- rankings + {#if ANNOUNCEMENT} +
+ {t('navigation.notice')}: {ANNOUNCEMENT} +
+ {/if} + {t('navigation.home').toLowerCase()} + + {t('navigation.rankings').toLowerCase()} pictures {#if me} - + profile {/if} @@ -81,6 +88,22 @@ border-radius: vars.$border-radius object-fit: cover + .announcement + position: absolute + left: 50% + transform: translate(-50%, 0) + top: 0 + width: 50% + height: 100% + display: flex + justify-content: center + align-content: center + z-index: -1 + background: linear-gradient(90deg, #6f0f0f00 0%, vars.$c-shadow 50%, #6f0f0f00 100%) + font-size: 1.125em + text-decoration: none !important + color: inherit !important + .pfp width: 2rem height: 2rem diff --git a/AquaNet/src/app.sass b/AquaNet/src/app.sass index bc7bad14..0301b28f 100644 --- a/AquaNet/src/app.sass +++ b/AquaNet/src/app.sass @@ -134,7 +134,7 @@ button.icon .error color: vars.$c-error -input +input, textarea border-radius: vars.$border-radius border: 1px solid transparent padding: 0.6em 1.2em @@ -144,6 +144,10 @@ input background-color: vars.$ov-lighter transition: vars.$transition box-sizing: border-box + resize: none + +textarea + height: 5em // Dropdown select @@ -314,6 +318,9 @@ main.content max-width: 400px +.aqua-tooltip + z-index: 900 + .no-margin margin: 0 diff --git a/AquaNet/src/components/Tooltip.svelte b/AquaNet/src/components/Tooltip.svelte index d5316e26..6445f245 100644 --- a/AquaNet/src/components/Tooltip.svelte +++ b/AquaNet/src/components/Tooltip.svelte @@ -60,7 +60,7 @@ .tooltip position: absolute - z-index: 1000 + z-index: 900 background: white padding: 10px 16px border-radius: vars.$border-radius diff --git a/AquaNet/src/components/settings/userbox/ChuniUserplate.svelte b/AquaNet/src/components/settings/userbox/ChuniUserplate.svelte index 8f9366dc..d70711c7 100644 --- a/AquaNet/src/components/settings/userbox/ChuniUserplate.svelte +++ b/AquaNet/src/components/settings/userbox/ChuniUserplate.svelte @@ -1,5 +1,5 @@ {#await DDSreader?.getFile(`nameplate:${chuniNameplate.toString().padStart(8, "0")}`, `nameplate:00000001`) then nameplateURL} @@ -41,17 +61,36 @@ {chuniName} -
- RATING - - {ratingToString(chuniRating)} - +
+ + {#await DDSreader?.getFileFromSheet("surfboard:CHU_UI_Common_01_v11.dds", 485, 5 + (28 * ratingColorData.offset), 62, 15, undefined, ratingColorData.color) then url} + {#if url} + Rating + + {#each ratingToString(chuniRating).split("") as digit} + {#await DDSreader?.getFileFromSheet("surfboard:CHU_UI_Common_01_v11.dds", 552 + (24 * (ratingDigitOrder.indexOf(digit) ?? 0)), 1 + (28 * ratingColorData.offset), 16, 20, undefined, ratingColorData.color) then url} + Rating Digit + {/await} + {/each} + + {:else} + RATING + + {ratingToString(chuniRating)} + + {/if} + {/await}
{/await}