diff --git a/website/LEGAL.md b/website/LEGAL.md index 8bc6b27e9..da4d16141 100644 --- a/website/LEGAL.md +++ b/website/LEGAL.md @@ -21,7 +21,6 @@ cookies. The only requests to other hosts are the browser's calls to `api.github | File | Source | Licence | | --- | --- | --- | | `public/fonts/Geist-Regular.woff2`, `Geist-Medium.woff2`, `Geist-SemiBold.woff2`, `GeistMono-Regular.woff2` | Geist and Geist Mono, from `crates/horizon-theme/fonts` (converted from TTF to WOFF2) | SIL Open Font License 1.1, shipped as `public/fonts/OFL-Geist.txt` | -| `public/fonts/InstrumentSerif-Regular.woff2` | Instrument Serif, from `crates/horizon-theme/fonts` (converted from TTF to WOFF2) | SIL Open Font License 1.1, shipped as `public/fonts/OFL-InstrumentSerif.txt` | The fonts are self-hosted; nothing is fetched from a font service. @@ -29,23 +28,17 @@ The fonts are self-hosted; nothing is fetched from a font service. | File | Source | Licence | | --- | --- | --- | -| `public/favicon.svg`, `public/favicon-32.png`, `public/apple-touch-icon.png` | Horizon's logo, `docs/media/logo.svg` (an original drawing of a sunset over blocks) | MIT, Horizon's original work | -| `public/og.png` | Rendered by `scripts/shots.mjs` from `public/og.html`: the Instrument Serif wordmark over `public/media/hero-1200.webp` | MIT for the layout; the fonts and the hero as listed here | +| `public/favicon.svg`, `public/favicon-32.png`, `public/apple-touch-icon.png` | Horizon's mark, `docs/media/brand/icon.svg` (an original drawing: an H whose crossbar is the horizon), rendered by `cargo run -p xtask -- icons` | MIT, Horizon's original work | +| `public/og.png` | Rendered by `scripts/shots.mjs` from `public/og.html`: the mark, a headline and the faint wordmark, in Geist | MIT for the layout; the fonts as listed here | No Minecraft logo or wordmark appears anywhere on the site, in images or as text styling. GitHub and Discord appear only as plain text links, without their logos. -## The hero +## No hero image -| File | Source | Licence | -| --- | --- | --- | -| `public/media/hero.webp`, `hero-1200.webp`, `hero-portrait.webp` | `docs/media/sunset.jpg`, darkened slightly and, for phones, cropped by `scripts/assets.mjs` | A screenshot of Horizon's client, as listed under Screenshots | - -The grain over the hero is drawn by the stylesheet (an SVG noise filter inlined as a data URI), -not an image file. The launcher's own background (`launcher/assets/background.jpg`, from -backgrounds.supply) is **not** used: its licence is unconfirmed. For the same reason the -launcher's screenshots, which show it, are not on the site; the launcher section shows -Horizon's own menus instead. No image from backgrounds.supply or prismal is used anywhere. +The page opens on type, not a photograph. The launcher's old background +(`launcher/assets/background.jpg`, from backgrounds.supply, licence never confirmed) is gone from +the repository, so the launcher's screenshots no longer show it. ## Screenshots diff --git a/website/README.md b/website/README.md index b831efaeb..0d931179d 100644 --- a/website/README.md +++ b/website/README.md @@ -2,10 +2,11 @@ Live at **https://playhorizon.dev**. -One static page in the launcher's design language rather than its layout: the palette and -violet accent of `crates/horizon-theme`, Instrument Serif for display type and Geist for the -rest, 1px dividers and short, eased motion. A full-viewport hero over Horizon's own sunset, -then a scroll through what it is, the screenshots, the parity grid, the launcher, the patch +One static page in Horizon's design language (`docs/design-system.md`), with the tokens of +`crates/horizon-theme` (generated into `src/tokens.css` by `cargo run -p xtask -- tokens`): +Geist and Geist Mono, cool neutrals in a light and a dark appearance (the system's, or the +toggle's) and one violet accent, numbered index lists with one-pixel rules, and short, eased +motion. A headline and the download, then a scroll through what it is, the screenshots, the parity grid, the launcher, the patch notes, the community links and the contributors. Plain HTML, CSS and JavaScript; no framework and no runtime dependencies. @@ -16,12 +17,13 @@ build.mjs renders dist/ (no dependencies) serve.mjs a tiny static server for local checks src/index.html the page, with {{placeholders}} build.mjs fills src/404.html the not-found page -src/style.css the design tokens and every style +src/tokens.css the design tokens, generated from crates/horizon-theme (do not edit) +src/style.css every style, on top of the tokens src/main.js download buttons, patch notes, links, contributors, nav and menu, tabs, lightbox, motion src/markdown.js a small Markdown renderer (escapes everything), shared by build and page src/releases.js the patch notes' markup, shared by build and page src/contributors.js the contributors' filtering and markup, shared by build and page -public/ fonts, screenshots, the hero, icons, og.png, robots.txt, sitemap.xml: copied as is +public/ fonts, screenshots, icons, og.png, robots.txt, sitemap.xml: copied as is scripts/assets.mjs rebuilds public/ from the repo (fonts to WOFF2, images to WebP) scripts/shots.mjs Playwright screenshots at every width, and og.png Dockerfile, Caddyfile, railway.json the Railway service @@ -80,18 +82,10 @@ or `launcher/links.json` change on main. No variables are needed; an optional `GITHUB_TOKEN` (read-only, public repos) lets the build bake the releases even when GitHub's anonymous rate limit is hit. -## The hero - -`public/media/hero*.webp` is Horizon's sunset over a savanna river valley -(`docs/media/sunset.jpg`), darkened a little by `scripts/assets.mjs`, with a portrait crop for -phones. The launcher's prismal background is not used, and the launcher's screenshots are left -out because they show it: its licence (backgrounds.supply) is unconfirmed. The launcher section -shows Horizon's own menus and settings instead; see LEGAL.md. - ## Rules the site keeps - The disclaimer, "Not an official Minecraft product. Not approved by or associated with - Mojang or Microsoft.", is in the hero, the phone menu, the footer and the 404 page. + Mojang or Microsoft.", is under the headline, in the phone menu, the footer and the 404 page. - No Minecraft logo or wordmark; "Minecraft" appears only descriptively ("for Minecraft: Java Edition 26.3"). No game files are offered or linked. - Parity is worded as the README words it: 100% of what the harnesses compare. diff --git a/website/build.mjs b/website/build.mjs index 5e6299ee4..19451900e 100644 --- a/website/build.mjs +++ b/website/build.mjs @@ -131,7 +131,9 @@ for (const file of ["markdown.js", "releases.js", "contributors.js", "main.js"]) await writeFile(join(dist, "assets", names[file]), code); } const jsName = names["main.js"]; -const css = await readFile(join(site, "src/style.css"), "utf8"); +// The design tokens come first: src/tokens.css is generated from crates/horizon-theme +// (`cargo run -p xtask -- tokens`), so the page shares the launcher's and the game's values. +const css = (await readFile(join(site, "src/tokens.css"), "utf8")) + "\n" + (await readFile(join(site, "src/style.css"), "utf8")); // The stylesheet is inlined into the page, so the first paint needs no second request. const cssName = `style.${fingerprint(css)}.css`; await writeFile(join(dist, "assets", cssName), css); diff --git a/website/public/fonts/InstrumentSerif-Regular.woff2 b/website/public/fonts/InstrumentSerif-Regular.woff2 deleted file mode 100644 index d91cd10fa..000000000 Binary files a/website/public/fonts/InstrumentSerif-Regular.woff2 and /dev/null differ diff --git a/website/public/fonts/OFL-InstrumentSerif.txt b/website/public/fonts/OFL-InstrumentSerif.txt deleted file mode 100644 index 669ce7917..000000000 --- a/website/public/fonts/OFL-InstrumentSerif.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2022 The Instrument Serif Project Authors (https://github.com/Instrument/instrument-serif) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -https://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/website/public/media/hero-1200.webp b/website/public/media/hero-1200.webp deleted file mode 100644 index 9b52740cb..000000000 Binary files a/website/public/media/hero-1200.webp and /dev/null differ diff --git a/website/public/media/hero-portrait.webp b/website/public/media/hero-portrait.webp deleted file mode 100644 index ae85cc434..000000000 Binary files a/website/public/media/hero-portrait.webp and /dev/null differ diff --git a/website/public/media/hero.webp b/website/public/media/hero.webp deleted file mode 100644 index 76af9b7b6..000000000 Binary files a/website/public/media/hero.webp and /dev/null differ diff --git a/website/public/og.html b/website/public/og.html index 7f4bea66b..539ca5ff0 100644 --- a/website/public/og.html +++ b/website/public/og.html @@ -1,31 +1,30 @@ - + -
-

