From e0535dbe3219e297945284ca2af9862bd457a893 Mon Sep 17 00:00:00 2001
From: Blake Allen <blakesnake100@gmail.com>
Date: Tue, 26 Oct 2021 19:43:55 +0000
Subject: [PATCH] fix conflict
---
layouts/index.html | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/layouts/index.html b/layouts/index.html
index 73c5979..6f7725b 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,19 +1,31 @@
-{{define "head"}}
-{{ partial "head.html" . }}
-{{end}}
-
-{{define "main"}}
{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
{{$content = replace $content "%20" "-"}}
{{$content = $content | safeHTML}}
-<!-- Main Page -->
-<div class="singlePage">
- {{partial "darkmode.html" .}}
- {{$content}}
+<!DOCTYPE html>
+<html lang="en">
+{{ partial "head.html" . }}
- <!-- Contact Info -->
- <div>
- {{partial "footer.html" .}}
- </div>
+<body>
+{{partial "search.html" .}}
+<div class="singlePage">
+ <!-- Begin actual content -->
+ <header>
+ {{if .Title}}<h1>{{ .Title }}</h1>{{end}}
+ <svg tabindex="0" id="search-icon" aria-labelledby="title desc" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.9 19.7"><title id="title">Search Icon</title><desc id="desc">Icon to open search</desc><g class="search-path" fill="none"><path stroke-linecap="square" d="M18.5 18.3l-5.4-5.4"/><circle cx="8" cy="8" r="7"/></g></svg>
+ <div class="spacer"></div>
+ {{partial "darkmode.html" .}}
+ </header>
+ <article>
+ {{if $.Site.Data.config.enableToc}}
+ <aside class="mainTOC">
+ <h3>Table of Contents</h3>
+ {{ .TableOfContents }}
+ </aside>
+ {{end}}
+ {{- $content -}}
+ </article>
+ {{partial "footer.html" .}}
</div>
-{{end}}
+</body>
+
+</html>
\ No newline at end of file
--
Gitblit v1.10.0