From 7c7b059d01b809d6f1579840df7c2b853bd4990f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 4 Jan 2023 08:11:14 -0500 Subject: [PATCH] fix: Improvements to the release notes formatting and navigation. Closes #443 --- client/src/components/Credits.module.css | 4 ++-- .../Starmap/SystemMarker/SystemLabel.tsx | 2 +- client/src/main.tsx | 1 + client/src/pages/Releases/index.tsx | 11 ++++++++--- client/src/theme.css | 4 ++-- package-lock.json | 17 ++++++++++++++--- package.json | 1 + 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/client/src/components/Credits.module.css b/client/src/components/Credits.module.css index 05b0f87f..684d113b 100644 --- a/client/src/components/Credits.module.css +++ b/client/src/components/Credits.module.css @@ -11,9 +11,9 @@ .all-credits { animation: scroll-up var(--credits-duration, 3s) linear infinite; } -.all-credits:hover { +/*.all-credits:hover { animation-play-state: paused; -} +}*/ @keyframes scroll-up { to { 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 bf8a6ddf..68ed62ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "thorium-nova", - "version": "1.0.0-alpha.5", + "version": "1.0.0-alpha.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "thorium-nova", - "version": "1.0.0-alpha.5", + "version": "1.0.0-alpha.7", "hasInstallScript": true, "license": "Apache 2.0", "workspaces": [ @@ -16,6 +16,7 @@ "desktop" ], "dependencies": { + "@fontsource/outfit": "^4.5.10", "react": "^18.2.0" }, "devDependencies": { @@ -2974,6 +2975,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", @@ -32292,6 +32298,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", @@ -37389,7 +37400,7 @@ "@types/three": "^0.143.0", "@uiw/react-monacoeditor": "^3.5.4", "@use-gesture/react": "^10.2.18", - "@vitejs/plugin-react": "*", + "@vitejs/plugin-react": "^2.1.0", "@vitejs/plugin-react-refresh": "^1.3.6", "autoprefixer": "^10.4.8", "camera-controls": "^1.36.1", diff --git a/package.json b/package.json index 11f10e48..66cf480a 100644 --- a/package.json +++ b/package.json @@ -161,6 +161,7 @@ "access": "restricted" }, "dependencies": { + "@fontsource/outfit": "^4.5.10", "react": "^18.2.0" } }