Merge branch 'hugo' into feature/clipboard

This commit is contained in:
Geoffrey Garrett 2022-07-02 10:43:49 +02:00 committed by GitHub
commit 48b8aacf07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions

View File

@ -8,12 +8,7 @@ const syntaxTheme = document.querySelector("#theme-link");
if (currentTheme) { if (currentTheme) {
document.documentElement.setAttribute('saved-theme', currentTheme); document.documentElement.setAttribute('saved-theme', currentTheme);
if (currentTheme === 'dark') { (currentTheme === 'dark') ? syntaxTheme.href = '{{ $darkSyntax.Permalink }}' : syntaxTheme.href = '{{ $lightSyntax.Permalink }}';
syntaxTheme.href = '{{ $darkSyntax.Permalink }}';
}
else {
syntaxTheme.href = '{{ $lightSyntax.Permalink }}';
}
} }
const switchTheme = (e) => { const switchTheme = (e) => {

View File

@ -66,7 +66,7 @@ Please note that the `cname` field should *not* have any path `e.g. end with /qu
[Reference `deploy.yaml` here](https://github.com/jackyzha0/quartz/blob/hugo/.github/workflows/deploy.yaml) [Reference `deploy.yaml` here](https://github.com/jackyzha0/quartz/blob/hugo/.github/workflows/deploy.yaml)
```yaml ```yaml {title=".github/workflows/deploy.yaml"}
- name: Deploy - name: Deploy
uses: peaceiris/actions-gh-pages@v3 uses: peaceiris/actions-gh-pages@v3
with: with:

View File

@ -1,8 +1,9 @@
{{$src := .Destination | safeURL }} {{$src := .Destination | safeURL }}
{{$width := index (split .Text "|") 1 | default "auto" }}
{{$external := strings.HasPrefix $src "http" }} {{$external := strings.HasPrefix $src "http" }}
{{- if $external -}} {{- if $external -}}
<img src="{{ $src }}" alt="{{ .Text }}" {{ with .Title }} title="{{ . }}" {{ end }} /> <img src="{{ $src }}" width="{{ $width }}" alt="{{ .Text }}" {{ with .Title }} title="{{ . }}" {{ end }} />
{{- else -}} {{- else -}}
{{$fixedUrl := (cond (hasPrefix $src "/") $src (print "/" $src)) | urlize}} {{$fixedUrl := (cond (hasPrefix $src "/") $src (print "/" $src)) | urlize}}
<img src="{{.Page.Site.BaseURL}}{{ $fixedUrl }}" alt="{{ .Text }}" {{ with .Title }} title="{{ . }}" {{ end }} /> <img src="{{.Page.Site.BaseURL}}{{ $fixedUrl }}" width="{{ $width }}" alt="{{ .Text }}" {{ with .Title }} title="{{ . }}" {{ end }} />
{{- end -}} {{- end -}}

View File

@ -95,6 +95,7 @@
{{if $.Site.Data.config.enableClipboard -}} {{if $.Site.Data.config.enableClipboard -}}
initClipboard(); initClipboard();
{{ end }} {{ end }}
{{if $.Site.Data.config.enableSPA -}} {{if $.Site.Data.config.enableSPA -}}
addTitleToCodeBlocks(); addTitleToCodeBlocks();
{{ end }} {{ end }}
@ -135,6 +136,7 @@
window.addEventListener("DOMContentLoaded", initClipboard); window.addEventListener("DOMContentLoaded", initClipboard);
{{ end }} {{ end }}
{{ end }} {{ end }}
{{if $.Site.Data.config.enableCodeBlockTitle -}} {{if $.Site.Data.config.enableCodeBlockTitle -}}
{{if $.Site.Data.config.enableSPA -}} {{if $.Site.Data.config.enableSPA -}}
addTitleToCodeBlocks(); addTitleToCodeBlocks();
@ -166,8 +168,11 @@
navigate: (url) => (window.location.href = url), navigate: (url) => (window.location.href = url),
prefetch: () => {}, prefetch: () => {},
} }
init()
render() window.addEventListener("DOMContentLoaded", () => {
init()
render()
})
</script> </script>
{{end}} {{end}}
</head> </head>