fix conflict

3 years ago · e0535dbe32
parent 8eca1e60f7
commit e0535dbe32
3 changed files with 27 additions and 15 deletions
--- a/content/_index.md
+++ b/content/_index.md
@ -20,4 +20,4 @@ I was really inspired by [Bianca](https://garden.bianca.digital/) and [Joel](htt
 ## Get Started
 The entire Quartz documentation is fully hosted using Quartz! To get started, let's visit the main directory.

-👉  [Directory](moc/directory.md)
+👉  [Directory](moc/direc%20tory.md)
--- a/content/moc/directory.md
+++ b/content/moc/directory.md
--- 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>