Skip to content

flatten (WIP) #1669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −23
Draft

flatten (WIP) #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d552b71
flatten
Fil Sep 17, 2024
9177c64
fixed margins and padding to accommodate the removal of the 'middle' div
CobusT Sep 18, 2024
3bf3123
added back container-type: inline-size
CobusT Sep 18, 2024
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
2 changes: 1 addition & 1 deletion observablehq.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default {
: ""
}
<script type="module">/Win/.test(navigator.platform) || Array.from(document.querySelectorAll(".win"), (e) => e.remove())</script>`,
header: `<div style="display: flex; align-items: center; gap: 0.5rem; height: 2.2rem; margin: -1.5rem -2rem 2rem -2rem; padding: 0.5rem 2rem; border-bottom: solid 1px var(--theme-foreground-faintest); font: 500 16px var(--sans-serif);">
header: `<div style="display: flex; align-items: center; gap: 0.5rem; height: 2.2rem; margin: 0.5rem -2rem 2rem -2rem; padding: 0.5rem 2rem; border-bottom: solid 1px var(--theme-foreground-faintest); font: 500 16px var(--sans-serif);">
<a href="https://observablehq.com/" target="_self" rel="" style="display: flex; align-items: center;">
<svg width="22" height="22" viewBox="0 0 21.92930030822754 22.68549919128418" fill="currentColor">
<path d="M10.9646 18.9046C9.95224 18.9046 9.07507 18.6853 8.33313 18.2467C7.59386 17.8098 7.0028 17.1909 6.62722 16.4604C6.22789 15.7003 5.93558 14.8965 5.75735 14.0684C5.56825 13.1704 5.47613 12.2574 5.48232 11.3427C5.48232 10.6185 5.52984 9.92616 5.62578 9.26408C5.7208 8.60284 5.89715 7.93067 6.15391 7.24843C6.41066 6.56618 6.74143 5.97468 7.14438 5.47308C7.56389 4.9592 8.1063 4.54092 8.72969 4.25059C9.38391 3.93719 10.1277 3.78091 10.9646 3.78091C11.977 3.78091 12.8542 4.00021 13.5962 4.43879C14.3354 4.87564 14.9265 5.49454 15.3021 6.22506C15.6986 6.97704 15.9883 7.7744 16.1719 8.61712C16.3547 9.459 16.447 10.3681 16.447 11.3427C16.447 12.067 16.3995 12.7593 16.3035 13.4214C16.2013 14.1088 16.0206 14.7844 15.7644 15.437C15.4994 16.1193 15.1705 16.7108 14.7739 17.2124C14.3774 17.714 13.8529 18.1215 13.1996 18.4349C12.5463 18.7483 11.8016 18.9046 10.9646 18.9046ZM12.8999 13.3447C13.4242 12.8211 13.7159 12.0966 13.7058 11.3427C13.7058 10.5639 13.4436 9.89654 12.92 9.34074C12.3955 8.78495 11.7441 8.50705 10.9646 8.50705C10.1852 8.50705 9.53376 8.78495 9.00928 9.34074C8.49569 9.87018 8.21207 10.5928 8.22348 11.3427C8.22348 12.1216 8.48572 12.7889 9.00928 13.3447C9.53376 13.9005 10.1852 14.1784 10.9646 14.1784C11.7441 14.1784 12.3891 13.9005 12.8999 13.3447ZM10.9646 22.6855C17.0199 22.6855 21.9293 17.6068 21.9293 11.3427C21.9293 5.07871 17.0199 0 10.9646 0C4.90942 0 0 5.07871 0 11.3427C0 17.6068 4.90942 22.6855 10.9646 22.6855Z"></path>
Expand Down
16 changes: 9 additions & 7 deletions src/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ ${preview ? `\nopen({hash: ${JSON.stringify(resolvers.hash)}, eval: (body) => ev
</script>${sidebar ? html`\n${await renderSidebar(options, resolvers)}` : ""}${
toc.show ? html`\n${renderToc(findHeaders(page), toc.label)}` : ""
}
<div id="observablehq-center">${renderHeader(page.header, resolvers)}
<main id="observablehq-main" class="observablehq${draft ? " observablehq--draft" : ""}">
<!-- div id="observablehq-center" -->${renderHeader(page.header, resolvers)}
<main id="observablehq-main" class="observablehq-center observablehq${draft ? " observablehq--draft" : ""}">
${html.unsafe(rewriteHtml(page.body, resolvers))}</main>${renderFooter(page.footer, resolvers, options)}
</div>
<!-- /div -->
`);
}

Expand Down Expand Up @@ -251,17 +251,19 @@ function renderModulePreload(href: string): Html | null {

function renderHeader(header: MarkdownPage["header"], resolvers: HtmlResolvers): Html | null {
return header
? html`\n<header id="observablehq-header">\n${html.unsafe(rewriteHtml(header, resolvers))}\n</header>`
? html`\n<header id="observablehq-header" class="observablehq-center">\n${html.unsafe(
rewriteHtml(header, resolvers)
)}\n</header>`
: null;
}

function renderFooter(footer: MarkdownPage["footer"], resolvers: HtmlResolvers, options: RenderOptions): Html | null {
const {path} = options;
const link = options.pager ? findLink(path, options) : null;
return link || footer
? html`\n<footer id="observablehq-footer">${link ? renderPager(link, resolvers.resolveLink) : ""}${
footer ? html`\n<div>${html.unsafe(rewriteHtml(footer, resolvers))}</div>` : ""
}
? html`\n<footer id="observablehq-footer" class="observablehq-center">${
link ? renderPager(link, resolvers.resolveLink) : ""
}${footer ? html`\n<div>${html.unsafe(rewriteHtml(footer, resolvers))}</div>` : ""}
</footer>`
: null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/style/grid.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#observablehq-center {
#observablehq-main {
container-type: inline-size;
}

Expand Down
31 changes: 17 additions & 14 deletions src/style/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#observablehq-main,
#observablehq-header,
#observablehq-footer {
margin: 1rem auto;
margin: 0 auto;
padding: 0 2rem;
max-width: 1152px;
}

