From f24addd8465f68b95ee300898791d61168ce9040 Mon Sep 17 00:00:00 2001 From: Gao Wenrui <73920302+koktlzz@users.noreply.github.com> Date: Fri, 12 Aug 2022 13:58:59 +0800 Subject: [PATCH 1/5] Add displayTOConEdge --- config-examples/zh-cn/config.toml | 3 +++ layouts/partials/pages/post.html | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config-examples/zh-cn/config.toml b/config-examples/zh-cn/config.toml index f739e428..426307dc 100644 --- a/config-examples/zh-cn/config.toml +++ b/config-examples/zh-cn/config.toml @@ -813,6 +813,9 @@ uglyURLs = false # 是否链接文章的分节标题到目录 linkHeadingsToTOC = true + # 是否将目录置于页面左/右侧 + displayTOConEdge = false + ###################################### # 分节标题锚点 diff --git a/layouts/partials/pages/post.html b/layouts/partials/pages/post.html index fb681076..0747d68a 100644 --- a/layouts/partials/pages/post.html +++ b/layouts/partials/pages/post.html @@ -1,6 +1,12 @@
+ {{ $enableTOC := .Params.toc | default .Site.Params.enableTOC -}} + {{ $displayTOConEdge := default .Site.Params.displayTOConEdge -}} + {{- if and $enableTOC $displayTOConEdge -}} + {{- partial "utils/toc.html" . -}} + {{- end -}} + {{ $attrs := partial "utils/data-attributes.html" . }}
{{ (partial "utils/title.html" (dict "$" $ "title" {{ partial "components/post-meta.html" (dict "$" . "isHome" false) }} {{ end }} - {{ $enableTOC := .Params.toc | default .Site.Params.enableTOC -}} {{- if $enableTOC -}} - {{- partial "utils/toc.html" . -}} + {{- if not $displayTOConEdge -}} + {{- partial "utils/toc.html" . -}} + {{- end -}} {{- end -}}
From 90a88aad58201dbd30aa10273cd558e316af6434 Mon Sep 17 00:00:00 2001 From: Gao Wenrui <73920302+koktlzz@users.noreply.github.com> Date: Fri, 12 Aug 2022 14:19:42 +0800 Subject: [PATCH 2/5] Add displayTOConEdge --- layouts/partials/pages/post.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/layouts/partials/pages/post.html b/layouts/partials/pages/post.html index 0747d68a..3722406f 100644 --- a/layouts/partials/pages/post.html +++ b/layouts/partials/pages/post.html @@ -1,11 +1,12 @@
-
- {{ $enableTOC := .Params.toc | default .Site.Params.enableTOC -}} - {{ $displayTOConEdge := default .Site.Params.displayTOConEdge -}} - {{- if and $enableTOC $displayTOConEdge -}} - {{- partial "utils/toc.html" . -}} - {{- end -}} + {{ $enableTOC := .Params.toc | default .Site.Params.enableTOC -}} + {{ $displayTOConEdge := default .Site.Params.displayTOConEdge -}} + {{- if and $enableTOC $displayTOConEdge -}} + {{- partial "utils/toc.html" . -}} + {{- end -}} + +
{{ $attrs := partial "utils/data-attributes.html" . }} From bbe4fead2b56ae9d65eca61f1e9efe6ebfe4eacb Mon Sep 17 00:00:00 2001 From: Gao Wenrui <73920302+koktlzz@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:26:23 +0800 Subject: [PATCH 3/5] Add content position --- assets/scss/layout/_single.scss | 1 + assets/scss/main.scss | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/assets/scss/layout/_single.scss b/assets/scss/layout/_single.scss index d8255cda..137ccbe8 100644 --- a/assets/scss/layout/_single.scss +++ b/assets/scss/layout/_single.scss @@ -102,6 +102,7 @@ blockquote { } .contents { + position: $tocPosition margin-top: 5em; ol, ul { list-style: none; diff --git a/assets/scss/main.scss b/assets/scss/main.scss index dd1f4492..efb0ed2a 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -404,6 +404,14 @@ $baseRelURL: "{{ strings.TrimSuffix (.Site.BaseURL | relURL) "/" }}"; @import "pages/home-posts"; {{ end }} +// Post + +{{ if .Site.Params.displayTOConEdge }} + $tocPosition: fixed; +{{ else }} + $tocPosition: inherit; +{{ end }} + // Categories Page From 5842801d61fdc8bbc9165dc973132ef6852e4025 Mon Sep 17 00:00:00 2001 From: Gao Wenrui <73920302+koktlzz@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:59:47 +0800 Subject: [PATCH 4/5] update toc scss --- assets/scss/layout/_single.scss | 2 +- assets/scss/main.scss | 15 ++++++--------- config-examples/zh-cn/config.toml | 4 ++-- layouts/partials/pages/post.html | 6 +++--- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/assets/scss/layout/_single.scss b/assets/scss/layout/_single.scss index 137ccbe8..89b1e66d 100644 --- a/assets/scss/layout/_single.scss +++ b/assets/scss/layout/_single.scss @@ -102,7 +102,7 @@ blockquote { } .contents { - position: $tocPosition + position: $tocPosition; margin-top: 5em; ol, ul { list-style: none; diff --git a/assets/scss/main.scss b/assets/scss/main.scss index efb0ed2a..81cbe290 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -75,6 +75,12 @@ $enableSmoothScroll: false; {{ end }} +{{ if .Site.Params.displayTOConSide }} + $tocPosition: fixed; +{{ else }} + $tocPosition: inherit; +{{ end }} + $baseRelURL: "{{ strings.TrimSuffix (.Site.BaseURL | relURL) "/" }}"; @@ -404,15 +410,6 @@ $baseRelURL: "{{ strings.TrimSuffix (.Site.BaseURL | relURL) "/" }}"; @import "pages/home-posts"; {{ end }} -// Post - -{{ if .Site.Params.displayTOConEdge }} - $tocPosition: fixed; -{{ else }} - $tocPosition: inherit; -{{ end }} - - // Categories Page {{ if .Site.Params.enableTree }} diff --git a/config-examples/zh-cn/config.toml b/config-examples/zh-cn/config.toml index 426307dc..6859f93c 100644 --- a/config-examples/zh-cn/config.toml +++ b/config-examples/zh-cn/config.toml @@ -813,8 +813,8 @@ uglyURLs = false # 是否链接文章的分节标题到目录 linkHeadingsToTOC = true - # 是否将目录置于页面左/右侧 - displayTOConEdge = false + # 是否将目录置于页面左侧 + displayTOConSide = false ###################################### diff --git a/layouts/partials/pages/post.html b/layouts/partials/pages/post.html index 3722406f..40206da6 100644 --- a/layouts/partials/pages/post.html +++ b/layouts/partials/pages/post.html @@ -1,8 +1,8 @@
{{ $enableTOC := .Params.toc | default .Site.Params.enableTOC -}} - {{ $displayTOConEdge := default .Site.Params.displayTOConEdge -}} - {{- if and $enableTOC $displayTOConEdge -}} + {{ $displayTOConSide := default .Site.Params.displayTOConSide -}} + {{- if and $enableTOC $displayTOConSide -}} {{- partial "utils/toc.html" . -}} {{- end -}} @@ -37,7 +37,7 @@

{{ (partial "utils/title.html" (dict "$" $ "title" {{ end }} {{- if $enableTOC -}} - {{- if not $displayTOConEdge -}} + {{- if not $displayTOConSide -}} {{- partial "utils/toc.html" . -}} {{- end -}} {{- end -}} From b6acc01a7fa0575e0b529f1031634e4b3411495f Mon Sep 17 00:00:00 2001 From: Gao Wenrui <73920302+koktlzz@users.noreply.github.com> Date: Fri, 12 Aug 2022 16:28:35 +0800 Subject: [PATCH 5/5] Update main.scss --- assets/scss/main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 81cbe290..5be53bbf 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -410,6 +410,7 @@ $baseRelURL: "{{ strings.TrimSuffix (.Site.BaseURL | relURL) "/" }}"; @import "pages/home-posts"; {{ end }} + // Categories Page {{ if .Site.Params.enableTree }}