Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Improvements to the release notes formatting and navigation. #444

Merged
merged 2 commits into from
Jan 4, 2023
Merged

fix: Improvements to the release notes formatting and navigation. #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c7b059
fix: Improvements to the release notes formatting and navigation. Clo…
alexanderson1993 Jan 4, 2023
8b39801
Merge branch 'develop' of github.com:Thorium-Sim/thorium-nova into re…
alexanderson1993 Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Starmap/SystemMarker/SystemLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions client/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
11 changes: 8 additions & 3 deletions client/src/pages/Releases/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
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";

const Releases = () => {
return (
<div className="overflow-y-auto h-full">
<div className="prose lg:prose-xl max-w-prose mx-auto mt-8 ">
<Link to="/">Go Back</Link>
<h1>Release Notes</h1>
<div className="prose lg:prose-base relative max-w-prose mx-auto mt-8 ">
<Link
to="/"
className="fixed block left-4 no-underline z-10 sm:bg-black/70 sm:py-1 sm:px-2 rounded-full sm:hover:bg-white/10"
>
<FaArrowLeft className="inline -mt-1" /> Go Back
</Link>
<div className="p-8 rounded-box md:mt-16 mb-16 backdrop-filter backdrop-blur backdrop-brightness-50 backdrop-contrast-125 prose-h1:text-xl">
<div dangerouslySetInnerHTML={{__html: releaseNotes.data}} />
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/src/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 16 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
"access": "restricted"
},
"dependencies": {
"react": "^18.2.0",
"web-file-polyfill": "^1.0.4"
"react": "^18.2.0"
}
}
1 change: 1 addition & 0 deletions server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down