Merge remote-tracking branch 'upstream/master'

2023-02-03 19:10:17 -08:00 · 2023-02-03 19:10:17 -08:00 · 99abc442a1
commit 99abc442a1
parent 98d08f23b8 10adb45d85
8 changed files with 20 additions and 19 deletions
--- a/images/.DS_Store
+++ b/images/.DS_Store
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -12,6 +12,8 @@
 			<h1 class="page-title">All articles</h1>
 		{{ end }}

+		{{ with .Content }}{{ . }}{{ end }}
+
 		<ul class="posts">
 			{{- range .Data.Pages -}}
 			{{- if (in (.Site.Params.excludedTypes | default (slice "page")) .Type) -}}
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-{{ partial "header.html" . }}
-
-<body>
-	<div class="container wrapper tags">
-		{{ partial "head.html" . }}
-
-		<h1 class="page-title">All tags</h1>
-	</div>
-
-	{{ partial "footer.html" . }}
-</body>
-
-</html>
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@ -6,7 +6,9 @@
 	<div class="container wrapper tags">
 		{{ partial "head.html" . }}

-		<h1 class="page-title">All tags</h1>
+		<h1 class="page-title">{{ .Title }}</h1>
+
+		{{ with .Content }}{{ . }}{{ end }}

 		{{ $biggest := 1 }}
 		{{ $smallest := 1 }}
--- a/layouts/index.html
+++ b/layouts/index.html
@ -6,8 +6,10 @@
 	<div class="container wrapper">
 		{{ partial "head.html" . }}

+		{{ with .Content }}{{ . }}{{ end }}
+
 		<div>
-			{{.Content}}
+			{{ with .Content }}{{ . }}{{ end }}
 		</div>

 		{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -1,5 +1,6 @@
 <div class="header">
 	{{- if .IsHome -}}
+	<base href="{{ .Site.BaseURL }}">
 	<h1 class="site-title"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1>
 	<div class="site-description">
 		{{- if isset .Site.Params "subtitle" -}}
@ -29,4 +30,4 @@
 			{{- end }}
 		</ul>
 	</nav>
-</div>
+</div>
--- a/static/css/dark.css
+++ b/static/css/dark.css
@ -66,4 +66,8 @@ table th {
 table th, table td {
    padding: 10px 20px;
    border: 1px solid #666;
-}
+}
+
+pre code {
+  display: inline-block
+}
--- a/static/css/main.css
+++ b/static/css/main.css
@ -202,6 +202,11 @@ ul {
    background-color: #FAFAFA;
 }

+pre code {
+  display: inline-block;
+}
+  
+
 .wrapper {
    max-width: 760px;
    margin: 0 auto;