diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index b84ce29f..81e8de21 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -21,7 +21,6 @@ function TagContent(props: QuartzComponentProps) {
const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
return
{content}
-
{allPagesWithTag.length} items with this tag.
diff --git a/quartz/components/renderPage.tsx b/quartz/components/renderPage.tsx
index 4da6370c..8de60bf9 100644
--- a/quartz/components/renderPage.tsx
+++ b/quartz/components/renderPage.tsx
@@ -55,22 +55,22 @@ export function renderPage(slug: string, componentData: QuartzComponentProps, co
-
{LeftComponent}
+
-
{RightComponent}
+
{pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
diff --git a/quartz/components/scripts/graph.inline.ts b/quartz/components/scripts/graph.inline.ts
index 194a23bd..33e90c76 100644
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -225,7 +225,7 @@ async function renderGraph(container: string, slug: string) {
const labels = graphNode
.append("text")
.attr("dx", 0)
- .attr("dy", (d) => nodeRadius(d) - 8 + "px")
+ .attr("dy", (d) => -nodeRadius(d) + "px")
.attr("text-anchor", "middle")
.text((d) => data[d.id]?.title || (d.id.charAt(1).toUpperCase() + d.id.slice(2)).replace("-", " "))
.style('opacity', (opacityScale - 1) / 3.75)
@@ -297,14 +297,3 @@ document.addEventListener("nav", async (e: unknown) => {
containerIcon?.addEventListener("click", renderGlobalGraph)
})
-let resizeEventDebounce: number | undefined = undefined
-window.addEventListener('resize', () => {
- if (resizeEventDebounce) {
- clearTimeout(resizeEventDebounce)
- }
-
- resizeEventDebounce = window.setTimeout(async () => {
- const slug = document.body.dataset["slug"]!
- await renderGraph("graph-container", slug)
- }, 50)
-})
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index f69d77dd..054d3525 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -58,38 +58,7 @@ const encoder = (str: string) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])/
document.addEventListener("nav", async (e: unknown) => {
const currentSlug = (e as CustomEventMap["nav"]).detail.url
- // setup index if it hasn't been already
const data = await fetchData
- if (!index) {
- index = new Document({
- cache: true,
- charset: 'latin:extra',
- optimize: true,
- encode: encoder,
- document: {
- id: "slug",
- index: [
- {
- field: "title",
- tokenize: "forward",
- },
- {
- field: "content",
- tokenize: "reverse",
- },
- ]
- },
- })
-
- for (const [slug, fileData] of Object.entries
(data)) {
- await index.addAsync(slug, {
- slug,
- title: fileData.title,
- content: fileData.content
- })
- }
- }
-
const container = document.getElementById("search-container")
const searchIcon = document.getElementById("search-icon")
const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
@@ -176,6 +145,37 @@ document.addEventListener("nav", async (e: unknown) => {
searchIcon?.addEventListener("click", showSearch)
searchBar?.removeEventListener("input", onType)
searchBar?.addEventListener("input", onType)
+
+ // setup index if it hasn't been already
+ if (!index) {
+ index = new Document({
+ cache: true,
+ charset: 'latin:extra',
+ optimize: true,
+ encode: encoder,
+ document: {
+ id: "slug",
+ index: [
+ {
+ field: "title",
+ tokenize: "forward",
+ },
+ {
+ field: "content",
+ tokenize: "reverse",
+ },
+ ]
+ },
+ })
+
+ for (const [slug, fileData] of Object.entries(data)) {
+ await index.addAsync(slug, {
+ slug,
+ title: fileData.title,
+ content: fileData.content
+ })
+ }
+ }
// register handlers
registerEscapeHandler(container, hideSearch)
diff --git a/quartz/components/styles/darkmode.scss b/quartz/components/styles/darkmode.scss
index 0edfebda..10cbc72a 100644
--- a/quartz/components/styles/darkmode.scss
+++ b/quartz/components/styles/darkmode.scss
@@ -2,7 +2,7 @@
position: relative;
width: 20px;
height: 20px;
- margin: 1rem;
+ margin: 0 10px;
& > .toggle {
display: none;
diff --git a/quartz/components/styles/footer.scss b/quartz/components/styles/footer.scss
index 16df545d..565f9e3f 100644
--- a/quartz/components/styles/footer.scss
+++ b/quartz/components/styles/footer.scss
@@ -1,6 +1,5 @@
footer {
text-align: left;
- opacity: 0.8;
margin-bottom: 4rem;
& ul {
diff --git a/quartz/components/styles/popover.scss b/quartz/components/styles/popover.scss
index 05c6dc70..a372299c 100644
--- a/quartz/components/styles/popover.scss
+++ b/quartz/components/styles/popover.scss
@@ -29,11 +29,11 @@
line-height: normal;
font-size: initial;
font-family: var(--bodyFont);
- border: 1px solid var(--gray);
+ border: 1px solid var(--lightgray);
background-color: var(--light);
border-radius: 5px;
box-shadow: 6px 6px 36px 0 rgba(0,0,0,0.25);
- overflow: scroll;
+ overflow: auto;
}
h1 {
diff --git a/quartz/components/styles/search.scss b/quartz/components/styles/search.scss
index 1f0a8b58..fe94ec7e 100644
--- a/quartz/components/styles/search.scss
+++ b/quartz/components/styles/search.scss
@@ -12,6 +12,7 @@
display: flex;
align-items: center;
cursor: pointer;
+ white-space: nowrap;
& > div {
flex-grow: 1;
@@ -38,12 +39,13 @@
& > #search-container {
position: fixed;
+ contain: layout;
z-index: 999;
left: 0;
top: 0;
width: 100vw;
height: 100vh;
- overflow: scroll;
+ overflow-y: auto;
display: none;
backdrop-filter: blur(4px);
@@ -57,7 +59,7 @@
margin-left: auto;
margin-right: auto;
- @media all and (max-width: $tabletBreakpoint) {
+ @media all and (max-width: $fullPageWidth) {
width: 90%;
}
diff --git a/quartz/components/styles/toc.scss b/quartz/components/styles/toc.scss
index eee3ee8a..08e9548b 100644
--- a/quartz/components/styles/toc.scss
+++ b/quartz/components/styles/toc.scss
@@ -29,7 +29,7 @@ button#toc {
list-style: none;
overflow: hidden;
max-height: none;
- transition: max-height 0.3s ease;
+ transition: max-height 0.5s ease;
& ul {
list-style: none;
diff --git a/quartz/components/types.ts b/quartz/components/types.ts
index d1c153dd..b37ccee1 100644
--- a/quartz/components/types.ts
+++ b/quartz/components/types.ts
@@ -11,6 +11,9 @@ export type QuartzComponentProps = {
children: (QuartzComponent | JSX.Element)[]
tree: Node
allFiles: QuartzPluginData[]
+ displayClass?: 'mobile-only' | 'desktop-only'
+} & JSX.IntrinsicAttributes & {
+ [key: string]: any
}
export type QuartzComponent = ComponentType & {
diff --git a/quartz/styles/base.scss b/quartz/styles/base.scss
index e741755d..4d1145dc 100644
--- a/quartz/styles/base.scss
+++ b/quartz/styles/base.scss
@@ -43,71 +43,23 @@ a {
}
}
-.page {
- & > .page-header {
- max-width: $pageWidth;
- margin: $topSpacing auto 0 auto;
- }
-
- & > #quartz-body {
- width: 100%;
- display: flex;
-
- & .left, & .right {
- flex: 1;
- width: calc(calc(100vw - $pageWidth) / 2);
- }
-
- & .left-inner, & .right-inner {
- display: flex;
- flex-direction: column;
- gap: 2rem;
- top: 0;
- width: $sidePanelWidth;
- margin-top: $topSpacing;
- box-sizing: border-box;
- padding: 0 4rem;
- position: fixed;
- }
-
- & .left-inner {
- left: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
- }
-
- & .right-inner {
- right: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
- }
-
- & .center {
- width: $pageWidth;
- margin: 0 auto;
- }
- }
-}
-
.desktop-only {
display: initial;
- @media all and (max-width: ($pageWidth + 2 * $sidePanelWidth)) {
+ @media all and (max-width: $fullPageWidth) {
display: none;
}
}
.mobile-only {
display: none;
- @media all and (max-width: ($pageWidth + 2 * $sidePanelWidth)) {
+ @media all and (max-width: $fullPageWidth) {
display: initial;
}
}
.page {
- @media all and (max-width: $tabletBreakpoint) {
- margin: 25px 5vw;
- & .left, & .right {
- padding: 0;
- height: initial;
- max-width: none;
- position: initial;
- }
+ @media all and (max-width: $fullPageWidth) {
+ margin: 0 5vw;
}
& p {
@@ -129,6 +81,78 @@ a {
padding-left: 0;
}
}
+
+ & > #quartz-body {
+ width: 100%;
+ display: flex;
+ @media all and (max-width: $fullPageWidth) {
+ flex-direction: column;
+ }
+
+ & .left, & .right {
+ flex: 1;
+ width: calc(calc(100vw - $pageWidth) / 2);
+ @media all and (max-width: $fullPageWidth) {
+ width: initial;
+ }
+ }
+
+ & .left-inner, & .right-inner {
+ display: flex;
+ flex-direction: column;
+ gap: 2rem;
+ top: 0;
+ width: $sidePanelWidth;
+ margin-top: $topSpacing;
+ box-sizing: border-box;
+ padding: 0 4rem;
+ position: fixed;
+ @media all and (max-width: $fullPageWidth) {
+ position: initial;
+ flex-direction: row;
+ padding: 0;
+ width: initial;
+ margin-top: 4rem;
+ }
+ }
+
+ & .left-inner {
+ left: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
+ @media all and (max-width: $fullPageWidth) {
+ gap: 1rem;
+ align-items: center;
+ }
+ }
+
+ & .right-inner {
+ right: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
+ & > * {
+ @media all and (max-width: $fullPageWidth) {
+ flex: 1;
+ }
+ }
+ }
+ }
+
+ & .page-header {
+ width: $pageWidth;
+ margin: $topSpacing auto 0 auto;
+ @media all and (max-width: $fullPageWidth) {
+ width: initial;
+ margin-top: 2rem;
+ }
+ }
+
+ & .center, & footer {
+ width: $pageWidth;
+ margin-left: auto;
+ margin-right: auto;
+ @media all and (max-width: $fullPageWidth) {
+ width: initial;
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
}
input[type="checkbox"] {
@@ -200,7 +224,7 @@ pre {
font-family: var(--codeFont);
padding: 0.5rem;
border-radius: 5px;
- overflow-x: scroll;
+ overflow-x: auto;
border: 1px solid var(--lightgray);
& > code {
@@ -301,3 +325,23 @@ audio, video {
.spacer {
flex: 1 1 auto;
}
+
+ul.overflow, ol.overflow {
+ height: 400px;
+ overflow-y: scroll;
+
+ & > li:last-of-type {
+ margin-bottom: 50px;
+ }
+
+ &:after {
+ pointer-events: none;
+ content: '';
+ width: 100%;
+ height: 50px;
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ background: linear-gradient(transparent 0px, var(--light));
+ }
+}
diff --git a/quartz/styles/variables.scss b/quartz/styles/variables.scss
index 792223b0..6dd56144 100644
--- a/quartz/styles/variables.scss
+++ b/quartz/styles/variables.scss
@@ -1,5 +1,6 @@
-$pageWidth: 800px;
+$pageWidth: 750px;
$mobileBreakpoint: 600px;
$tabletBreakpoint: 1200px;
$sidePanelWidth: 400px;
$topSpacing: 6rem;
+$fullPageWidth: $pageWidth + 2 * $sidePanelWidth