Merge pull request 'feat: match original theme to authentic 1987 DLR livery' (#19 ) from feat/original-theme-dlr-livery into main

Reviewed-on: #19
feat: match original theme to authentic 1987 DLR livery
2026-06-12 13:08:59 +01:00 · 2026-06-12 13:05:37 +01:00 · 2026-06-12 12:42:29 +01:00 · 2026-06-12 12:39:56 +01:00 · 2026-06-12 12:26:35 +01:00 · 2026-06-12 12:26:05 +01:00
4 changed files with 60 additions and 21 deletions
@@ -1,10 +1,30 @@
 name: Build and publish container

 on:
+  # On merge to main, only build/release when image-affecting files change;
+  # CI-config, Renovate-config and docs changes do not produce a new image.
  push:
    branches: [main]
+    paths:
+      - 'Dockerfile'
+      - 'default.conf'
+      - 'index.html'
+      - 'styles.css'
+      - 'script.js'
+      - 'messages.js'
+      - '.dockerignore'
+  # Pull requests always run (the build is a required check); no path filter.
  pull_request:
    branches: [main]
+  workflow_dispatch:
+
+# A newer run cancels an older in-flight run in the same group (keyed by ref),
+# so a fresh merge to main supersedes the previous build and only the latest
+# release is produced, avoiding tags that would be immediately replaced. Each
+# pull request likewise supersedes only its own earlier runs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 defaults:
  run:
@@ -18,7 +38,7 @@ jobs:
      packages: write
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
        with:
          # Full history and tags are required to derive the next version
          # from the conventional-commit messages since the last release.
@@ -94,21 +114,21 @@ jobs:
          echo "Computed bump=${bump}, release=${release}, base=${base}"

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4

      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4

      - name: Log in to the Gitea container registry
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.repository_owner }}
          password: ${{ secrets.PACKAGES_TOKEN }}

      - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
        with:
          context: .
          platforms: linux/amd64,linux/arm64
@@ -4,6 +4,9 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Why is the DLR shut today?</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Rokkitt:wght@400;700;800&display=swap">
  <link rel="stylesheet" href="styles.css">
 </head>
 <body data-theme="modern">
@@ -22,8 +22,14 @@
      "description": "Commit every update as fix(deps) so each merged Renovate PR triggers a patch release. config:recommended pulls in :semanticPrefixFixDepsChoreOthers, which forces non-npm updates (Docker, Actions) to chore and would otherwise produce no release.",
      "matchPackageNames": ["*"],
      "semanticCommitType": "fix"
+    },
+    {
+      "description": "Auto-merge patch and minor updates once checks pass.",
+      "matchUpdateTypes": ["patch", "minor"],
+      "automerge": true
    }
  ],