Horizon

-

A Rust rewrite for Minecraft: Java Edition 26.3,
checked against vanilla by differential harnesses.

+ +
HorizonPLAYHORIZON.DEV
+

The game you know, rebuilt in Rust.

+

Minecraft: Java Edition 26.3, checked against vanilla by differential harnesses. Unofficial; not associated with Mojang or Microsoft.

- diff --git a/website/public/og.png b/website/public/og.png index 4c179e77a..1b9f270e7 100644 Binary files a/website/public/og.png and b/website/public/og.png differ diff --git a/website/scripts/assets.mjs b/website/scripts/assets.mjs index e8af69b90..77d4f136a 100644 --- a/website/scripts/assets.mjs +++ b/website/scripts/assets.mjs @@ -16,11 +16,9 @@ const fonts = [ "Geist-Medium.ttf", "Geist-SemiBold.ttf", "GeistMono-Regular.ttf", - "InstrumentSerif-Regular.ttf", ]; -// The launcher's screenshots are left out: they show its background, whose licence is -// unconfirmed (see LEGAL.md). [source, name]; every image becomes media/.webp and media/-800.webp. +// [source, name]; every image becomes media/.webp and media/-800.webp. export const images = [ ["docs/media/sunset.jpg", "sunset"], ["docs/media/village.jpg", "village"], @@ -42,7 +40,7 @@ for (const font of fonts) { const ttf = await readFile(join(repo, "crates/horizon-theme/fonts", font)); await writeFile(join(pub, "fonts", font.replace(".ttf", ".woff2")), await wawoff2.compress(ttf)); } -for (const licence of ["OFL-Geist.txt", "OFL-InstrumentSerif.txt"]) { +for (const licence of ["OFL-Geist.txt"]) { await copyFile(join(repo, "crates/horizon-theme/fonts", licence), join(pub, "fonts", licence)); } @@ -52,16 +50,7 @@ for (const [source, name] of images) { await sharp(input).resize({ width: 800 }).webp({ quality: 78 }).toFile(join(pub, "media", `${name}-800.webp`)); } -// The hero: Horizon's sunset over a savanna river valley, darkened and cooled a little so the -// wordmark and the violet accent sit on it, in a landscape and a portrait crop. -const hero = () => sharp(join(repo, "docs/media/sunset.jpg")).modulate({ brightness: 0.82, saturation: 0.86 }).linear(1.04, -6); -await hero().webp({ quality: 74 }).toFile(join(pub, "media/hero.webp")); -await hero().resize({ width: 1200 }).webp({ quality: 72 }).toFile(join(pub, "media/hero-1200.webp")); -await hero().extract({ left: 470, top: 0, width: 840, height: 1080 }).resize({ width: 720 }).webp({ quality: 72 }).toFile(join(pub, "media/hero-portrait.webp")); - -// Icons from the project's logo. -await copyFile(join(repo, "docs/media/logo.svg"), join(pub, "favicon.svg")); -await sharp(join(repo, "docs/media/logo.svg")).resize(180).png().toFile(join(pub, "apple-touch-icon.png")); -await sharp(join(repo, "docs/media/logo.svg")).resize(32).png().toFile(join(pub, "favicon-32.png")); +// The icons (favicon.svg, favicon-32.png, apple-touch-icon.png) come from Horizon's mark: +// `cargo run -p xtask -- icons` writes them with the rest of the brand (docs/media/brand). console.log("assets written to public/"); diff --git a/website/src/404.html b/website/src/404.html index 1707c70d9..d12c91653 100644 --- a/website/src/404.html +++ b/website/src/404.html @@ -5,29 +5,23 @@ Not found · Horizon - - + + + +
- -
-

404

-

Not here

-

This page doesn't exist. The rest of Horizon is one page away.

+
+

404Not found

+

Not here.

+

This page doesn't exist. The rest of Horizon is one page away.

Not an official Minecraft product. Not approved by or associated with Mojang or Microsoft.

+ diff --git a/website/src/index.html b/website/src/index.html index 65b3b54e6..208eba7e5 100644 --- a/website/src/index.html +++ b/website/src/index.html @@ -5,8 +5,9 @@ Horizon: a Rust rewrite for Minecraft: Java Edition 26.3 - - + + + @@ -19,17 +20,15 @@ - + - + - - - + @@ -37,7 +36,7 @@