Merge branch 'master' into dep-updates

beeminder · Mar 20, 2024 · 88066c7 · 88066c7
2 parents 13400c8 + 41292a0
commit 88066c7
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 939 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/icon-192.png b/public/icon-192.png
diff --git a/public/icon-512.png b/public/icon-512.png
diff --git a/public/manifest.webmanifest b/public/manifest.webmanifest
@@ -0,0 +1,6 @@
+{
+    "icons": [
+        {"src": "/icon-192.png", "type": "image/png", "sizes": "192x192"},
+        {"src": "/icon-512.png", "type": "image/png", "sizes": "512x512"}
+    ]
+}
diff --git a/scripts/puppeteer.ts b/scripts/puppeteer.ts
@@ -44,8 +44,12 @@ async function handleUrl(browser: Browser, url: string) {
   const pathname = new URL(url).pathname;
   console.time(pathname);
 
-  const path1 = await snap(browser, url, "base");
-  const path2 = await snap(browser, url.replace(base, compare), "compare");
+  const path1 = await snap(browser, `${url}?snap`, "base");
+  const path2 = await snap(
+    browser,
+    `${url.replace(base, compare)}?snap`,
+    "compare",
+  );
   const img1 = readScreenshot(path1);
   const img2 = readScreenshot(path2);
   const meta1 = await img1.metadata();

diff --git a/src/components/Shadowbox.astro b/src/components/Shadowbox.astro
@@ -2,12 +2,14 @@
 interface Props {
   padding?: number;
   class?: string | undefined;
+  id?: string | undefined;
 }
 
-const { padding = 1, class: className } = Astro.props;
+const { padding = 1, class: className, id } = Astro.props;
 ---
 
 <div
+  id={id}
   class:list={["shadowbox", className]}
   style={{
     "--gap-multiplier": padding,

diff --git a/src/components/Sidebar.astro b/src/components/Sidebar.astro
@@ -116,7 +116,11 @@ const sha: string | undefined = import.meta.env.RENDER_GIT_COMMIT;
   </Shadowbox>
   {
     sha && (
-      <a class="sha" href={`https://github.com/beeminder/blog/commit/${sha}`}>
+      <a
+        id="sha"
+        class="sha"
+        href={`https://github.com/beeminder/blog/commit/${sha}`}
+      >
         {sha.slice(0, 7)}
       </a>
     )

diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -29,7 +29,7 @@ const {
 const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <link
@@ -56,7 +56,8 @@ const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
 
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width" />
-    <link rel="icon" type="image/png" href="/favicon.png" />
+    <link rel="icon" type="image/png" href="/favicon.ico" />
+    <link rel="manifest" href="/manifest.webmanifest" />
     <meta name="generator" content={Astro.generator} />
 
     <title set:html={`${title} | Beeminder Blog`} />
@@ -82,6 +83,7 @@ const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
       async
       src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js"></script>
 
+    <script src="../scripts/snap.ts"></script>
     <script src="../scripts/slideshow.ts"></script>
     <script src="../scripts/hotkeys.ts"></script>