From 231964080b26b3b3cab91b2c6144a784d3bef99d Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 00:06:35 +0800
Subject: In-post APlayer now support multiple files
---
layouts/partials/head.html | 2 +-
layouts/partials/scripts-end.html | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 0603c4d..6470262 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -41,7 +41,7 @@
<link rel="stylesheet" href="{{ "/assets/css/fuji.min.css" | relURL }}" />
{{ end }}
-{{ if .Params.playerURL }}
+{{ if .Params.player }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" />
{{ end }}
{{ if .Site.Params.useDisqusJS }}
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 862e0e2..2e1de5f 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -7,20 +7,25 @@
<script defer src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.5/dist/medium-zoom.min.js"></script>
<script defer src="{{ "/assets/js/fuji.min.js" | relURL }}"></script>
-{{ with .Params.playerURL }}
+{{ with .Params.player }}
<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script>
<script>
// in-post aplayer
var aPlayer = new APlayer({
container: document.getElementById('post-aplayer'),
theme: '#8f82bc',
- volume: 0.1,
- audio: [{
- name: '{{ $.Params.playerName }}',
- artist: '{{ $.Params.playerArtist }}',
- url: '{{ . }}',
- cover: '{{ $.Params.playerCover }}'
- }]
+ volume: 0.2,
+ listFolded: true,
+ audio: [
+ {{- range $.Params.player -}}
+ {
+ name: '{{ .playerName }}',
+ artist: '{{ .playerArtist }}',
+ url: '{{ .playerURL }}',
+ cover: '{{ .playerCover }}'
+ },
+ {{- end -}}
+ ]
});
// aplayer toc anchors fix
// see https://github.com/MoePlayer/APlayer/issues/242#issuecomment-602471423
--
cgit v1.2.3
From a6f35cee7b1634f734c830af2bfa5283f3de7366 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 00:45:41 +0800
Subject: Update scripts-end.html
---
layouts/partials/scripts-end.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 2e1de5f..024ee6f 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -14,7 +14,7 @@
var aPlayer = new APlayer({
container: document.getElementById('post-aplayer'),
theme: '#8f82bc',
- volume: 0.2,
+ volume: 0.1,
listFolded: true,
audio: [
{{- range $.Params.player -}}
--
cgit v1.2.3
From 89fc2917985d3da944af8116e101748267d66104 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 23:17:37 +0800
Subject: Remove medium-zoom
---
layouts/partials/scripts-end.html | 1 -
1 file changed, 1 deletion(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 024ee6f..e5426ad 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -4,7 +4,6 @@
<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/plugins/autoloader/prism-autoloader.min.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.2/lazysizes.min.js"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.5/dist/medium-zoom.min.js"></script>
<script defer src="{{ "/assets/js/fuji.min.js" | relURL }}"></script>
{{ with .Params.player }}
--
cgit v1.2.3
From 398ca6e2f300cce5c7bf7fa69fde42b4b592f5a4 Mon Sep 17 00:00:00 2001
From: Jiawei Huang
Date: Sun, 14 Jun 2020 14:05:14 -0700
Subject: Add preliminary Google AdSense support
When `googleAdsense` is set in `config.toml`, the AdSense code snippet
will be inserted between the `<head></head>` tags of your site. Only
Google AdSense Auto ads is supported at the moment.
---
layouts/partials/head.html | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'layouts/partials')
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 0603c4d..b953cd8 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -41,6 +41,15 @@
<link rel="stylesheet" href="{{ "/assets/css/fuji.min.css" | relURL }}" />
{{ end }}
+{{ if .Site.Params.googleAdsense }}
+<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<script>
+ (adsbygoogle = window.adsbygoogle || []).push({
+ enable_page_level_ads: true,
+ google_ad_client: "ca-pub-{{.Site.Params.googleAdsense}}",
+ });
+</script>
+{{ end}}
{{ if .Params.playerURL }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" />
{{ end }}
--
cgit v1.2.3
From a3376d1ad133455b73ca893e222c1aec89ae6d44 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 15 Jun 2020 23:50:54 +0800
Subject: Update searching based on Fuse.js
---
layouts/partials/scripts-end.html | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index e5426ad..1cd0c62 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -1,13 +1,34 @@
<script async type="module" src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.esm.js"></script>
<script async nomodule src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.js"></script>
+
+{{ if eq .Section "search" }}
+<script src="https://cdn.jsdelivr.net/npm/fuse.js@6.1.0/dist/fuse.js"></script>
+<!-- Search result template -->
+<script src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script>
+<script id="search-result-template" type="text/fuse-template">
+ {{ "<% for(var i = 0; i < $data.length; i++){ %>" | safeHTML }}
+ <div class="post">
+ <h3 class="post-item post-title-archive">
+ <a href="<%= $data[i].item.permalink %>">{{ "<%= $data[i].item.title %>" | safeHTML }}</a>
+ </h3>
+ <div class="post-item post-meta-archive">
+ {{ "<%= $data[i].item.tags %>" | safeHTML }}
+ </div>
+ </div>
+ {{ "<% } %>" | safeHTML }}
+</script>
+{{ else if eq .Section "archives" }}
+{{ else }}
<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/components/prism-core.min.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/plugins/autoloader/prism-autoloader.min.js"></script>
-
<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.2/lazysizes.min.js"></script>
+{{ end }}
+
<script defer src="{{ "/assets/js/fuji.min.js" | relURL }}"></script>
{{ with .Params.player }}
<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script>
+<!-- prettier-ignore -->
<script>
// in-post aplayer
var aPlayer = new APlayer({
@@ -15,8 +36,7 @@
theme: '#8f82bc',
volume: 0.1,
listFolded: true,
- audio: [
- {{- range $.Params.player -}}
+ audio: [{{- range $.Params.player -}}
{
name: '{{ .playerName }}',
artist: '{{ .playerArtist }}',
@@ -24,7 +44,6 @@
cover: '{{ .playerCover }}'
},
{{- end -}}
- ]
});
// aplayer toc anchors fix
// see https://github.com/MoePlayer/APlayer/issues/242#issuecomment-602471423
--
cgit v1.2.3
From e7587236dbe98775315619d4f3b8d3f335001583 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 00:47:55 +0800
Subject: Update tags in search template
---
layouts/partials/scripts-end.html | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 1cd0c62..69c5dca 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -12,7 +12,13 @@
<a href="<%= $data[i].item.permalink %>">{{ "<%= $data[i].item.title %>" | safeHTML }}</a>
</h3>
<div class="post-item post-meta-archive">
- {{ "<%= $data[i].item.tags %>" | safeHTML }}
+ {{ "<% if ($data[i].item.tags && $data[i].item.tags.length > 0) { %>" | safeHTML }}
+ {{ "<% for(var j = 0; j < $data[i].item.tags.length; j++){ %>" | safeHTML }}
+ {{ "<%= $data[i].item.tags[j] %>" | safeHTML }}
+ {{ "<% } %>" | safeHTML }}
+ {{ "<% } else { %>" | safeHTML }}
+ No Tag
+ {{ "<% } %>" | safeHTML }}
</div>
</div>
{{ "<% } %>" | safeHTML }}
--
cgit v1.2.3
From c42924047c6f654c4723746790e041f8907ed378 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 14:00:53 +0800
Subject: Searching now works
---
layouts/partials/post-meta.html | 2 +-
layouts/partials/scripts-end.html | 27 +++++----------------------
2 files changed, 6 insertions(+), 23 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html
index 5176053..3e366e7 100644
--- a/layouts/partials/post-meta.html
+++ b/layouts/partials/post-meta.html
@@ -1 +1 @@
-<span><ion-icon name="today"></ion-icon></ion-icon> {{ .Date.Format "2006-01-02" }}</span>{{ if .Site.Params.showWordCounter }}<span><ion-icon name="file-tray"></ion-icon> {{ .WordCount }}{{ i18n "postMetaWordCount" }}</span>{{ end }}{{ if .Site.Params.showReadTime }}<span><ion-icon name="stopwatch"></ion-icon> {{ .ReadingTime }}{{ i18n "postMetaReadingTime" }}</span>{{ end }}<span><ion-icon name="pricetags"></ion-icon> {{ if .Params.tags }}{{ range .Params.tags }}<a href="{{ "/tags/" | relURL }}{{ . | urlize}}">{{ . }}</a> {{ end }}{{ else }}{{ i18n "postMetaNoTag" }}{{ end }}</span>
\ No newline at end of file
+<span><ion-icon name="today"></ion-icon> {{ .Date.Format "2006-01-02" }}</span>{{ if .Site.Params.showWordCounter }}<span><ion-icon name="file-tray"></ion-icon> {{ .WordCount }}{{ i18n "postMetaWordCount" }}</span>{{ end }}{{ if .Site.Params.showReadTime }}<span><ion-icon name="stopwatch"></ion-icon> {{ .ReadingTime }}{{ i18n "postMetaReadingTime" }}</span>{{ end }}<span><ion-icon name="pricetags"></ion-icon> {{ if .Params.tags }}{{ range .Params.tags }}<a href="{{ "/tags/" | relURL }}{{ . | urlize}}">{{ . }}</a> {{ end }}{{ else }}{{ i18n "postMetaNoTag" }}{{ end }}</span>
\ No newline at end of file
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 69c5dca..2959beb 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -2,27 +2,8 @@
<script async nomodule src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.js"></script>
{{ if eq .Section "search" }}
-<script src="https://cdn.jsdelivr.net/npm/fuse.js@6.1.0/dist/fuse.js"></script>
-<!-- Search result template -->
-<script src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script>
-<script id="search-result-template" type="text/fuse-template">
- {{ "<% for(var i = 0; i < $data.length; i++){ %>" | safeHTML }}
- <div class="post">
- <h3 class="post-item post-title-archive">
- <a href="<%= $data[i].item.permalink %>">{{ "<%= $data[i].item.title %>" | safeHTML }}</a>
- </h3>
- <div class="post-item post-meta-archive">
- {{ "<% if ($data[i].item.tags && $data[i].item.tags.length > 0) { %>" | safeHTML }}
- {{ "<% for(var j = 0; j < $data[i].item.tags.length; j++){ %>" | safeHTML }}
- {{ "<%= $data[i].item.tags[j] %>" | safeHTML }}
- {{ "<% } %>" | safeHTML }}
- {{ "<% } else { %>" | safeHTML }}
- No Tag
- {{ "<% } %>" | safeHTML }}
- </div>
- </div>
- {{ "<% } %>" | safeHTML }}
-</script>
+<script defer src="https://cdn.jsdelivr.net/npm/fuse.js@6.1.0/dist/fuse.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script>
{{ else if eq .Section "archives" }}
{{ else }}
<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/components/prism-core.min.js"></script>
@@ -37,6 +18,7 @@
<!-- prettier-ignore -->
<script>
// in-post aplayer
+ /* beautify preserve:start */
var aPlayer = new APlayer({
container: document.getElementById('post-aplayer'),
theme: '#8f82bc',
@@ -49,8 +31,9 @@
url: '{{ .playerURL }}',
cover: '{{ .playerCover }}'
},
- {{- end -}}
+ {{- end -}}]
});
+ /* beautify preserve:end */
// aplayer toc anchors fix
// see https://github.com/MoePlayer/APlayer/issues/242#issuecomment-602471423
document.addEventListener('DOMContentLoaded', function () {
--
cgit v1.2.3
From f44c0d05b1a5308afce8c61e9aef7658b72b42ed Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 15:39:13 +0800
Subject: Update cfga
---
layouts/partials/analytic-cfga.html | 2 +-
layouts/partials/scripts-end.html | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/analytic-cfga.html b/layouts/partials/analytic-cfga.html
index 63db4d6..d1e52af 100644
--- a/layouts/partials/analytic-cfga.html
+++ b/layouts/partials/analytic-cfga.html
@@ -3,5 +3,5 @@
window.ga_tid = '{{ .Site.Params.googleAnalyticsTid }}';
window.ga_api = '{{ .Site.Params.googleAnalyticsRoute }}';
</script>
-<script async src="https://cdn.jsdelivr.net/npm/cfga@1.0.1/cfga.min.js"></script>
+<script async src="https://cdn.jsdelivr.net/npm/cfga@1.0.3/cfga.min.js"></script>
{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 2959beb..83ce1d6 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -1,6 +1,5 @@
<script async type="module" src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.esm.js"></script>
<script async nomodule src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.js"></script>
-
{{ if eq .Section "search" }}
<script defer src="https://cdn.jsdelivr.net/npm/fuse.js@6.1.0/dist/fuse.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script>
@@ -10,9 +9,7 @@
<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/plugins/autoloader/prism-autoloader.min.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.2/lazysizes.min.js"></script>
{{ end }}
-
<script defer src="{{ "/assets/js/fuji.min.js" | relURL }}"></script>
-
{{ with .Params.player }}
<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script>
<!-- prettier-ignore -->
--
cgit v1.2.3
From 03750a600a71df1276ccfcc7c817de5cb86e3e9f Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 15:42:19 +0800
Subject: Fix meta text align in archives and search page
---
layouts/partials/head.html | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 88f398f..88d3d19 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -9,7 +9,6 @@
<!-- favicon -->
{{ partial "favicon.html" . }}
-
<!-- seo metadata -->
{{ if and (.IsHome) (.Site.Params.subTitle) }}
<title>{{ .Site.Title }} - {{ .Site.Params.subTitle }}</title>
@@ -22,16 +21,13 @@
<meta name="author" content="{{ if .Params.author }}{{ .Params.author }}{{ else }}{{ .Site.Params.author }}{{ end }}" />
{{ end }}
{{ if or (.Params.description) (.Site.Params.description) }}
-<meta name="description"
- content="{{ if .Params.description }}{{ .Params.description }}{{ else }}{{ .Site.Params.description }}{{ end }}" />
+<meta name="description" content="{{ if .Params.description }}{{ .Params.description }}{{ else }}{{ .Site.Params.description }}{{ end }}" />
{{ end }}
{{ if .Params.tags }}
<meta name="keywords" content="{{ delimit .Params.tags ", " }}" />
{{ end }}
-
{{ template "_internal/opengraph.html" . }}
{{ template "_internal/twitter_cards.html" . }}
-
<!-- dep -->
{{ if .Site.Params.useHugoPipes }}
{{ $options := (dict "targetPath" "assets/css/fuji-custom.min.css" "outputStyle" "compressed") }}
@@ -40,17 +36,14 @@
{{ else }}
<link rel="stylesheet" href="{{ "/assets/css/fuji.min.css" | relURL }}" />
{{ end }}
-
{{ with .Site.Params.googleAdsense }}
<script async data-ad-client="ca-pub-{{ . }}" src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
{{ end}}
-
{{ if .Params.player }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" />
{{ end }}
{{ if .Site.Params.useDisqusJS }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/disqusjs@1.3/dist/disqusjs.css" />
{{ end }}
-
{{ partial "analytic-gtag.html" . }}
{{ partial "analytic-cfga.html" . }}
\ No newline at end of file
--
cgit v1.2.3
From bcd4d3fdb1b5e6a6ede2dbc4ea64fc47642a2173 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 16:29:16 +0800
Subject: Option darken image
---
layouts/partials/head.html | 1 +
layouts/partials/styles.html | 13 +++++++++++++
2 files changed, 14 insertions(+)
create mode 100644 layouts/partials/styles.html
(limited to 'layouts/partials')
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 88d3d19..1bcdf85 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -29,6 +29,7 @@
{{ template "_internal/opengraph.html" . }}
{{ template "_internal/twitter_cards.html" . }}
<!-- dep -->
+{{ partial "styles.html" . }}
{{ if .Site.Params.useHugoPipes }}
{{ $options := (dict "targetPath" "assets/css/fuji-custom.min.css" "outputStyle" "compressed") }}
{{ $style := resources.Get "scss/fuji.scss" | resources.ToCSS $options }}
diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html
new file mode 100644
index 0000000..cc6d930
--- /dev/null
+++ b/layouts/partials/styles.html
@@ -0,0 +1,13 @@
+{{ if ne .Site.Params.disableDarkImage true }}
+<style>
+ @media (prefers-color-scheme: dark) {
+ body[data-theme='auto'] img {
+ filter: brightness(60%);
+ }
+ }
+
+ body[data-theme='dark'] img {
+ filter: brightness(60%);
+ }
+</style>
+{{ end }}
\ No newline at end of file
--
cgit v1.2.3
From dfd5ecf0c2326147656a2306654175ca061e228e Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Wed, 17 Jun 2020 19:05:54 +0800
Subject: Move RSS link to config.toml
---
layouts/partials/sidebar.html | 3 ---
1 file changed, 3 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 7ead0e2..a730c0b 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -15,9 +15,6 @@
<a href="{{ .URL }}">{{ .Name }}</a>
</li>
{{ end }}
- <li>
- <a href="{{ "/index.xml" | relURL }}" target="_blank">RSS</a>
- </li>
</ul>
</div>
<!-- tags -->
--
cgit v1.2.3
From 1e3b01af7a026e215365c3c4625acd64a74215fe Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 18 Jun 2020 13:54:45 +0800
Subject: Update dependency
---
layouts/partials/scripts-end.html | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 83ce1d6..37311b7 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -1,8 +1,7 @@
<script async type="module" src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.esm.js"></script>
<script async nomodule src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.js"></script>
{{ if eq .Section "search" }}
-<script defer src="https://cdn.jsdelivr.net/npm/fuse.js@6.1.0/dist/fuse.js"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/combine/npm/art-template@4.13.2/lib/template-web.min.js,npm/fuse.js@6.2.0"></script>
{{ else if eq .Section "archives" }}
{{ else }}
<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/components/prism-core.min.js"></script>
--
cgit v1.2.3
From 5c68750e0cd265464aa55b1f1d89e54f7e71ccc0 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 18 Jun 2020 14:17:51 +0800
Subject: Optimize toc & license settings logic
---
layouts/partials/sidebar.html | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'layouts/partials')
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index a730c0b..af737ce 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,11 +1,13 @@
<aside class="col-12 col-md-3 float-left sidebar">
<!-- in-post toc -->
- {{ if and (in .Site.Params.mainSections .Type) (and (.Site.Params.showToc) (ne .Params.noToc true)) }}
+ {{ if in .Site.Params.mainSections .Type }}
+ {{ if and (or .Site.Params.showToc .Params.showToc) (ne .Params.showToc false) }}
<div class="sidebar-item sidebar-toc">
<h3>{{ i18n "sidebarToc" }}</h3>
{{ .TableOfContents }}
</div>
{{ end }}
+ {{ end }}
<!-- pages -->
<div class="sidebar-item sidebar-pages">
<h3>{{ i18n "sidebarPages" }}</h3>
@@ -43,8 +45,8 @@
<!-- bgm.tv image chart -->
<div class="sidebar-item sidebar-bgm">
<h3>{{ i18n "sidebarBangumiChart" }}</h3>
- <img class="lazyload" src="{{ $.Site.Params.lazyPlaceholder | relURL }}" data-src="https://bgm.tv/chart/img/{{ . }}"
- alt="Bangumi 图像榜单" />
+ <img class="lazyload" src="{{ $.Site.Params.lazyPlaceholder | relURL }}"
+ data-src="https://bgm.tv/chart/img/{{ . }}" alt="Bangumi 图像榜单" />
</div>
{{ end }}
</aside>
\ No newline at end of file
--
cgit v1.2.3