Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export async function renderPage(page: MarkdownPage, options: RenderOptions & Re
<html>
<head>
<meta charset="utf-8">${path === "/404" ? html`\n<base href="${preview ? "/" : base}">` : ""}
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v${process.env.npm_package_version}">
${
page.title || title
Expand Down Expand Up @@ -143,13 +143,13 @@ async function renderSidebar(options: RenderOptions, {resolveImport, resolveLink
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link${
normalizePath(path) === "/index" ? " observablehq-link-active" : ""
}"><a href="${encodeURI(resolveLink("/"))}">${html.unsafe(home)}</a></li>
</ol>${
search
? html`\n <div id="observablehq-search"><input type="search" placeholder="Search"></div>
? html`\n <div id="observablehq-search"><input type="search" placeholder="Search" aria-label="Search"></div>
<div id="observablehq-search-results"></div>
<script>{${html.unsafe(
(await rollupClient(getClientPath("search-init.js"), root, path, {resolveImport, minify: true})).trim()
Expand Down
8 changes: 8 additions & 0 deletions src/style/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,14 @@ body {
z-index: 1;
}

/* Only <li> (and <script> and <template>) may be a child of <ol>, so the close button is
* wrapped in one. The wrapper generates no box, which keeps the list as the button's
* containing block: it stays where it was, pinned to the sticky first list rather than
* scrolling away with the sidebar's contents. */
#observablehq-sidebar > ol > .observablehq-sidebar-close-item {
display: contents;
}

#observablehq-sidebar-close {
position: absolute;
top: 1rem;
Expand Down
2 changes: 1 addition & 1 deletion test/output/build/404/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Page not found</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/archives.posix/tar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Tar</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -54,7 +54,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/archives.posix/zip.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Zip</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -44,7 +44,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/archives.win32/tar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Tar</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -40,7 +40,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/archives.win32/zip.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Zip</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -33,7 +33,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/config/closed/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>A page…</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="../">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/config/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Index</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link observablehq-link-active"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/config/one.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>One</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/config/sub/two.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Two</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="../">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/config/toc-override.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>H1: Section</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/config/toc.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>H1: Section</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
2 changes: 1 addition & 1 deletion test/output/build/data-loaders/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Data loader test</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/draft/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Draft test</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link observablehq-link-active"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/draft/page-published.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>This is for real</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
2 changes: 1 addition & 1 deletion test/output/build/duckdb/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>test DuckDB</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/embed/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Embeds</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link observablehq-link-active"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/embed/w3c.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>W3C.js</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -24,7 +24,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/fetches/foo.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Top</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -37,7 +37,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/fetches/top.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Top</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down Expand Up @@ -42,7 +42,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/files/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
Expand Down Expand Up @@ -54,7 +54,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="./">Home</a></li>
</ol>
<ol>
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/files/subsection/subfiles.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&amp;display=swap" crossorigin>
Expand Down Expand Up @@ -40,7 +40,7 @@
<label id="observablehq-sidebar-backdrop" for="observablehq-sidebar-toggle"></label>
<nav id="observablehq-sidebar">
<ol>
<label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label>
<li class="observablehq-sidebar-close-item" aria-hidden="true"><label id="observablehq-sidebar-close" for="observablehq-sidebar-toggle"></label></li>
<li class="observablehq-link"><a href="../">Home</a></li>
</ol>
<ol>
Expand Down
2 changes: 1 addition & 1 deletion test/output/build/fragments/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Observable Framework v1.0.0-test">
<title>Testing fragment functions</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down
Loading
Loading