merge upstream

This commit is contained in:
Niklas Buschmann
2020-02-07 21:20:47 +01:00
parent 5047a8d02e
commit 0cd0d1235b
5 changed files with 30 additions and 27 deletions

View File

@@ -1,9 +1,7 @@
{{ define "main" }}
<article>
<header>
<h1>404: Page not found</h1>
</header>
<header><h1>404: Page not found</h1></header>
<p>Unfortunately, this page does not exist.</p>
</article>

View File

@@ -12,7 +12,6 @@
{{- end }}
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/index.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/classes.css">
<link rel="stylesheet" href="{{ .Site.BaseURL }}fonts/PT-Sans.css">
{{- if .Site.Params.sidebar }}
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/sidebar.css" media="screen and (min-width: 70em)">
{{- end }}
@@ -28,6 +27,8 @@
{{ with .Site.Params.description }}<div class="hidden">{{ safeHTML . }}</div>{{ end }}
</header>
<body>
{{- block "main" . }}{{- end }}
</body>
</html>