+  "platformAutomerge": true,
  "customManagers": [
    {
      "customType": "regex",
@@ -19,16 +19,20 @@
  --button-active-text: #ffffff;
 }

-/* Original DLR — 1987 red, white and blue */
+/* Original DLR — 1987 P86/P89 livery: blue body and skirt, red band and
+   doors, white stripes. Blue is the dominant field, red the accent.
+   1987 branding used the Rockwell slab serif; Rokkitt is a free fallback for
+   systems without Rockwell installed. */
 [data-theme="original"] {
-  --bg: #c8102e;
-  --surface: #002b5c;
-  --text: #f5f0e1;
-  --message: #f5f0e1;
-  --button-bg: #002b5c;
-  --button-text: #f5f0e1;
-  --button-active-bg: #f5f0e1;
-  --button-active-text: #002b5c;
+  --font-stack: Rockwell, "Rockwell Nova", Rokkitt, Georgia, serif;
+  --bg: #1f3a93;
+  --surface: #c8102e;
+  --text: #ffffff;
+  --message: #ffffff;
+  --button-bg: #c8102e;
+  --button-text: #ffffff;
+  --button-active-bg: #ffffff;
+  --button-active-text: #1f3a93;
 }

 * {
@@ -63,10 +67,13 @@ body {
  padding: 1.5rem;
 }

+/* Segmented control: both options joined in one rounded container,
+   with the active segment filled. */
 .theme-toggle {
-  display: flex;
-  gap: 0.5rem;
-  border: none;
+  display: inline-flex;
+  border: 2px solid var(--button-bg);
+  border-radius: 999px;
+  overflow: hidden;
  margin: 0;
  padding: 0;
 }
@@ -75,19 +82,22 @@ body {
  font-family: inherit;
  font-size: 0.9rem;
  font-weight: 600;
-  padding: 0.5rem 1rem;
-  border: 2px solid var(--button-bg);
-  border-radius: 999px;
+  padding: 0.5rem 1.1rem;
+  border: none;
  background: transparent;
  color: var(--text);
  cursor: pointer;
  transition: background 0.2s ease, color 0.2s ease;
 }

+/* Divider between the two segments. */
+.theme-button + .theme-button {
+  border-left: 2px solid var(--button-bg);
+}
+
 .theme-button[aria-pressed="true"] {
  background: var(--button-active-bg);
  color: var(--button-active-text);
-  border-color: var(--button-active-bg);
 }

 .stage {
Author	SHA1	Message	Date
lyrathorpe	4690263ba8	Merge pull request 'feat: match original theme to authentic 1987 DLR livery' (#19 ) from feat/original-theme-dlr-livery into main Build and publish container / build (push) Successful in 2m43s Details Reviewed-on: #19	2026-06-12 13:08:59 +01:00
Emma Thorpe	e31729e27a	feat: match original theme to authentic 1987 DLR livery Build and publish container / build (pull_request) Successful in 1m52s Details Set the original colour scheme's typeface and palette to the 1987 Docklands Light Railway P86/P89 stock. - Use the Rockwell slab serif (the original DLR branding typeface) for the original theme, with Rokkitt loaded as a free fallback for systems without Rockwell installed. - Flip the palette to be blue-dominant: blue body/skirt as the field, red band/doors as the accent, white stripes, matching the rolling stock.	2026-06-12 13:05:37 +01:00
lyrathorpe	c5433a23ee	Merge pull request 'ci: filter main builds to code changes and cancel superseded runs' (#18 ) from ci/optimise-main-builds into main Reviewed-on: #18	2026-06-12 12:42:29 +01:00
Emma Thorpe	fb705c234f	ci: filter main builds to code changes and cancel superseded runs Build and publish container / build (pull_request) Successful in 1m35s Details Apply path filters to the push (merge-to-main) trigger only, so merges that do not change the image (CI/Renovate config, docs) skip the build and release. Pull requests keep running unfiltered so the required check is always reported. Add a concurrency group keyed by ref with cancel-in-progress, so a newer run supersedes an older in-flight run: a fresh merge to main cancels the previous build and only the most recent release is produced, avoiding tags that would be immediately replaced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-12 12:39:56 +01:00
lyrathorpe	562ce29ca1	Merge pull request 'fix(deps): update docker/setup-qemu-action action to v4' (#17 ) from renovate/docker-setup-qemu-action-4.x into main Build and publish container / build (push) Failing after 5m57s Details Reviewed-on: #17	2026-06-12 12:26:35 +01:00
lyrathorpe	1c57d70c00	Merge pull request 'fix(deps): update docker/setup-buildx-action action to v4' (#16 ) from renovate/docker-setup-buildx-action-4.x into main Build and publish container / build (push) Failing after 6m6s Details Reviewed-on: #16	2026-06-12 12:26:05 +01:00
lyrathorpe	7e23b09694	Merge pull request 'fix(deps): update docker/login-action action to v4' (#11 ) from renovate/docker-login-action-4.x into main Build and publish container / build (push) Failing after 8m16s Details Reviewed-on: #11	2026-06-12 12:21:38 +01:00
lyrathorpe	818331b066	Merge pull request 'fix(deps): update docker/build-push-action action to v7' (#10 ) from renovate/docker-build-push-action-7.x into main Build and publish container / build (push) Failing after 34s Details Reviewed-on: #10	2026-06-12 12:21:38 +01:00
lyrathorpe	dfedc5c51b	Merge pull request 'fix(deps): update actions/checkout action to v6' (#9 ) from renovate/actions-checkout-6.x into main Build and publish container / build (push) Successful in 8m35s Details Reviewed-on: #9	2026-06-12 12:18:49 +01:00
Renovate Bot	0c38161989	fix(deps): update docker/setup-qemu-action action to v4 Build and publish container / build (pull_request) Successful in 7m37s Details	2026-06-12 11:11:04 +00:00
Renovate Bot	d97707387d	fix(deps): update docker/setup-buildx-action action to v4 Build and publish container / build (pull_request) Successful in 7m33s Details	2026-06-12 11:11:00 +00:00
Renovate Bot	b26d49d9d8	fix(deps): update docker/login-action action to v4 Build and publish container / build (pull_request) Successful in 7m27s Details	2026-06-12 11:10:57 +00:00
Renovate Bot	9e5958b458	fix(deps): update docker/build-push-action action to v7 Build and publish container / build (pull_request) Successful in 7m28s Details	2026-06-12 11:10:53 +00:00
Renovate Bot	df0df3e9a0	fix(deps): update actions/checkout action to v6 Build and publish container / build (pull_request) Successful in 7m20s Details	2026-06-12 11:10:48 +00:00
lyrathorpe	8bb782287e	Merge pull request 'fix(deps): pin dependencies' (#7 ) from renovate/pin-dependencies into main Build and publish container / build (push) Successful in 9m52s Details Reviewed-on: #7	2026-06-12 12:08:23 +01:00
Renovate Bot	56ec85c17e	fix(deps): pin dependencies Build and publish container / build (pull_request) Successful in 7m56s Details	2026-06-12 10:58:16 +00:00
lyrathorpe	9412c20248	Merge pull request 'Fix/renovate semantic fix' (#14 ) from fix/renovate-semantic-fix into main Build and publish container / build (push) Has been cancelled Details Reviewed-on: #14	2026-06-12 11:49:53 +01:00
lyrathorpe	65f97d2707	Merge pull request 'feat: present theme switch as a segmented control' (#15 ) from feat/segmented-theme-switch into main Build and publish container / build (push) Successful in 6m7s Details Reviewed-on: #15	2026-06-12 11:45:08 +01:00
Emma Thorpe	564070b270	ci: auto-merge patch and minor renovate updates Build and publish container / build (pull_request) Successful in 4m55s Details Add a packageRule that automerges patch and minor updates, with platformAutomerge enabled so Gitea merges them once required checks pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-12 11:39:02 +01:00
Emma Thorpe	ad90451846	feat: present theme switch as a segmented control Build and publish container / build (pull_request) Successful in 4m49s Details Join the two theme options into a single rounded container with the active segment filled and a divider between them, replacing the two separate pills. Markup and aria-pressed behaviour are unchanged. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-12 11:34:32 +01:00