fix conflict
This commit is contained in:
		
							parent
							
								
									8eca1e60f7
								
							
						
					
					
						commit
						e0535dbe32
					
				
					 3 changed files with 27 additions and 15 deletions
				
			
		| 
						 | 
					@ -20,4 +20,4 @@ I was really inspired by [Bianca](https://garden.bianca.digital/) and [Joel](htt
 | 
				
			||||||
## Get Started
 | 
					## Get Started
 | 
				
			||||||
The entire Quartz documentation is fully hosted using Quartz! To get started, let's visit the main directory.
 | 
					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)
 | 
				
			||||||
| 
						 | 
					@ -1,19 +1,31 @@
 | 
				
			||||||
{{define "head"}}
 | 
					 | 
				
			||||||
{{ partial "head.html" . }}
 | 
					 | 
				
			||||||
{{end}}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
{{define "main"}}
 | 
					 | 
				
			||||||
{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
 | 
					{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
 | 
				
			||||||
{{$content = replace $content "%20" "-"}}
 | 
					{{$content = replace $content "%20" "-"}}
 | 
				
			||||||
{{$content = $content | safeHTML}}
 | 
					{{$content = $content | safeHTML}}
 | 
				
			||||||
<!-- Main Page -->
 | 
					<!DOCTYPE html>
 | 
				
			||||||
<div class="singlePage">
 | 
					<html lang="en">
 | 
				
			||||||
    {{partial "darkmode.html" .}}
 | 
					{{ partial "head.html" . }}
 | 
				
			||||||
    {{$content}}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- Contact Info -->
 | 
					<body>
 | 
				
			||||||
    <div>
 | 
					{{partial "search.html" .}}
 | 
				
			||||||
        {{partial "footer.html" .}}
 | 
					<div class="singlePage">
 | 
				
			||||||
    </div>
 | 
					    <!-- 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>
 | 
					</div>
 | 
				
			||||||
{{end}}
 | 
					</body>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</html>
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue