From a14d06aa3d37396531dbfe09bb3b18b7eb9b96ad Mon Sep 17 00:00:00 2001
From: Blake Allen <blakesnake100@gmail.com>
Date: Tue, 26 Oct 2021 19:44:25 +0000
Subject: [PATCH] fix conflict fix
---
layouts/_default/single.html | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0025cd3..9193ee6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,6 @@
-<!-- {{replaceRE `(http.+) (\w+)` "$1-$2" .Content}} -->
{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
{{$content = replace $content "%20" "-"}}
+{{$content = $content | safeHTML}}
<!DOCTYPE html>
<html lang="en">
{{ partial "head.html" . }}
@@ -16,7 +16,13 @@
{{partial "darkmode.html" .}}
</header>
<article>
- {{ $content | safeHTML }}
+ {{if $.Site.Data.config.enableToc}}
+ <aside class="mainTOC">
+ <h3>Table of Contents</h3>
+ {{ .TableOfContents }}
+ </aside>
+ {{end}}
+ {{- $content -}}
</article>
{{partial "footer.html" .}}
</div>
--
Gitblit v1.10.0