diff --git a/client/package.json b/client/package.json index 6000f43a..e6d4c936 100644 --- a/client/package.json +++ b/client/package.json @@ -15,6 +15,7 @@ "@dnd-kit/sortable": "^7.0.1", "@dnd-kit/utilities": "^3.2.0", "@floating-ui/react-dom-interactions": "^0.9.1", + "@fontsource/outfit": "^4.5.10", "@headlessui/react": "^1.6.6", "@mdx-js/mdx": "^2.1.2", "@mdx-js/react": "^2.1.2", diff --git a/client/src/components/Starmap/SystemMarker/SystemLabel.tsx b/client/src/components/Starmap/SystemMarker/SystemLabel.tsx index ec14270a..d4d4e2ac 100644 --- a/client/src/components/Starmap/SystemMarker/SystemLabel.tsx +++ b/client/src/components/Starmap/SystemMarker/SystemLabel.tsx @@ -30,7 +30,7 @@ const SystemLabel: React.FC<{ const textTexture = React.useMemo(() => { let texture = new TextTexture({ color, - fontFamily: 'Electrolize, "Gill Sans", sans-serif', + fontFamily: 'Electrolize, "Outfit", sans-serif', fontSize: 128, alignment: "right", text: name, diff --git a/client/src/main.tsx b/client/src/main.tsx index 0c47cab8..082e4707 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -2,6 +2,7 @@ import ReactDOM from "react-dom/client"; import "./theme.css"; import App from "./App"; import {initializeTabId} from "@thorium/tab-id"; +import "@fontsource/outfit"; initializeTabId(); diff --git a/client/src/pages/Releases/index.tsx b/client/src/pages/Releases/index.tsx index e0571d7c..b90ef957 100644 --- a/client/src/pages/Releases/index.tsx +++ b/client/src/pages/Releases/index.tsx @@ -1,3 +1,4 @@ +import {FaArrowLeft} from "react-icons/fa"; import {Link} from "react-router-dom"; // Uses a Vite plugin to load the actual data import releaseNotes from "./release-notes.json"; @@ -5,9 +6,13 @@ import releaseNotes from "./release-notes.json"; const Releases = () => { return (
-
- Go Back -

Release Notes

+
+ + Go Back +
diff --git a/client/src/theme.css b/client/src/theme.css index 1642421b..26255f62 100644 --- a/client/src/theme.css +++ b/client/src/theme.css @@ -22,8 +22,8 @@ body { } body { - font-family: "Gill Sans", system-ui, -apple-system, "Segoe UI", Roboto, - Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; + font-family: "Outfit", system-ui, -apple-system, "Segoe UI", Roboto, Helvetica, + Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; } .alert { @apply relative flex items-center justify-between p-4 rounded-box bg-neutral text-neutral-content bg-opacity-50; diff --git a/package-lock.json b/package-lock.json index 3edd264c..17bdcac8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,7 @@ "desktop" ], "dependencies": { - "react": "^18.2.0", - "web-file-polyfill": "^1.0.4" + "react": "^18.2.0" }, "devDependencies": { "@semantic-release/changelog": "^6.0.1", @@ -60,6 +59,7 @@ "@dnd-kit/sortable": "^7.0.1", "@dnd-kit/utilities": "^3.2.0", "@floating-ui/react-dom-interactions": "^0.9.1", + "@fontsource/outfit": "^4.5.10", "@headlessui/react": "^1.6.6", "@mdx-js/mdx": "^2.1.2", "@mdx-js/react": "^2.1.2", @@ -2976,6 +2976,11 @@ "react-dom": ">=16.8.0" } }, + "node_modules/@fontsource/outfit": { + "version": "4.5.10", + "resolved": "https://registry.npmjs.org/@fontsource/outfit/-/outfit-4.5.10.tgz", + "integrity": "sha512-wT8hmcueW5okOS8BQGARL0zdJOe032FctWr9df/0ixXpAiZ4WfnigRd3/ThhmmRwFgNxbjwqZ9bmO+5QDjaTbA==" + }, "node_modules/@formatjs/ecma402-abstract": { "version": "1.11.8", "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.8.tgz", @@ -30504,6 +30509,7 @@ "postcss-less": "^6.0.0", "tailwindcss": "^3.1.8", "three": "^0.143.0", + "web-file-polyfill": "^1.0.4", "yaml": "^2.1.1", "yauzl": "^2.10.0", "yazl": "^2.5.1" @@ -32322,6 +32328,11 @@ "aria-hidden": "^1.1.3" } }, + "@fontsource/outfit": { + "version": "4.5.10", + "resolved": "https://registry.npmjs.org/@fontsource/outfit/-/outfit-4.5.10.tgz", + "integrity": "sha512-wT8hmcueW5okOS8BQGARL0zdJOe032FctWr9df/0ixXpAiZ4WfnigRd3/ThhmmRwFgNxbjwqZ9bmO+5QDjaTbA==" + }, "@formatjs/ecma402-abstract": { "version": "1.11.8", "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.8.tgz", @@ -37395,6 +37406,7 @@ "@dnd-kit/sortable": "^7.0.1", "@dnd-kit/utilities": "^3.2.0", "@floating-ui/react-dom-interactions": "^0.9.1", + "@fontsource/outfit": "*", "@headlessui/react": "^1.6.6", "@mdx-js/mdx": "^2.1.2", "@mdx-js/react": "^2.1.2", @@ -49776,6 +49788,7 @@ "three": "^0.143.0", "ts-eager": "^2.0.2", "typescript": "^4.7.4", + "web-file-polyfill": "^1.0.4", "yaml": "^2.1.1", "yauzl": "^2.10.0", "yazl": "^2.5.1" @@ -49837,7 +49850,7 @@ "shared": { "version": "file:shared", "requires": { - "@msgpack/msgpack": "*", + "@msgpack/msgpack": "^2.8.0", "@types/lodash.throttle": "^4.1.7", "lodash.throttle": "^4.1.1", "pure-rand": "^5.0.1", diff --git a/package.json b/package.json index 758c744a..11f10e48 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,6 @@ "access": "restricted" }, "dependencies": { - "react": "^18.2.0", - "web-file-polyfill": "^1.0.4" + "react": "^18.2.0" } } diff --git a/server/package.json b/server/package.json index 002d83f7..4f8b7ef1 100644 --- a/server/package.json +++ b/server/package.json @@ -44,6 +44,7 @@ "postcss-less": "^6.0.0", "tailwindcss": "^3.1.8", "three": "^0.143.0", + "web-file-polyfill": "^1.0.4", "yaml": "^2.1.1", "yauzl": "^2.10.0", "yazl": "^2.5.1"