Move navbar and footer out of directories where they are the only files, update base template.

2020-06-01 18:07:55 -04:00 · 2020-06-01 18:07:55 -04:00 · 56aba374b8
commit 56aba374b8
parent ed202c3523
3 changed files with 4 additions and 8 deletions
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -9,21 +9,17 @@
 		<link rel="stylesheet" href="/light-theme.css">
 		<link rel="shortcut icon" href="/favicon.ico">

-		<title>{{ block "title" . }}
-		{{ .Site.Title }}
-		{{ end }}</title>
+		<title>{{ block "title" . }} {{ .Site.Title }} {{ end }}</title>
 	</head>

 	<body>
-		{{ partial "navbar/site-navbar.html" . }}
+		{{ partial "navbar.html" . }}

 		<main>
-			{{ block "main" . }}
-				<!-- The part of the page that begins to differ between templates -->
-			{{ end }}
+			{{ block "main" . }} {{ end }}
 		</main>

-		{{ partial "footer/site-footer.html" . }}
+		{{ partial "footer.html" . }}
 		{{ partial "scripts/scripts.html" . }}
 	</body>
 </html>
--- a/layouts/partials/footer/site-footer.html
+++ b/layouts/partials/footer/site-footer.html
--- a/layouts/partials/navbar/site-navbar.html
+++ b/layouts/partials/navbar/site-navbar.html