From b7a619bbd73f9220f8c1fcbad203792c78343464 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 12 Jul 2022 14:37:10 -0700 Subject: [PATCH 1/4] fix: tabsize not being respected --- assets/styles/syntax.scss | 4 ++++ config.toml | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/styles/syntax.scss b/assets/styles/syntax.scss index fbea72a44..14153c9a0 100644 --- a/assets/styles/syntax.scss +++ b/assets/styles/syntax.scss @@ -56,3 +56,7 @@ border-radius: 3px !important; margin: 0 !important; } + +pre.chroma { + -moz-tab-size:4;-o-tab-size:4;tab-size:4; +} diff --git a/config.toml b/config.toml index 94c2f9b40..a545ed815 100644 --- a/config.toml +++ b/config.toml @@ -1,7 +1,6 @@ baseURL = "https://quartz.jzhao.xyz/" languageCode = "en-us" googleAnalytics = "G-XYFD95KB4J" -pygmentsUseClasses = true relativeURLs = false disablePathToLower = true ignoreFiles = [ @@ -18,6 +17,7 @@ enableGitInfo = true ordered = true startLevel = 2 [markup.highlight] + noClasses = false anchorLineNos = false codeFences = true guessSyntax = true @@ -27,7 +27,6 @@ enableGitInfo = true lineNos = true lineNumbersInTable = true style = "dracula" - tabWidth = 4 [frontmatter] lastmod = ["lastmod", ":git", "date", "publishDate"] publishDate = ["publishDate", "date"] From c1b8fe1221e3367f0632ce43f602e811c0fd0284 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Wed, 13 Jul 2022 14:32:32 -0700 Subject: [PATCH 2/4] feat: restyle search icon --- assets/styles/base.scss | 19 +++++++++++++++---- layouts/_default/section.html | 7 +------ layouts/_default/single.html | 9 ++------- layouts/_default/taxonomy.html | 7 +------ layouts/_default/term.html | 7 +------ layouts/index.html | 7 +------ layouts/partials/header.html | 10 ++++++++++ 7 files changed, 31 insertions(+), 35 deletions(-) create mode 100644 layouts/partials/header.html diff --git a/assets/styles/base.scss b/assets/styles/base.scss index 776f32d77..4426abb06 100644 --- a/assets/styles/base.scss +++ b/assets/styles/base.scss @@ -24,7 +24,6 @@ h1, h2, h3, h4, h5, h6, ol, ul, thead { opacity: 0.3; transition: opacity 0.3s ease; color: var(--secondary); - } p, ul, text { @@ -381,11 +380,24 @@ header { flex: 1 1 auto; } - & > svg { + #search-icon { + background-color: var(--lightgray); + border-radius: 4px; + height: 2em; + display: flex; + align-items: center; + cursor: pointer; + & > p { + display: inline; + padding-left: 0.5em; + } + } + + & svg { cursor: pointer; width: 18px; min-width: 18px; - margin: 0 1em; + margin: 0 0.5em; &:hover .search-path { stroke: var(--tertiary); @@ -592,4 +604,3 @@ header { } } - diff --git a/layouts/_default/section.html b/layouts/_default/section.html index abdf0b05c..2fc714439 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -6,12 +6,7 @@ {{partial "search.html" .}}
-
-

{{ .Site.Data.config.page_title }}

- Search IconIcon to open search -
- {{partial "darkmode.html" .}} -
+ {{partial "header.html" .}}

All {{.Title}}

{{partial "page-list.html" .Paginator.Pages.ByLastmod.Reverse }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 06507a705..7c2ab10f5 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,13 +6,8 @@ {{partial "search.html" .}}
-
-

{{ .Site.Data.config.page_title }}

- Search IconIcon to open search -
- {{partial "darkmode.html" .}} -
-
+ {{partial "header.html" .}} +
{{if .Title}}

{{ .Title }}

{{end}}

Last updated {{if ne .Date .Lastmod}}{{ .Lastmod.Format "January 2, 2006" }}{{else}}Unknown{{end}}. diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index e0a1e876c..8f86b648f 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -6,12 +6,7 @@ {{partial "search.html" .}}

-
-

{{ .Site.Data.config.page_title }}

- Search IconIcon to open search -
- {{partial "darkmode.html" .}} -
+ {{partial "header.html" .}}

All {{.Title}}

diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 58f024bcc..abddc07b4 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -6,12 +6,7 @@ {{partial "search.html" .}}
-
-

{{ .Site.Data.config.page_title }}

- Search IconIcon to open search -
- {{partial "darkmode.html" .}} -
+ {{partial "header.html" .}}

Tag: {{.Title | humanize}}

{{partial "page-list.html" .Paginator.Pages}} diff --git a/layouts/index.html b/layouts/index.html index 505361420..c7871e9f6 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -6,12 +6,7 @@ {{partial "search.html" .}}
-
-

{{if .Title}}{{ .Title }}{{else}}Untitled{{end}}

- Search IconIcon to open search -
- {{partial "darkmode.html" .}} -
+ {{partial "header.html" .}}
{{partial "toc.html" .}} {{partial "textprocessing.html" . }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html new file mode 100644 index 000000000..773e0684b --- /dev/null +++ b/layouts/partials/header.html @@ -0,0 +1,10 @@ +
+

{{ .Site.Data.config.page_title }}

+
+
+

Search

+ Search IconIcon to open search +
+ {{partial "darkmode.html" .}} +
+ From ffe22689eb43f42afc2d6bcf9b8b190b19a7e5d1 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Wed, 13 Jul 2022 15:01:50 -0700 Subject: [PATCH 3/4] feat: use floating-ui for better popover positioning --- assets/js/popover.js | 11 +++++++++++ assets/styles/base.scss | 9 ++------- layouts/partials/head.html | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/assets/js/popover.js b/assets/js/popover.js index 494cd84e1..8eb637d6f 100644 --- a/assets/js/popover.js +++ b/assets/js/popover.js @@ -46,7 +46,18 @@ function initPopover(baseURL, useContextualBacklinks, renderLatex) { throwOnError: false }) } + li.addEventListener("mouseover", () => { + // fix tooltip positioning + window.FloatingUIDOM.computePosition(li, el, { + middleware: [window.FloatingUIDOM.offset(15), window.FloatingUIDOM.inline(), window.FloatingUIDOM.shift()], + }).then(({ x, y }) => { + Object.assign(el.style, { + left: `${x}px`, + top: `${y}px`, + }) + }) + el.classList.add("visible") }) li.addEventListener("mouseout", () => { diff --git a/assets/styles/base.scss b/assets/styles/base.scss index 4426abb06..8898ec39b 100644 --- a/assets/styles/base.scss +++ b/assets/styles/base.scss @@ -389,7 +389,7 @@ header { cursor: pointer; & > p { display: inline; - padding-left: 0.5em; + padding: 0 0.5em 0 1em; } } @@ -534,12 +534,10 @@ header { 1% { display: inline-block; opacity: 0; - transform: translate(-50%, 40%); } 100% { opacity: 1; visibility: visible; - transform: translate(-50%, 20%); } } @@ -550,9 +548,9 @@ header { display: none; background-color: var(--light); padding: 1em; + margin: 1em; border: 1px solid var(--outlinegray); border-radius: 5px; - transform: translate(-50%, 40%); pointer-events: none; transition: opacity 0.2s ease, transform 0.2s ease; user-select: none; @@ -566,7 +564,6 @@ header { &.visible { opacity: 1; visibility: visible; - transform: translate(-50%, 20%); display: inline-block; animation: dropin 0.2s ease; } @@ -590,8 +587,6 @@ header { } } - - #contact_buttons ul { list-style-type: none; diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 0890983b4..e3c6967a3 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -44,6 +44,9 @@ {{partial "katex.html" .}} + + + {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" | resources.Minify }} From 81af8c459bc9924b8c7137aee9385ed5f5deeb3c Mon Sep 17 00:00:00 2001 From: y1450 <107429941+y1450@users.noreply.github.com> Date: Thu, 14 Jul 2022 00:02:11 +0200 Subject: [PATCH 4/4] fix: remove console log (#159) --- assets/js/clipboard.js | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/js/clipboard.js b/assets/js/clipboard.js index 6389330e4..78979c824 100644 --- a/assets/js/clipboard.js +++ b/assets/js/clipboard.js @@ -33,6 +33,5 @@ const addCopyButtons = () => { // find chroma inside els[i] let chroma = els[i].getElementsByClassName("chroma")[0]; els[i].insertBefore(button, chroma); - console.log(els[i].lastChild) } }