From e0535dbe3219e297945284ca2af9862bd457a893 Mon Sep 17 00:00:00 2001 From: Blake Allen <blakesnake100@gmail.com> Date: Tue, 26 Oct 2021 12:43:55 -0700 Subject: [PATCH] fix conflict --- content/_index.md | 2 +- content/moc/{directory.md => direc tory.md} | 0 layouts/index.html | 40 +++++++++++++-------- 3 files changed, 27 insertions(+), 15 deletions(-) rename content/moc/{directory.md => direc tory.md} (100%) diff --git a/content/_index.md b/content/_index.md index b665a3dec..657cb17b2 100644 --- 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) \ No newline at end of file +👉 [Directory](moc/direc%20tory.md) \ No newline at end of file diff --git a/content/moc/directory.md b/content/moc/direc tory.md similarity index 100% rename from content/moc/directory.md rename to content/moc/direc tory.md diff --git a/layouts/index.html b/layouts/index.html index 73c59794f..6f7725bf5 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