From 5fb203a6dff8bcf238d3926992d621070e2a62b0 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 23 Jan 2024 14:18:53 -0800 Subject: [PATCH 01/10] fix(style): make a not inline-block --- quartz/styles/base.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/quartz/styles/base.scss b/quartz/styles/base.scss index 8fb464df1..27bad69ac 100644 --- a/quartz/styles/base.scss +++ b/quartz/styles/base.scss @@ -59,7 +59,6 @@ a { text-decoration: none; transition: color 0.2s ease; color: var(--secondary); - display: inline-block; &:hover { color: var(--tertiary) !important; From fa6c02d3213dfd4e6da8e78bd3a2e7004555fd01 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 23 Jan 2024 17:08:52 -0800 Subject: [PATCH 02/10] fix: make search result card block --- quartz/components/styles/search.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/quartz/components/styles/search.scss b/quartz/components/styles/search.scss index 09bdb4e77..5fe0aad50 100644 --- a/quartz/components/styles/search.scss +++ b/quartz/components/styles/search.scss @@ -94,6 +94,7 @@ border: 1px solid var(--lightgray); border-bottom: none; width: 100%; + display: block; // normalize card props font-family: inherit; From b22bcd17b4301c6ef398124eec11f6dff0c2d37d Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 23 Jan 2024 20:20:35 -0800 Subject: [PATCH 03/10] fix: border-box result-card --- quartz/components/styles/search.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/quartz/components/styles/search.scss b/quartz/components/styles/search.scss index 5fe0aad50..d1d271637 100644 --- a/quartz/components/styles/search.scss +++ b/quartz/components/styles/search.scss @@ -95,6 +95,7 @@ border-bottom: none; width: 100%; display: block; + box-sizing: border-box; // normalize card props font-family: inherit; From d5b40279bd12fd527553f53da98f3fd9d85e88d8 Mon Sep 17 00:00:00 2001 From: LUCASTUCIOUS Date: Thu, 25 Jan 2024 08:54:24 +0100 Subject: [PATCH 04/10] feat: Enable custom callout (#724) * Enable custom callout make a callout custom defaulted to a note one. * Add a comment * remove comment from quartz/plugins/transformers/ofm.ts Co-authored-by: Jacky Zhao * Update quartz/plugins/transformers/ofm.ts Co-authored-by: Jacky Zhao --------- Co-authored-by: Jacky Zhao --- quartz/plugins/transformers/ofm.ts | 7 ++++--- quartz/styles/callouts.scss | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts index c06729676..f6345c5b5 100644 --- a/quartz/plugins/transformers/ofm.ts +++ b/quartz/plugins/transformers/ofm.ts @@ -108,7 +108,8 @@ const calloutMapping: Record = { function canonicalizeCallout(calloutName: string): keyof typeof callouts { let callout = calloutName.toLowerCase() as keyof typeof calloutMapping - return calloutMapping[callout] ?? "note" + // if callout is not recognized, make it a custom one + return calloutMapping[callout] ?? calloutName } export const externalLinkRegex = /^https?:\/\//i @@ -431,7 +432,7 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin value: `
-
${callouts[calloutType]}
+
${callouts[calloutType] ?? callouts.note}
${title}
${collapse ? toggleIcon : ""}
`, @@ -457,7 +458,7 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin node.data = { hProperties: { ...(node.data?.hProperties ?? {}), - className: `callout ${collapse ? "is-collapsible" : ""} ${ + className: `callout ${calloutType} ${collapse ? "is-collapsible" : ""} ${ defaultState === "collapsed" ? "is-collapsed" : "" }`, "data-callout": calloutType, diff --git a/quartz/styles/callouts.scss b/quartz/styles/callouts.scss index 703bd67f6..34d3a4560 100644 --- a/quartz/styles/callouts.scss +++ b/quartz/styles/callouts.scss @@ -13,7 +13,7 @@ margin-top: 0; } - &[data-callout="note"] { + &[data-callout] { --color: #448aff; --border: #448aff44; --bg: #448aff10; From d90199c8dbb2028cbe1f22997ab1cb0c26022916 Mon Sep 17 00:00:00 2001 From: Xinyang Yu <47915643+xy-241@users.noreply.github.com> Date: Fri, 26 Jan 2024 01:56:26 +0800 Subject: [PATCH 05/10] fix: code block overflow scroll (#729) --- quartz/styles/base.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/quartz/styles/base.scss b/quartz/styles/base.scss index 27bad69ac..16be6ad53 100644 --- a/quartz/styles/base.scss +++ b/quartz/styles/base.scss @@ -356,6 +356,7 @@ pre { counter-increment: line 0; display: grid; padding: 0.5rem 0; + overflow-x: scroll; & [data-highlighted-chars] { background-color: var(--highlight); From a8e1c4abc2f5a76d0ff0d582b5c1cbfb81ddbe2f Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Thu, 25 Jan 2024 22:22:01 -0800 Subject: [PATCH 06/10] docs: rearrange showcase --- docs/showcase.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/showcase.md b/docs/showcase.md index 16235e46a..cdef5fc50 100644 --- a/docs/showcase.md +++ b/docs/showcase.md @@ -7,13 +7,10 @@ Want to see what Quartz can do? Here are some cool community gardens: - [Quartz Documentation (this site!)](https://quartz.jzhao.xyz/) - [Jacky Zhao's Garden](https://jzhao.xyz/) - [Socratica Toolbox](https://toolbox.socratica.info/) -- [Brandon Boswell's Garden](https://brandonkboswell.com) -- [Scaling Synthesis - A hypertext research notebook](https://scalingsynthesis.com/) -- [Data Dictionary 🧠](https://glossary.airbyte.com/) -- [sspaeti.com's Second Brain](https://brain.sspaeti.com/) - [oldwinter の数字花园](https://garden.oldwinter.top/) +- [Aaron Pham's Garden](https://aarnphm.xyz/) +- [The Quantum Garden](https://quantumgardener.blog/) - [Abhijeet's Math Wiki](https://abhmul.github.io/quartz/Math-Wiki/) -- [Mike's AI Garden 🤖🪴](https://mwalton.me/) - [Matt Dunn's Second Brain](https://mattdunn.info/) - [Pelayo Arbues' Notes](https://pelayoarbues.github.io/) - [Vince Imbat's Talahardin](https://vinceimbat.com/) @@ -22,7 +19,11 @@ Want to see what Quartz can do? Here are some cool community gardens: - [Mau Camargo's Notkesto](https://notes.camargomau.com/) - [Caicai's Novels](https://imoko.cc/blog/caicai/) - [🌊 Collapsed Wave](https://collapsedwave.com/) -- [Aaron Pham's Garden](https://aarnphm.xyz/) - [Sideny's 3D Artist's Handbook](https://sidney-eliot.github.io/3d-artists-handbook/) +- [Mike's AI Garden 🤖🪴](https://mwalton.me/) +- [Brandon Boswell's Garden](https://brandonkboswell.com) +- [Scaling Synthesis - A hypertext research notebook](https://scalingsynthesis.com/) +- [Data Dictionary 🧠](https://glossary.airbyte.com/) +- [sspaeti.com's Second Brain](https://brain.sspaeti.com/) If you want to see your own on here, submit a [Pull Request adding yourself to this file](https://github.com/jackyzha0/quartz/blob/v4/docs/showcase.md)! From b87c6cd5c792d90fcd1ee553187af8d5c00980d3 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Fri, 26 Jan 2024 10:55:59 -0800 Subject: [PATCH 07/10] docs: add nicole van der hoeven's setup guide --- docs/index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/index.md b/docs/index.md index 7804ac6ba..0783d4470 100644 --- a/docs/index.md +++ b/docs/index.md @@ -25,6 +25,9 @@ This will guide you through initializing your Quartz with content. Once you've d 4. [[build|Build and preview]] Quartz 5. [[hosting|Host]] Quartz online +If you prefer video format you can also try following Nicole van der Hoeven's +[video guide on how set up Quartz!](https://www.youtube.com/watch?v=6s6DT1yN4dw&t=227s) + ## 🔧 Features - [[Obsidian compatibility]], [[full-text search]], [[graph view]], note transclusion, [[wikilinks]], [[backlinks]], [[Latex]], [[syntax highlighting]], [[popover previews]], [[Docker Support]], and [many more](./features) right out of the box From 8fa1a1e7b9de36a93afed138dccb5f6663d40941 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Fri, 26 Jan 2024 13:40:37 -0800 Subject: [PATCH 08/10] fix: allow partial when specifiying layout for emitter plugins --- quartz/plugins/emitters/folderPage.tsx | 2 +- quartz/plugins/emitters/tagPage.tsx | 2 +- quartz/plugins/types.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quartz/plugins/emitters/folderPage.tsx b/quartz/plugins/emitters/folderPage.tsx index a4bd1aed2..04a5a0086 100644 --- a/quartz/plugins/emitters/folderPage.tsx +++ b/quartz/plugins/emitters/folderPage.tsx @@ -19,7 +19,7 @@ import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.lay import { FolderContent } from "../../components" import { write } from "./helpers" -export const FolderPage: QuartzEmitterPlugin = (userOpts) => { +export const FolderPage: QuartzEmitterPlugin> = (userOpts) => { const opts: FullPageLayout = { ...sharedPageComponents, ...defaultListPageLayout, diff --git a/quartz/plugins/emitters/tagPage.tsx b/quartz/plugins/emitters/tagPage.tsx index 56a552c69..3e450f6a8 100644 --- a/quartz/plugins/emitters/tagPage.tsx +++ b/quartz/plugins/emitters/tagPage.tsx @@ -16,7 +16,7 @@ import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.lay import { TagContent } from "../../components" import { write } from "./helpers" -export const TagPage: QuartzEmitterPlugin = (userOpts) => { +export const TagPage: QuartzEmitterPlugin> = (userOpts) => { const opts: FullPageLayout = { ...sharedPageComponents, ...defaultListPageLayout, diff --git a/quartz/plugins/types.ts b/quartz/plugins/types.ts index bf1c0db0e..a361bb9fd 100644 --- a/quartz/plugins/types.ts +++ b/quartz/plugins/types.ts @@ -2,7 +2,7 @@ import { PluggableList } from "unified" import { StaticResources } from "../util/resources" import { ProcessedContent } from "./vfile" import { QuartzComponent } from "../components/types" -import { FilePath, FullSlug } from "../util/path" +import { FilePath } from "../util/path" import { BuildCtx } from "../util/ctx" export interface PluginTypes { From 448ba008e0eba87736067d486222900407c212c3 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Fri, 26 Jan 2024 20:16:54 -0800 Subject: [PATCH 09/10] docs: fix phrasing --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 0783d4470..f9f8603b6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -25,7 +25,7 @@ This will guide you through initializing your Quartz with content. Once you've d 4. [[build|Build and preview]] Quartz 5. [[hosting|Host]] Quartz online -If you prefer video format you can also try following Nicole van der Hoeven's +If you prefer instructions in a video format you can try following Nicole van der Hoeven's [video guide on how set up Quartz!](https://www.youtube.com/watch?v=6s6DT1yN4dw&t=227s) ## 🔧 Features From af3a4ff9cd0d49ffa414844b2d54e04e344486aa Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Fri, 26 Jan 2024 20:23:43 -0800 Subject: [PATCH 10/10] docs: i can't type --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index f9f8603b6..1cb02dc95 100644 --- a/docs/index.md +++ b/docs/index.md @@ -26,7 +26,7 @@ This will guide you through initializing your Quartz with content. Once you've d 5. [[hosting|Host]] Quartz online If you prefer instructions in a video format you can try following Nicole van der Hoeven's -[video guide on how set up Quartz!](https://www.youtube.com/watch?v=6s6DT1yN4dw&t=227s) +[video guide on how to set up Quartz!](https://www.youtube.com/watch?v=6s6DT1yN4dw&t=227s) ## 🔧 Features