diff --git a/.github/workflows/addons.yml b/.github/workflows/addons.yml index 8e48035..8137994 100644 --- a/.github/workflows/addons.yml +++ b/.github/workflows/addons.yml @@ -4,7 +4,8 @@ name: Addons package # AppImage with the add-ons inside (crates/cr-addons), and, on main or by # hand, publishes it on GitHub Packages as the OCI artifact # ghcr.io//corerules-community-addons, tagged with the app version -# and latest, and on the release "addons", whose tag follows main: there +# and latest, and as the file itself in the Maven registry of GitHub +# Packages, and on the release "addons", whose tag follows main: there # CoreRules-Community-Addons-x86_64.AppImage is always the newest, for a # download link that does not change. on: @@ -49,6 +50,11 @@ jobs: test -x usr/bin/corerules-community-addons test -f usr/share/icons/hicolor/256x256/apps/io.github.brahm.CoreRules.Addons.png ls -l "$GITHUB_WORKSPACE"/dist/CoreRules-Community-Addons-*.AppImage + - if: github.event_name != 'pull_request' + uses: actions/upload-artifact@v4 + with: + name: addons-appimage + path: dist/CoreRules-Community-Addons-${{ steps.v.outputs.version }}-x86_64.AppImage - if: github.event_name != 'pull_request' uses: oras-project/setup-oras@v1 - if: github.event_name != 'pull_request' @@ -97,7 +103,72 @@ jobs: Direct link: https://github.com/${{ github.repository }}/releases/download/addons/CoreRules-Community-Addons-x86_64.AppImage - The same file is on GitHub Packages: `oras pull ghcr.io/${{ github.repository_owner }}/corerules-community-addons:latest`. The app itself is on the [Core Rules releases](https://github.com/${{ github.repository }}/releases). + The same file is on GitHub Packages twice: as a file, `corerules-community-addons-${{ steps.v.outputs.version }}-x86_64.AppImage`, in the Maven package `io.github.brahm.corerules-community-addons` ([the project's packages](https://github.com/${{ github.repository_owner }}?tab=packages&repo_name=${{ github.event.repository.name }})), and in the OCI package [`corerules-community-addons`](https://github.com/${{ github.repository }}/pkgs/container/corerules-community-addons): `oras pull ghcr.io/${{ github.repository_owner }}/corerules-community-addons:latest`. The app itself is on the [Core Rules releases](https://github.com/${{ github.repository }}/releases). files: | dist/CoreRules-Community-Addons-x86_64.AppImage dist/CoreRules-Community-Addons-${{ steps.v.outputs.version }}-x86_64.AppImage + + # GitHub Packages has no registry for plain files, and its container + # registry shows the AppImage as an OCI artifact. Its Maven registry keeps + # any file as it is, with its name and extension, and the package page + # lists it under Assets for download, so the AppImage goes there too, as + # io.github.brahm:corerules-community-addons:VERSION:x86_64@AppImage. A + # version is published once, since Maven versions cannot be replaced; a + # later build of the same version only replaces the other two copies. + maven: + needs: package + if: github.event_name != 'pull_request' + runs-on: ubuntu-24.04 + permissions: + contents: read + packages: write + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REGISTRY: https://maven.pkg.github.com/${{ github.repository }} + ARTIFACT: io/github/brahm/corerules-community-addons + steps: + - uses: actions/checkout@v4 + - id: v + run: echo "version=$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)" >> "$GITHUB_OUTPUT" + - uses: actions/download-artifact@v4 + with: + name: addons-appimage + path: dist + # Writes ~/.m2/settings.xml with the server "github", which logs in + # as GITHUB_ACTOR with GITHUB_TOKEN. + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '21' + server-id: github + - id: exists + name: Look for this version on GitHub Packages + run: | + version=${{ steps.v.outputs.version }} + code=$(curl -s -o /dev/null -w '%{http_code}' -u "$GITHUB_ACTOR:$GITHUB_TOKEN" \ + "$REGISTRY/$ARTIFACT/$version/corerules-community-addons-$version.pom") + echo "HTTP $code" + if [ "$code" = 200 ]; then + echo "::notice::corerules-community-addons $version is already in the Maven registry; it keeps its first build" + echo "found=true" >> "$GITHUB_OUTPUT" + fi + - if: steps.exists.outputs.found != 'true' + name: Publish the AppImage on GitHub Packages (Maven) + run: | + version=${{ steps.v.outputs.version }} + mvn -B --no-transfer-progress deploy:deploy-file \ + -Durl="$REGISTRY" -DrepositoryId=github \ + -Dfile="dist/CoreRules-Community-Addons-$version-x86_64.AppImage" \ + -DgroupId=io.github.brahm -DartifactId=corerules-community-addons \ + -Dversion="$version" -Dclassifier=x86_64 -Dpackaging=AppImage \ + -DgeneratePom=true \ + -DgeneratePom.description="Core Rules Community Add-ons Collection: 672 community add-ons for AD&D Core Rules 2.0 Expansion, in one self-installing AppImage" + - name: Check the published AppImage + run: | + version=${{ steps.v.outputs.version }} + curl -sSfL -u "$GITHUB_ACTOR:$GITHUB_TOKEN" -o published.AppImage \ + "$REGISTRY/$ARTIFACT/$version/corerules-community-addons-$version-x86_64.AppImage" + sha256sum published.AppImage "dist/CoreRules-Community-Addons-$version-x86_64.AppImage" + if [ "${{ steps.exists.outputs.found }}" != true ]; then + cmp published.AppImage "dist/CoreRules-Community-Addons-$version-x86_64.AppImage" + fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2be0c0..30f04fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -141,12 +141,14 @@ jobs: # supported release, and the app has to start and keep running in each # interface language, with its texts in that language. Minimal # containers lack the Mesa drivers every desktop has, so the tests add them. + # Ubuntu 26.10 and Fedora 45 are where users tested 1.0 before it was + # released (ubuntu:latest is the LTS, fedora:latest lags a release). test-deb: needs: deb strategy: fail-fast: false matrix: - image: ['ubuntu:26.04', 'ubuntu:latest'] + image: ['ubuntu:26.04', 'ubuntu:26.10', 'ubuntu:latest'] runs-on: ubuntu-24.04 container: ${{ matrix.image }} env: @@ -179,7 +181,7 @@ jobs: strategy: fail-fast: false matrix: - image: ['fedora:44', 'fedora:latest'] + image: ['fedora:44', 'fedora:45', 'fedora:latest'] runs-on: ubuntu-24.04 container: ${{ matrix.image }} steps: @@ -222,7 +224,7 @@ jobs: strategy: fail-fast: false matrix: - image: ['fedora:44', 'ubuntu:26.04', 'fedora:latest', 'ubuntu:latest'] + image: ['fedora:44', 'ubuntu:26.04', 'fedora:45', 'ubuntu:26.10', 'fedora:latest', 'ubuntu:latest'] runs-on: ubuntu-24.04 container: ${{ matrix.image }} env: @@ -275,4 +277,7 @@ jobs: name: Core Rules ${{ needs.version.outputs.version }}${{ contains(needs.version.outputs.version, '-rc') && ' release candidate' || startsWith(needs.version.outputs.version, '0.') && ' beta' || '' }} body_path: packaging/release-notes.md prerelease: ${{ startsWith(needs.version.outputs.version, '0.') || contains(needs.version.outputs.version, '-') }} + # A final release becomes the repository's latest release, which + # the addons release never is. + make_latest: ${{ !startsWith(needs.version.outputs.version, '0.') && !contains(needs.version.outputs.version, '-') }} files: dist/* diff --git a/Cargo.lock b/Cargo.lock index 805c383..58a6f66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,7 +85,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "cr-addons" -version = "1.0.0-rc2" +version = "1.0.0" dependencies = [ "cr-formats", "cr-i18n", @@ -97,7 +97,7 @@ dependencies = [ [[package]] name = "cr-cli" -version = "1.0.0-rc2" +version = "1.0.0" dependencies = [ "cr-formats", "cr-store", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "cr-formats" -version = "1.0.0-rc2" +version = "1.0.0" dependencies = [ "encoding_rs", "thiserror", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "cr-gtk" -version = "1.0.0-rc2" +version = "1.0.0" dependencies = [ "cr-formats", "cr-i18n", @@ -125,11 +125,11 @@ dependencies = [ [[package]] name = "cr-i18n" -version = "1.0.0-rc2" +version = "1.0.0" [[package]] name = "cr-store" -version = "1.0.0-rc2" +version = "1.0.0" dependencies = [ "color_quant", "cr-formats", diff --git a/Cargo.toml b/Cargo.toml index 6186ea4..2cffc48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = ["crates/cr-i18n", "crates/cr-formats", "crates/cr-store", "crates/cr- default-members = ["crates/cr-i18n", "crates/cr-formats", "crates/cr-store", "crates/cr-cli", "crates/cr-gtk"] [workspace.package] -version = "1.0.0-rc2" +version = "1.0.0" edition = "2024" license = "MIT" repository = "https://github.com/brahm/corerules" diff --git a/README.md b/README.md index c4d7eb1..a28aa70 100644 --- a/README.md +++ b/README.md @@ -20,12 +20,12 @@ the help. The app reads and writes the original's own data files, so characters, monsters, encounters and packages made in either program open in the other. -> **Release candidate.** Version 1.0.0-rc2 is the release candidate for -> 1.0. Every feature was checked against the original programs and went -> through a full round of manual tests. It now needs real use: keep a copy -> of your `Chars` and `UserDbas` folders, and -> [report](https://github.com/brahm/corerules/issues) anything that is -> wrong or that works differently from the original. +> **Version 1.0.0, the first stable release.** Every feature was checked +> against the original programs and went through a full round of manual +> tests, and players and Dungeon Masters ran the release candidate on +> Fedora 45 beta, Ubuntu 26.10, Bazzite, Arch Linux and CachyOS, where it +> worked as it should. [Download it](#installing) for your distribution, +> or visit the [website](https://brahm.github.io/corerules/). ![The character list with a character made in the original program](docs/screenshots/character.png) @@ -54,11 +54,11 @@ preserved by the Internet Archive: ## Status and roadmap -1. **Release candidate (now).** 1.0.0-rc2 goes to real users. Problems - found are fixed in further release candidates. -2. **1.0.** Once the release candidate is confirmed stable after the - testing period, the last one becomes the final 1.0: a faithful - replacement for the original program. +1. **Release candidates (done).** 1.0.0-rc1 and 1.0.0-rc2 went to real + users, and the problems they found were fixed. +2. **1.0 (now).** The release candidate was confirmed stable on Fedora 45 + beta, Ubuntu 26.10, Bazzite, Arch Linux and CachyOS, and became 1.0.0: + a faithful replacement for the original program. 3. **Flathub.** With 1.0 stable, the app is published on Flathub. 4. **Windows and macOS.** Then come Windows and macOS builds, on the same backend. @@ -454,16 +454,32 @@ same: ## Installing Every [release](https://github.com/brahm/corerules/releases) has -packages for x86-64 Linux. Release candidates are marked as pre-releases -on that page. +packages for x86-64 Linux. These are the files of +[Core Rules 1.0.0](https://github.com/brahm/corerules/releases/tag/v1.0.0), +the latest release: -| System | Package | Install | +| System | Download | Install | | --- | --- | --- | -| Fedora 44 or newer | `.rpm` | `sudo dnf install ./corerules-*.rpm` | -| Ubuntu 26.04 or newer | `.deb` | `sudo apt install ./corerules_*_amd64.deb` | -| Arch Linux, CachyOS, Omarchy | `.pkg.tar.zst` | `sudo pacman -U ./corerules-*.pkg.tar.zst` | -| Any distribution | `.flatpak` | `flatpak install --user CoreRules-*.flatpak` | -| Any distribution (glibc 2.43+) | `.AppImage` | `chmod +x CoreRules-*.AppImage`, then run it | +| Fedora 44 or newer | [`corerules-1.0.0-1.fc44.x86_64.rpm`](https://github.com/brahm/corerules/releases/download/v1.0.0/corerules-1.0.0-1.fc44.x86_64.rpm) | `sudo dnf install ./corerules-1.0.0-1.fc44.x86_64.rpm` | +| Ubuntu 26.04 or newer | [`corerules_1.0.0_amd64.deb`](https://github.com/brahm/corerules/releases/download/v1.0.0/corerules_1.0.0_amd64.deb) | `sudo apt install ./corerules_1.0.0_amd64.deb` | +| Arch Linux, CachyOS, Omarchy | [`corerules-1.0.0-1-x86_64.pkg.tar.zst`](https://github.com/brahm/corerules/releases/download/v1.0.0/corerules-1.0.0-1-x86_64.pkg.tar.zst) | `sudo pacman -U ./corerules-1.0.0-1-x86_64.pkg.tar.zst` | +| Any distribution with Flatpak, such as Bazzite | [`CoreRules-1.0.0.flatpak`](https://github.com/brahm/corerules/releases/download/v1.0.0/CoreRules-1.0.0.flatpak) | `flatpak install --user CoreRules-1.0.0.flatpak` | +| Any distribution (glibc 2.43+) | [`CoreRules-1.0.0-x86_64.AppImage`](https://github.com/brahm/corerules/releases/download/v1.0.0/CoreRules-1.0.0-x86_64.AppImage) | `chmod +x CoreRules-1.0.0-x86_64.AppImage`, then run it | +| Community add-ons (installer) | [`CoreRules-Community-Addons-x86_64.AppImage`](https://github.com/brahm/corerules/releases/download/addons/CoreRules-Community-Addons-x86_64.AppImage) | `chmod +x CoreRules-Community-Addons-x86_64.AppImage`, then run it | + +The release also has the +[`PKGBUILD`](https://github.com/brahm/corerules/releases/download/v1.0.0/PKGBUILD) +of the pacman package and +[`SHA256SUMS`](https://github.com/brahm/corerules/releases/download/v1.0.0/SHA256SUMS), +the checksums of every file. Before 1.0 there were betas (0.x) and release +candidates (`-rc`), marked as pre-releases on the releases page; the 1.0.0 +packages replace a release candidate on update. + +Users ran 1.0 on Fedora 45 beta (the `.rpm`), Ubuntu 26.10 (the `.deb`), +Bazzite (the Flatpak and the AppImage, as on any Fedora Atomic desktop), +Arch Linux and CachyOS (the pacman package). The release workflow also +installs and starts every package on clean Ubuntu 26.04 and 26.10, +Fedora 44 and 45, Arch Linux and CachyOS systems. Ubuntu 24.04 and older releases are not supported: the `.deb` refuses to install there, and the Flatpak is the way to run the app on them. @@ -524,19 +540,28 @@ classes, kits, spells, monsters, modules and the AD&D Core Rules User Database), converted to the Expansion's format and consolidated into 36,525 items, with the 668 pictures that came with them. Monster types, monsters, races and characters show those pictures in the app. It ships as its own self-installing AppImage -(`crates/cr-addons`, GTK 4 and libadwaita): -[download it here](https://github.com/brahm/corerules/releases/download/addons/CoreRules-Community-Addons-x86_64.AppImage). -It is also on GitHub Packages as +(`crates/cr-addons`, GTK 4 and libadwaita), version 1.0.0 with the app: + +**[Download CoreRules-Community-Addons-x86_64.AppImage](https://github.com/brahm/corerules/releases/download/addons/CoreRules-Community-Addons-x86_64.AppImage)** + +This link always gives the newest build; the +[addons release](https://github.com/brahm/corerules/releases/tag/addons) +also keeps each version, such as +[`CoreRules-Community-Addons-1.0.0-x86_64.AppImage`](https://github.com/brahm/corerules/releases/download/addons/CoreRules-Community-Addons-1.0.0-x86_64.AppImage). +The same AppImage is on [GitHub Packages](https://github.com/brahm?tab=packages&repo_name=corerules) +twice: as the file itself in the Maven package +`io.github.brahm.corerules-community-addons`, whose page lists +`corerules-community-addons-1.0.0-x86_64.AppImage` for download, and as the +OCI artifact [`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons) -(`oras pull ghcr.io/brahm/corerules-community-addons:latest`), and needs the app 0.7.2 or newer. The installer finds the app on its own, +(`oras pull ghcr.io/brahm/corerules-community-addons:latest`). It needs the app 0.7.2 or newer. The installer finds the app on its own, whether it came as the Flatpak, the .deb, .rpm or pacman package or an AppImage, and speaks the app's six languages. Its [README](addons/README.md) says what is inside, how it was built and how to install it. ## Reporting problems -This is a release candidate, and real use is what it needs now. Please -[open an issue](https://github.com/brahm/corerules/issues) for anything +Please [open an issue](https://github.com/brahm/corerules/issues) for anything that crashes, saves something the original cannot open, or works differently from the original in a way the list above does not mention. Say which package you installed, which disc your data came from, and @@ -638,8 +663,8 @@ flatpak-builder --user --install-deps-from=flathub --install build \ ``` The Packages workflow in GitHub Actions builds all five, installs each one -on clean Ubuntu 26.04, Ubuntu latest, Fedora 44, Fedora latest, Arch Linux -and CachyOS containers and starts the app there once in each of its six languages, +on clean Ubuntu 26.04, 26.10 and latest, Fedora 44, 45 and latest, Arch +Linux and CachyOS containers and starts the app there once in each of its six languages, checking that every text on screen is in that language (`packaging/smoke-test.sh`). Pushing a `v*` tag, or running the workflow with a tag, publishes them as a release; `packaging/release-notes.md` is its diff --git a/addons/GUIA.md b/addons/GUIA.md index 4612d8c..03dd00a 100644 --- a/addons/GUIA.md +++ b/addons/GUIA.md @@ -18,7 +18,10 @@ O que é preciso: **[Baixe o instalador aqui](https://github.com/brahm/corerules/releases/download/addons/CoreRules-Community-Addons-x86_64.AppImage).** O link sempre traz a versão mais nova. A [release addons](https://github.com/brahm/corerules/releases/tag/addons) também guarda cada versão. -O mesmo arquivo é publicado no GitHub Packages do projeto, como [`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons). É um artefato OCI, e não uma imagem de contêiner: o `docker pull` que a página do GitHub mostra não serve. Para baixar de lá, use o [ORAS](https://oras.land): +O mesmo arquivo é publicado no [GitHub Packages](https://github.com/brahm?tab=packages&repo_name=corerules) do projeto, de duas formas, porque o GitHub Packages não tem um registro para arquivos soltos: + +* **Como o arquivo AppImage**, no pacote Maven `io.github.brahm.corerules-community-addons`. A página dele lista `corerules-community-addons-VERSÃO-x86_64.AppImage` em Assets, para baixar pelo navegador. Baixar desse registro pela linha de comando pede um token do GitHub, mesmo com o pacote público. +* **Como artefato OCI**, [`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons), que baixa sem conta nenhuma. Ele guarda a AppImage como seu único arquivo, e não uma imagem de contêiner: o `docker pull` que a página do GitHub mostra não serve. Para baixar de lá, use o [ORAS](https://oras.land): ```sh oras pull ghcr.io/brahm/corerules-community-addons:latest @@ -37,7 +40,7 @@ curl -L -H "Authorization: Bearer $token" -o CoreRules-Community-Addons-x86_64.A "https://ghcr.io/v2/$repo/blobs/$layer" ``` -Além de `latest`, cada versão do app tem a sua tag, como `1.0.0-rc1`. +Além de `latest`, cada versão do app tem a sua tag, como `1.0.0`. ## Instalação diff --git a/addons/README.md b/addons/README.md index 3c5ed2b..70b2845 100644 --- a/addons/README.md +++ b/addons/README.md @@ -89,15 +89,25 @@ chmod +x CoreRules-Community-Addons-x86_64.AppImage ./CoreRules-Community-Addons-x86_64.AppImage ``` -The same file is published on GitHub Packages as -[`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons), -an OCI artifact rather than a container image, so the `docker pull` that -page shows does not apply. Download it from there with -[ORAS](https://oras.land): - -```sh -oras pull ghcr.io/brahm/corerules-community-addons:latest -``` +The same file is published on +[GitHub Packages](https://github.com/brahm?tab=packages&repo_name=corerules) +in two forms. GitHub Packages has no registry for plain files, so: + +* **As the AppImage file**, in the Maven package + `io.github.brahm.corerules-community-addons`. Its page lists + `corerules-community-addons-VERSION-x86_64.AppImage` under Assets, to + download from the browser. Command-line downloads from that registry + need a GitHub token, even for a public package. +* **As an OCI artifact**, + [`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons), + tagged with each version and `latest`, which downloads with no account. + It holds the AppImage as its one file rather than a container image, so + the `docker pull` that page shows does not apply. Download it with + [ORAS](https://oras.land): + + ```sh + oras pull ghcr.io/brahm/corerules-community-addons:latest + ``` The [Portuguese guide](GUIA.md) also shows how to download it with `curl` alone, and how to undo an install. diff --git a/data/io.github.brahm.CoreRules.metainfo.xml b/data/io.github.brahm.CoreRules.metainfo.xml index f53a8b6..844071f 100644 --- a/data/io.github.brahm.CoreRules.metainfo.xml +++ b/data/io.github.brahm.CoreRules.metainfo.xml @@ -32,7 +32,6 @@
  • The rule books in a reader, and the races, classes, items, spells, psionic powers and monsters of the installation
  • An interface in English, Brazilian Portuguese, Spanish, Italian, French and German
  • -

    This is a release candidate for version 1.0.

    io.github.brahm.CoreRules.desktop https://brahm.github.io/corerules/ @@ -87,6 +86,11 @@ #77101b + + +

    The first stable release. Its users ran the release candidate on Fedora 45 beta, Ubuntu 26.10, Bazzite, Arch Linux and CachyOS, and it worked as it should. New since 1.0.0-rc2: the About window has the credits of the original program and of this one, the legal notice, the details a bug report needs and these release notes, and it links to the new website.

    +
    +

    Second release candidate for 1.0: opening the mounted Expansion CD or its ISO image copies it to this computer, and everything made is saved there instead of failing on the read-only disc.

    diff --git a/docs/decisions.md b/docs/decisions.md index 70eaa6c..82e2c55 100644 --- a/docs/decisions.md +++ b/docs/decisions.md @@ -106,3 +106,5 @@ Reported during testing and kept, because the original does the same: | P10 | 2026-10-24 | Flathub publication waits until 1.0 is confirmed stable. | [Roadmap](roadmap.md) | | P11 | 2026-10-24 | Windows and macOS builds come after the Flathub publication; until then the backend stays free of GTK. | [Roadmap](roadmap.md) | | P12 | 2026-10-24 | Fixes found by real users ship as further release candidates (1.0.0-rc2 onward) rather than by republishing 1.0.0-rc1. | Decided by Wagner Brahm, 1.0.0-rc2 | +| P13 | 2026-10-24 | 1.0.0 is released as the final version, the repository's latest release: the code of 1.0.0-rc2 with the new About window. The release candidate was confirmed stable by its users on Fedora 45 beta, Ubuntu 26.10, Bazzite, Arch Linux and CachyOS; the release workflow adds Ubuntu 26.10 and Fedora 45 to its test systems. | Decided by Wagner Brahm, 1.0.0 | +| P14 | 2026-10-24 | The add-ons AppImage is also published as the file itself on GitHub Packages, in its Maven registry (`io.github.brahm:corerules-community-addons`), since GitHub Packages has no registry for plain files; the OCI artifact on ghcr.io and the addons release stay, the release being the direct download link. | Decided by Wagner Brahm, 1.0.0 | diff --git a/docs/roadmap.md b/docs/roadmap.md index c81cce6..2d54be8 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -6,18 +6,21 @@ what comes after 1.0. The decisions that shaped it are in the ## Where we are -**1.0.0-rc2, published on 2026-10-24 as a pre-release.** It fixes saving -when the mounted Expansion CD is opened as a folder (PR #85), the first -problem real users of 1.0.0-rc1 reported. Like rc1, it does everything +**1.0.0, published on 2026-10-24, the first stable release.** Its users +ran 1.0.0-rc2 on Fedora 45 beta, Ubuntu 26.10, Bazzite, Arch Linux and +CachyOS, and Wagner Brahm confirmed it stable, so 1.0.0 is the code of +1.0.0-rc2 with the new About window (PR #89). It does everything the original AD&D Core Rules 2.0 Expansion does, except what was left out on purpose ([decision log](decisions.md#left-out-on-purpose)). Every feature was checked against the original programs, and the 0.9.0 beta went through a full round of manual tests whose 57 problems were fixed (PRs #76 to #79, plus #80 and #81 for the items that needed a decision). It ships as a `.deb` (Ubuntu 26.04), an `.rpm` (Fedora 44), a pacman package (Arch Linux, -CachyOS, Omarchy), a Flatpak and an AppImage (both on GNOME 51). +CachyOS, Omarchy), a Flatpak and an AppImage (both on GNOME 51), and the +Community Add-ons Collection as its own AppImage, version 1.0.0. The +[website](https://brahm.github.io/corerules/) links every file. -The release candidate now goes to real users. No issue is open on GitHub. +The next step is the Flathub publication. No issue is open on GitHub. ## The original plan (2026-10-09) @@ -45,6 +48,7 @@ taken out of scope. | Test round | Manual test notebook run on 0.9.0, 57 problems fixed by severity | Done (PRs #76 to #81) | | Release candidate | 1.0.0-rc1, README rewritten in English with every difference from the original, pacman package | Done (PRs #82 and #83) | | Real-user fixes | 1.0.0-rc2: saving with the mounted CD opened | Done (PR #85) | +| 1.0 | Release candidate confirmed stable by its users, 1.0.0 released with the new About window and the website | Done | | Flathub | Publication on Flathub | Moved after 1.0 | ### Releases @@ -62,13 +66,14 @@ taken out of scope. | 0.9.0 | 2026-10-23 | Parity with the original | | 1.0.0-rc1 | 2026-10-24 | Fixes from the test round, pacman package | | 1.0.0-rc2 | 2026-10-24 | Saving with the mounted CD opened goes into a local copy | +| 1.0.0 | 2026-10-24 | First stable release, the About window, the website | -## After the release candidate +## After 1.0 The steps run in order; each starts when the one before it is closed. Bug reports are fixed at every step, and `main` stays green. -### Step 1: confirm that 1.0 is stable +### Step 1: confirm that 1.0 is stable (done) The release candidate is used by real players and Dungeon Masters. Problems they report are fixed and shipped as further candidates (`1.0.0-rc2`, …). @@ -87,7 +92,9 @@ Then the last candidate is tagged `v1.0.0` (same code, final version number), the README drops the release candidate notice, and the metainfo release type becomes `stable`. -Needs Wagner Brahm: the length of the testing period and the go-ahead for 1.0. +Done on 2026-10-24: Wagner Brahm's friends ran 1.0.0-rc2 on Fedora 45 +beta, Ubuntu 26.10, Bazzite, Arch Linux and CachyOS, found nothing wrong, +and Wagner Brahm gave the go-ahead (decision P13). ### Step 2: publish on Flathub diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 76d8c45..80851e2 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -6,8 +6,8 @@ pkgname=corerules # A pre-release (1.0.0-rc1) drops the hyphen, which pacman does not allow # in a version: 1.0.0rc1 sorts before 1.0.0. -pkgver=1.0.0rc2 -_tag=v1.0.0-rc2 +pkgver=1.0.0 +_tag=v1.0.0 pkgrel=1 pkgdesc='Browse and edit AD&D Core Rules 2.0 characters and rules' arch=('x86_64') diff --git a/packaging/release-notes.md b/packaging/release-notes.md index 7420beb..810bdde 100644 --- a/packaging/release-notes.md +++ b/packaging/release-notes.md @@ -1,45 +1,34 @@ -**Release candidate for 1.0.** Core Rules now does everything the -original AD&D Core Rules 2.0 Expansion does, and every feature was checked -against the original programs and went through a full round of manual -tests. This release goes to real users: after a testing period, the last -release candidate becomes 1.0. Keep a copy of your `Chars` and `UserDbas` -folders, and [report](https://github.com/brahm/corerules/issues) anything -that is wrong or works differently from the original. - -What's new since 1.0.0-rc1: - -- **Saving with the CD**: opening the mounted Expansion CD or ISO image - with Open Folder… no longer fails with a permission error when saving. - The app copies the disc to `~/.local/share/corerules/data` (in the - Flatpak, its own data folder), opens that copy and says so; characters - and everything else made are saved there, opening the CD again reuses - the copy, and the app opens it on start without the CD. `cr` does the - same. A Core Rules 2.0 CD still opens read-only from the disc -- **Importing packages**: Import brings in, in one go, the race/class - combinations that name two classes of the package, where the original - needed it imported twice; importing the Community Add-ons Collection now - warns only about the 36 races it ships without combinations - -What 1.0.0-rc1 brought since 0.9.0, the fixes from its test round: - -- **Critical**: Edit Character keeps an elf's subrace when it saves, and a - large package (36,525 items) imports without crashing, in the background -- **High**: Extract Data from CD copies the portraits, icons and monster - pictures; New Character and Enter Character have a Psionics step for a - psionicist; a subrace follows its parent race; a kit's negative rogue - skill modifier reads correctly; slots and points no longer go negative -- **Medium and low**: more than 40 smaller fixes across rogue skills, equipment, the - database editors, the NPC generator, encounters, treasure, the sheet, - printing, the books, the help and the `cr` command -- **Encounters**: Re-roll keeps the hit points set by hand, as the - original's later patch does -- **Packages**: the `.deb` refuses to install on Ubuntu 24.04, which is not - supported; the Flatpak runs there; a new pacman package installs on Arch - Linux, CachyOS and Omarchy - -The README lists everything the app does, where to find the disc images if -yours are lost (you must own the original discs), and every difference -from the original. +**Core Rules 1.0, the first stable release.** Core Rules does everything +the original AD&D Core Rules 2.0 Expansion does, and every feature was +checked against the original programs. Players and Dungeon Masters ran the +release candidate on **Fedora 45 beta, Ubuntu 26.10, Bazzite, Arch Linux +and CachyOS**, and it worked as it should, so 1.0.0 is the code of +1.0.0-rc2 with the new About window. Characters and user databases made +with the release candidates open as they are. + +What's new since 1.0.0-rc2: + +- **About**: the About window has the credits of the original program and + of this one, the legal notice, the details a bug report needs (version, + package, GTK and libadwaita, language and data folder) and these release + notes, and links to the new website, https://brahm.github.io/corerules/ +- **Packages**: the `.deb`, `.rpm` and pacman package are plain 1.0.0, and + replace a release candidate on update + +What the release candidates brought since 0.9.0: + +- **Saving with the CD** (rc2): opening the mounted Expansion CD or ISO + image with Open Folder… copies the disc to `~/.local/share/corerules/data` + (in the Flatpak, its own data folder), opens that copy and saves there +- **Importing packages** (rc2): Import brings in, in one go, the race/class + combinations that name two classes of the package +- **The test round of 0.9.0** (rc1): Edit Character keeps an elf's subrace, + a large package (36,525 items) imports in the background without + crashing, Extract Data from CD copies the pictures, New Character and + Enter Character have a Psionics step, and more than 40 smaller fixes +- **Packages** (rc1): the `.deb` refuses to install on Ubuntu 24.04, which + is not supported; the Flatpak runs there; a pacman package installs on + Arch Linux, CachyOS and Omarchy What the app does: it opens a Core Rules 2.0 Expansion installation (or its CD, or a data package), creates and edits characters with the Core Rules or @@ -47,20 +36,28 @@ Player's Option, levels them up, manages parties and prints character sheets; it generates NPCs, treasure and encounters, rolls on the books' tables, edits every user database and imports and exports DM Toolkit packages, all in files the original programs still open. A Core Rules 2.0 -installation opens read-only and is imported into the Expansion. The README -lists every feature. -It contains no rules content; you need your own copy of Core Rules. +installation opens read-only and is imported into the Expansion. The +[README](https://github.com/brahm/corerules#readme) lists every feature, +where to find the disc images if yours are lost (you must own the original +discs), and every difference from the original. It contains no rules +content; you need your own copy of Core Rules. | System | File | Install | | --- | --- | --- | -| Ubuntu 26.04 or newer | `corerules_*_amd64.deb` | `sudo apt install ./corerules_*_amd64.deb` | -| Fedora 44 or newer | `corerules-*.fc44.x86_64.rpm` | `sudo dnf install ./corerules-*.rpm` | -| Arch Linux, CachyOS, Omarchy | `corerules-*-x86_64.pkg.tar.zst` | `sudo pacman -U ./corerules-*.pkg.tar.zst` | -| Any distribution with Flatpak | `CoreRules-*.flatpak` | `flatpak install --user CoreRules-*.flatpak` | -| Any distribution (glibc 2.43+) | `CoreRules-*-x86_64.AppImage` | `chmod +x CoreRules-*.AppImage` and run it | +| Ubuntu 26.04 or newer | `corerules_1.0.0_amd64.deb` | `sudo apt install ./corerules_1.0.0_amd64.deb` | +| Fedora 44 or newer | `corerules-1.0.0-1.fc44.x86_64.rpm` | `sudo dnf install ./corerules-1.0.0-1.fc44.x86_64.rpm` | +| Arch Linux, CachyOS, Omarchy | `corerules-1.0.0-1-x86_64.pkg.tar.zst` | `sudo pacman -U ./corerules-1.0.0-1-x86_64.pkg.tar.zst` | +| Any distribution with Flatpak, such as Bazzite | `CoreRules-1.0.0.flatpak` | `flatpak install --user CoreRules-1.0.0.flatpak` | +| Any distribution (glibc 2.43+) | `CoreRules-1.0.0-x86_64.AppImage` | `chmod +x CoreRules-1.0.0-x86_64.AppImage` and run it | The Flatpak needs the GNOME 51 runtime from Flathub, which `flatpak install` offers to fetch. The AppImage bundles the GTK, libadwaita and other libraries of GNOME 51 and runs on Fedora 44, Ubuntu 26.04 and newer. The pacman package needs an up-to-date system (`sudo pacman -Syu`), and -`PKGBUILD` builds it from source with `makepkg -si`. `SHA256SUMS` lists the checksums of every file. +`PKGBUILD` builds it from source with `makepkg -si`. `SHA256SUMS` lists the +checksums of every file. + +The [Community Add-ons Collection](https://github.com/brahm/corerules/blob/main/addons/README.md), +672 community add-ons in one self-installing AppImage, has its own +[release](https://github.com/brahm/corerules/releases/tag/addons): +[CoreRules-Community-Addons-x86_64.AppImage](https://github.com/brahm/corerules/releases/download/addons/CoreRules-Community-Addons-x86_64.AppImage). diff --git a/packaging/rpm/corerules.spec b/packaging/rpm/corerules.spec index 4b36233..54688aa 100644 --- a/packaging/rpm/corerules.spec +++ b/packaging/rpm/corerules.spec @@ -4,7 +4,7 @@ %global debug_package %{nil} Name: corerules -Version: %{?version_override}%{!?version_override:1.0.0~rc2} +Version: %{?version_override}%{!?version_override:1.0.0} Release: 1%{?dist} Summary: Browse and edit AD&D Core Rules 2.0 characters and rules License: MIT @@ -50,6 +50,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/io.github.brah %{_metainfodir}/io.github.brahm.CoreRules.metainfo.xml %changelog +* Sat Oct 24 2026 Wagner Brahm - 1.0.0-1 +- First stable release: 1.0.0-rc2, confirmed stable by its users on + Fedora 45 beta, Ubuntu 26.10, Bazzite, Arch Linux and CachyOS, with a + new About window (credits, legal notice, details and release notes) + * Sat Oct 24 2026 Wagner Brahm - 1.0.0~rc2-1 - Second release candidate: opening the mounted Expansion CD saves into a local copy of it instead of failing; Import brings in race/class diff --git a/site/index.html b/site/index.html index 8849d0b..88897f4 100644 --- a/site/index.html +++ b/site/index.html @@ -11,7 +11,7 @@ - + @@ -33,10 +33,11 @@

    Core Rules

    The character manager and Dungeon Master's toolkit of 1998,
    dusted off and brought back to the table.

    -

    Version 1.0.0-rc2 · Free and open source · Requires your original AD&D Core Rules discs

    +

    Version 1.0.0 · the first stable release

    +

    Free and open source · Requires your original AD&D Core Rules discs

    Knight at the Crossroads, Viktor Vasnetsov, 1882

    @@ -153,7 +154,7 @@

    Everything the original did

    The library

    Races, classes, kits, items, spells, psionic powers and monsters, with their pictures and icons, and the Core Rules books in a reader with search.

    Faithful files

    Characters, monsters, encounters and packages made in either program open in the other. Results were compared with files the original wrote.

    Six languages

    English, Português (Brasil), Español, Italiano, Français and Deutsch.

    -

    Any Linux

    .deb for Ubuntu, .rpm for Fedora, pacman for Arch, CachyOS and Omarchy, a Flatpak and an AppImage. Windows and macOS come after 1.0.

    +

    Any Linux

    .deb for Ubuntu, .rpm for Fedora, pacman for Arch, CachyOS and Omarchy, a Flatpak and an AppImage for Bazzite and every other distribution. Windows and macOS come next.

    @@ -163,19 +164,37 @@

    Everything the original did

    Ready the horses

    Download Core Rules

    -

    Every release has packages for x86-64 Linux. Release candidates are marked as pre-releases.

    - - - - - - - - - -
    SystemPackage
    Fedora 44 or newer.rpm
    Ubuntu 26.04 or newer.deb
    Arch Linux, CachyOS, Omarchy.pkg.tar.zst
    Any distribution.flatpak
    Any distribution (glibc 2.43+).AppImage
    +

    Version 1.0.0, the first stable release

    +

    Pick the file for your system; each link downloads it directly. Every file is for + x86-64 Linux.

    + +

    Tested by players on Fedora 45 beta · Ubuntu 26.10 · Bazzite · Arch Linux · CachyOS

    +

    The Flatpak needs the GNOME 51 runtime from Flathub, which flatpak install + offers to fetch. The AppImage bundles GTK, libadwaita and the other GNOME 51 libraries. Update + Arch first (sudo pacman -Syu), or build the package from source with its + PKGBUILD. The checksums of every file are in + SHA256SUMS.

    @@ -229,6 +248,7 @@

    Community Add-ons Collection

    48
    characters from the published modules
    6
    languages in the installer
    +

    Version 1.0.0 · one self-installing AppImage

    Needs Linux x86-64 (glibc 2.43 or newer), Core Rules 0.7.2 or newer and your Expansion data in the app. The installer backs up your UserDbas and Chars folders first. It leaves out Evermore's monthly goodies; the add-ons belong to their authors in @@ -237,6 +257,10 @@

    Community Add-ons Collection

    Download the add-ons installer What's inside
    +

    The link always gives the newest build. The same file, version by version: + CoreRules-Community-Addons-1.0.0-x86_64.AppImage + on the addons release, and on + GitHub Packages.

    diff --git a/site/style.css b/site/style.css index bc9ed0d..c5dd0c3 100644 --- a/site/style.css +++ b/site/style.css @@ -11,8 +11,10 @@ --ink-soft: #5b4430; --text: #eadfca; --text-soft: #b9a98e; - --display: "Cinzel", "Trajan Pro", Georgia, serif; - --body: "EB Garamond", Garamond, Georgia, serif; + /* Forum has one weight: headings, callouts and highlights use it as it + is, never bold or italic. Inter is the text. */ + --display: "Forum", "Trajan Pro", Georgia, serif; + --body: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, sans-serif; } * { box-sizing: border-box; } @@ -21,25 +23,26 @@ body { margin: 0; background: var(--night); color: var(--text); - font: 400 1.18rem/1.6 var(--body); + font: 400 1.06rem/1.7 var(--body); + font-optical-sizing: auto; overflow-x: hidden; } img { max-width: 100%; display: block; } a { color: var(--gold-soft); } a:hover { color: #fff3cf; } code { font-size: .85em; background: rgba(0,0,0,.08); padding: 0 .3em; border-radius: 3px; } -h1, h2, h3 { font-family: var(--display); font-weight: 700; line-height: 1.15; letter-spacing: .02em; } -h2 { font-size: clamp(1.8rem, 4vw, 2.7rem); margin: .2em 0 .6em; color: var(--gold-soft); } -h3 { font-size: 1.15rem; margin: 1.6em 0 .4em; } +h1, h2, h3 { font-family: var(--display); font-weight: 400; line-height: 1.1; letter-spacing: .02em; } +h2 { font-size: clamp(2.1rem, 4.6vw, 3.2rem); margin: .2em 0 .55em; color: var(--gold-soft); } +h3 { font-size: 1.45rem; margin: 1.5em 0 .35em; } .wrap { width: min(1180px, 100% - 32px); margin: 0 auto; } .two { display: grid; grid-template-columns: 1.35fr 1fr; gap: 48px; align-items: center; } .two.reverse { grid-template-columns: 1fr 1.35fr; } .center { text-align: center; } -.lead { font-size: 1.28rem; color: var(--text-soft); max-width: 60ch; } +.lead { font-size: 1.14rem; color: var(--text-soft); max-width: 62ch; } .lead.center { margin-inline: auto; } -.small { font-size: .95rem; color: var(--text-soft); } +.small { font-size: .9rem; color: var(--text-soft); } .eyebrow { - font-family: var(--display); font-size: .82rem; letter-spacing: .25em; + font-family: var(--display); font-size: 1rem; letter-spacing: .22em; text-transform: uppercase; color: var(--gold); margin: 0; } .eyebrow.dark { color: var(--crimson); } @@ -59,9 +62,9 @@ cite { font-style: italic; } display: flex; justify-content: space-between; align-items: center; padding: 18px max(16px, calc((100% - 1180px) / 2)); gap: 16px; flex-wrap: wrap; } -.brand { display: flex; gap: 10px; align-items: center; font-family: var(--display); font-weight: 700; text-decoration: none; color: var(--gold-soft); } +.brand { display: flex; gap: 10px; align-items: center; font-family: var(--display); font-size: 1.35rem; text-decoration: none; color: var(--gold-soft); } .top .links { display: flex; gap: 22px; flex-wrap: wrap; } -.top .links a { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; text-decoration: none; color: var(--text); } +.top .links a { font-family: var(--display); font-size: 1.08rem; letter-spacing: .08em; text-decoration: none; color: var(--text); } .top .links a:hover { color: var(--gold-soft); } .hero-body { flex: 1; display: flex; flex-direction: column; align-items: center; justify-content: center; text-align: center; padding: 30px 16px 80px; } .hero-icon { @@ -71,12 +74,13 @@ cite { font-style: italic; } } @keyframes float { 50% { transform: translateY(-10px); } } .hero h1 { - font-size: clamp(3.2rem, 11vw, 7rem); font-weight: 900; margin: .1em 0 .15em; + font-size: clamp(3.6rem, 12vw, 7.8rem); font-weight: 400; margin: .1em 0 .1em; background: linear-gradient(180deg, #fff4d3 10%, var(--gold) 55%, #8a6420); -webkit-background-clip: text; background-clip: text; color: transparent; text-shadow: 0 4px 30px rgba(0,0,0,.5); } -.tagline { font-size: clamp(1.2rem, 2.5vw, 1.55rem); font-style: italic; max-width: 40ch; margin: 0 0 1.4em; } +.tagline { font-family: var(--display); font-size: clamp(1.35rem, 2.6vw, 1.75rem); line-height: 1.35; max-width: 34em; margin: 0 0 1.4em; } +.version { font-family: var(--display); font-size: 1.3rem; letter-spacing: .04em; color: var(--gold-soft); margin: .2em 0 .3em; } .art-caption { font-size: .85rem; color: var(--text-soft); margin: 0; } .hero > .art-caption { position: absolute; right: 18px; bottom: 14px; } @@ -84,7 +88,7 @@ cite { font-style: italic; } .actions { display: flex; flex-wrap: wrap; gap: 14px; justify-content: center; margin: 0 0 1em; } .actions.left { justify-content: flex-start; margin-top: 1.4em; } .btn { - font-family: var(--display); font-weight: 700; font-size: .95rem; letter-spacing: .08em; + font-family: var(--display); font-size: 1.15rem; letter-spacing: .06em; text-decoration: none; color: var(--gold-soft); padding: 14px 26px; border-radius: 4px; border: 1px solid var(--gold); background: rgba(18,13,9,.55); transition: transform .15s, background .15s; @@ -111,14 +115,31 @@ cite { font-style: italic; } .parchment a { color: var(--crimson); } .parchment .small { color: var(--ink-soft); } .dropcap::first-letter { - float: left; font-family: var(--display); font-weight: 900; font-size: 4.2em; + float: left; font-family: var(--display); font-size: 4.4em; line-height: .85; padding: .06em .1em 0 0; color: var(--crimson); } -.sign { font-family: var(--display); font-size: 1.3rem; text-align: right; color: var(--crimson); margin-bottom: 0; } -.notice { font-size: 1rem; border-left: 3px solid var(--crimson); padding: .4em 0 .4em 1em; background: rgba(140,29,29,.06); } -table { width: 100%; border-collapse: collapse; font-size: 1.05rem; } -th, td { text-align: left; padding: 6px 8px; border-bottom: 1px solid var(--parchment-edge); } -th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color: var(--ink-soft); } +.sign { font-family: var(--display); font-size: 1.6rem; text-align: right; color: var(--crimson); margin-bottom: 0; } +.notice { font-size: .95rem; border-left: 3px solid var(--crimson); padding: .4em 0 .4em 1em; background: rgba(140,29,29,.06); } +.callout { font-family: var(--display); font-size: 1.5rem; line-height: 1.25; color: var(--crimson); margin: 0 0 .4em; } + +/* Downloads */ +.downloads { list-style: none; padding: 0; margin: 1.2em 0; display: grid; gap: 10px; } +.downloads li { + display: grid; grid-template-columns: 1fr auto; gap: 2px 14px; align-items: baseline; + padding: 12px 14px; border: 1px solid var(--parchment-edge); border-radius: 5px; + background: rgba(255,255,255,.28); +} +.downloads .system { font-family: var(--display); font-size: 1.22rem; color: var(--ink); } +.downloads .kind { font-family: var(--display); font-size: 1rem; letter-spacing: .08em; color: var(--crimson); } +.downloads .file { grid-column: 1 / -1; font-weight: 600; overflow-wrap: anywhere; } +.downloads .file::before { content: "\2193\00a0"; } +.downloads code { grid-column: 1 / -1; justify-self: start; font-size: .8rem; color: var(--ink-soft); overflow-wrap: anywhere; } +.tested { + font-family: var(--display); font-size: 1.25rem; line-height: 1.35; color: var(--ink); + border-top: 1px solid var(--parchment-edge); border-bottom: 1px solid var(--parchment-edge); + padding: .6em 0; margin: 1.2em 0; +} +.tested span { display: block; font-size: .95rem; letter-spacing: .2em; text-transform: uppercase; color: var(--crimson); } /* Paintings */ .painting { margin: 0; } @@ -126,7 +147,7 @@ th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color width: 100%; border: 10px solid #6b4a1f; outline: 2px solid var(--gold); outline-offset: -6px; box-shadow: 0 25px 50px rgba(0,0,0,.6); } -.painting figcaption, .gallery figcaption, .pair figcaption { font-size: .92rem; color: var(--text-soft); margin-top: .7em; } +.painting figcaption, .gallery figcaption, .pair figcaption { font-size: .88rem; color: var(--text-soft); margin-top: .7em; } .tale { background: linear-gradient(var(--night), var(--leather)); } /* Boxes */ @@ -141,8 +162,8 @@ th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color .box a:hover img { transform: translateY(-6px) rotate(-1deg); } .box.disc img { border-radius: 50%; box-shadow: 0 25px 45px rgba(0,0,0,.7), 0 0 40px rgba(212,169,78,.2); } .box.disc a:hover img { transform: rotate(25deg); transition: transform 1.2s ease-out; } -.box figcaption { margin-top: 1em; color: var(--text-soft); font-size: .98rem; } -.box figcaption b { color: var(--gold-soft); font-weight: 600; } +.box figcaption { margin-top: 1em; color: var(--text-soft); font-size: .92rem; } +.box figcaption b { font-family: var(--display); font-size: 1.15rem; font-weight: 400; color: var(--gold-soft); } .note.center { text-align: center; } /* Screens */ @@ -161,7 +182,7 @@ th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color .pair img { width: 100%; aspect-ratio: 1100 / 720; object-fit: contain; background: #000; } .pair .then figcaption b { color: var(--gold); } .pair .now figcaption b { color: var(--gold-soft); } -.note { font-size: .92rem; color: var(--text-soft); font-style: italic; margin-top: 40px; } +.note { font-size: .88rem; color: var(--text-soft); font-style: italic; margin-top: 40px; } /* Banner */ .banner { @@ -170,7 +191,7 @@ th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color var(--art) center / cover no-repeat; } .banner blockquote { - font-family: var(--display); font-size: clamp(1.5rem, 3.6vw, 2.5rem); margin: 0 0 120px; + font-family: var(--display); font-size: clamp(1.9rem, 4.4vw, 3.2rem); margin: 0 0 120px; color: #fff4dc; text-shadow: 0 3px 18px rgba(0,0,0,.9); } @@ -184,16 +205,18 @@ th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color .cards h3 { margin-top: 0; color: var(--gold-soft); } .cards p { margin: 0; color: var(--text-soft); } -/* Download */ +/* Download: the painting stays in view beside the long list. */ .download { background: linear-gradient(var(--night), var(--leather)); } +.download .two { align-items: start; } +.download .painting { position: sticky; top: 40px; } /* Add-ons */ .addons { background: var(--leather); } .addons-icon { width: 140px; height: auto; filter: drop-shadow(0 0 24px rgba(212,169,78,.35)); margin-bottom: 10px; } .stats { display: grid; grid-template-columns: repeat(4, 1fr); gap: 14px; margin: 28px 0; } .stats div { border-top: 2px solid var(--gold); padding-top: 8px; } -.stats dt { font-family: var(--display); font-size: 1.6rem; font-weight: 700; color: var(--gold-soft); } -.stats dd { margin: 0; font-size: .95rem; color: var(--text-soft); line-height: 1.3; } +.stats dt { font-family: var(--display); font-size: 2rem; color: var(--gold-soft); } +.stats dd { margin: 0; font-size: .9rem; color: var(--text-soft); line-height: 1.35; } .gallery.three { margin-top: 60px; } /* Credits */ @@ -202,17 +225,17 @@ th { font-family: var(--display); font-size: .85rem; letter-spacing: .1em; color var(--art) center / cover no-repeat; } .credits .parchment { max-width: 820px; margin: 0 auto; } -.art-credits { font-size: 1rem; } +.art-credits { font-size: .92rem; } footer { padding: 60px 0 50px; text-align: center; border-top: 1px solid rgba(212,169,78,.25); } footer img { margin: 0 auto 10px; } footer p { margin: .4em 0; } -footer .links { display: flex; gap: 22px; justify-content: center; flex-wrap: wrap; font-family: var(--display); font-size: .9rem; } +footer .links { display: flex; gap: 22px; justify-content: center; flex-wrap: wrap; font-family: var(--display); font-size: 1.1rem; } dialog { border: none; padding: 0; background: transparent; max-width: 96vw; max-height: 96vh; } dialog::backdrop { background: rgba(0,0,0,.88); } dialog img { max-width: 96vw; max-height: 88vh; border: 1px solid var(--gold); } -dialog p { color: var(--text); text-align: center; font-size: 1rem; } +dialog p { color: var(--text); text-align: center; font-size: .95rem; } @media (max-width: 900px) { .two, .two.reverse, .pair { grid-template-columns: 1fr; gap: 28px; }