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 1 commit
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
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-center {
container-type: inline-size;
}

Expand Down
18 changes: 9 additions & 9 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,7 @@
#observablehq-main,
#observablehq-header,
#observablehq-footer {
margin: 1rem auto;
_margin: 1rem auto;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all the margins needs fixing

max-width: 1152px;
}

Expand Down Expand Up @@ -76,7 +76,7 @@
content: "Next page";
}

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

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

@media (min-width: calc(640px + 6rem + 192px)) {
#observablehq-toc ~ #observablehq-center {
#observablehq-toc ~ .observablehq-center {
padding-right: calc(192px + 1rem);
}
#observablehq-toc {
Expand All @@ -389,9 +389,9 @@
#observablehq-toc {
display: block;
}
#observablehq-sidebar-toggle:checked ~ #observablehq-toc ~ #observablehq-center,
#observablehq-sidebar-toggle:indeterminate ~ #observablehq-toc ~ #observablehq-center,
#observablehq-toc ~ #observablehq-center {
#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);
}
}
Expand Down Expand Up @@ -608,7 +608,7 @@
}

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