Expand All @@ -20,6 +21,7 @@
#observablehq-footer {
display: block;
margin-top: 10rem;
margin-bottom: 2rem;
font: 12px var(--sans-serif);
color: var(--theme-foreground-faint);
}
Expand Down Expand Up @@ -76,8 +78,8 @@
content: "Next page";
}

#observablehq-center {
margin: 1rem 2rem;
.observablehq-center {
width: auto;
}

#observablehq-sidebar {
Expand Down Expand Up @@ -360,16 +362,17 @@
box-shadow: none;
border-right: solid 1px var(--theme-foreground-faintest);
}
#observablehq-sidebar-toggle:checked ~ #observablehq-center,
#observablehq-sidebar-toggle:indeterminate ~ #observablehq-center {
padding-left: calc(272px + 1rem);
padding-right: 1rem;
#observablehq-sidebar-toggle:checked ~ .observablehq-center,
#observablehq-sidebar-toggle:indeterminate ~ .observablehq-center {
padding-left: calc(272px + 3rem);
padding-right: 3rem;
}
}

@media (min-width: calc(640px + 6rem + 192px)) {
#observablehq-toc ~ #observablehq-center {
padding-right: calc(192px + 1rem);
#observablehq-toc ~ .observablehq-center {
padding-left: 2rem;
padding-right: calc(192px + 3rem);
}
#observablehq-toc {
display: block;
Expand All @@ -389,10 +392,10 @@
#observablehq-toc {
display: block;
}
#observablehq-sidebar-toggle:checked ~ #observablehq-toc ~ #observablehq-center,
#observablehq-sidebar-toggle:indeterminate ~ #observablehq-toc ~ #observablehq-center,
#observablehq-toc ~ #observablehq-center {
padding-right: calc(192px + 1rem);
#observablehq-sidebar-toggle:checked ~ #observablehq-toc ~ .observablehq-center,
#observablehq-sidebar-toggle:indeterminate ~ #observablehq-toc ~ .observablehq-center,
#observablehq-toc ~ .observablehq-center {
padding-right: calc(192px + 3rem);
}
}

Expand Down Expand Up @@ -608,7 +611,7 @@
}

@media print {
#observablehq-center {
.observablehq-center {
padding-left: 1em !important;
}
#observablehq-sidebar,
Expand Down
Loading