Update hyde

author: Alan Pearce 2018-06-17 19:40:34 +0200
committer: Alan Pearce 2018-06-17 19:40:34 +0200
commit: 7ffe02d5070b979f7a99727f9a919bc5a2956038 (patch)
tree: aa11f9c8ae96862c0bf4aa612d354688bbd639a8
parent: 5619a512a607df67ca5970494917e20471aab8c6 (diff)
download: website-7ffe02d5070b979f7a99727f9a919bc5a2956038.tar.xz
website-7ffe02d5070b979f7a99727f9a919bc5a2956038.zip
5 files changed, 37 insertions, 63 deletions
diff --git a/config.toml b/config.toml
index 43ab763..3450dc2 100644
--- a/config.toml
+++ b/config.toml

@@ -4,12 +4,12 @@ title = "Alan Pearce"
 theme = "hyde"
 pygmentsUseClasses = true
 pygmentsCodeFences = true
-copyright = "Licensed under a Creative Commons Attribution 4.0 International License."
 [Params]
 Description = "Developer, Emacser"
 themeColor = "theme-base-0b"
 layoutReverse = true
+copyright = "Licensed under a Creative Commons Attribution 4.0 International License."
 [Params.GPG]
 fingerprint = "B9E4 E797 2F41 CD50 0FB9 CD05 AE86 25A6 3F6F 8FD5"
@@ -20,9 +20,6 @@ url = "/public_key.asc"
    image = "/img/me-thumb.jpg"
 [[menu.main]]
-    name = "Home"
-    URL = "/"
-[[menu.main]]
    name = "Posts"
    URL = "/post/"
 [[menu.main]]
diff --git a/layouts/index.html b/layouts/index.html
index 1d1c3e8..870efea 100644
--- a/layouts/index.html
+++ b/layouts/index.html

@@ -1,40 +1,35 @@
-{{ partial "head.html" . }}
+{{ define "main" -}}
-<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
+<section class="about">
-        <main class="content container" role="main">
+  {{ .Content }}
-    <section class="about">
+  </section>
-      {{ .Content }}
+  <section class="recent">
-    </section>
+    <h2>Recent Posts</h2>
-                <section class="recent">
+    <ul class="posts">
-                        <h2>Recent Posts</h2>
+      {{- range first 3 .Data.Pages }}
-                        <ul class="posts">
+      <li>
-                                {{ range first 3 .Data.Pages }}
+        <a class="post-title" href="{{ .RelPermalink | replaceRE "/$" "" }}">{{ .Title }}</a>
-                                <li>
+        <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
-                                        <a class="post-title" href="{{ .RelPermalink | replaceRE "/$" "" }}">{{ .Title }}</a>
+      </li>
-                                        <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
+      {{- end }}
-                                </li>
+    </ul>
-                                {{ end }}
+  </section>
-                        </ul>
+  <section class="contact">
-                </section>
+    <h2>Contact</h2>
-    <section class="contact">
+    <ul>
-                        <h2>Contact</h2>
+      {{- range .Site.Menus.contact }}
-                        <ul>
+      <li>
-                                {{ range .Site.Menus.contact }}
+        {{- if hasPrefix .URL "mailto:" }}
-                                <li>
+        <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>
-                                        {{ if hasPrefix .URL "mailto:" }}
+        {{- else }}
-                                        <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>
+        <a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>
-                                        {{ else }}
+        {{- end }}
-                                        <a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>
+      </li>
-                                        {{ end }}
+      {{- end }}
-                                </li>
+    </ul>
-                                {{ end }}
+  </section>
-                        </ul>
+  <footer>
-                </section>
+    {{- with .Site.Params.GPG }}
-    <footer>
+    GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>
-      {{ with .Site.Params.GPG }}
+    {{- end }}
-      GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>
+  </footer>
-      {{ end }}
+{{- end }}
+\ No newline at end of file
-    </footer>
-        </main>
-  {{ partial "sidebar.html" . }}
-</body>
-</html>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
deleted file mode 100644
index 2cf88f5..0000000
--- a/layouts/partials/head.html
+++ /dev/null

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-GB">
-        <head>
-                <meta charset="UTF-8">
-                <meta name="viewport" content="width=device-width,initial-scale=1">
-                {{ if .IsHome }}
-                <title>{{ .Site.Title }}</title>
-                {{ else }}
-                <title>{{ .Title }} &middot; {{ .Site.Title }}</title>
-                {{ end }}
-                <link rel="stylesheet" href="/css/poole.css">
-                <link rel="stylesheet" href="/css/syntax.css">
-                <link rel="stylesheet" href="/css/hyde.css">
-                <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}">
-                <link href="{{ if .IsPage }}{{ .Permalink | replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
-    <link href="{{ .Site.Params.GPG.url | absURL }}" rel="pgpkey">
-        </head>
diff --git a/layouts/partials/hook_head_end.html b/layouts/partials/hook_head_end.html
new file mode 100644
index 0000000..3442304
--- /dev/null
+++ b/layouts/partials/hook_head_end.html

@@ -0,0 +1 @@
+<link href="{{ if .IsPage }}{{ .Permalink | replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
+\ No newline at end of file
diff --git a/themes/hyde b/themes/hyde

-Subproject 61b24805867fc6d2aa67ede189d43faf86220ad
+Subproject 6f7b8a114d998778a2cf7772a29feb3bff6cba8
author	Alan Pearce	2018-06-17 19:40:34 +0200
committer	Alan Pearce	2018-06-17 19:40:34 +0200
commit	7ffe02d5070b979f7a99727f9a919bc5a2956038 (patch)
tree	aa11f9c8ae96862c0bf4aa612d354688bbd639a8
parent	5619a512a607df67ca5970494917e20471aab8c6 (diff)
download	website-7ffe02d5070b979f7a99727f9a919bc5a2956038.tar.xz website-7ffe02d5070b979f7a99727f9a919bc5a2956038.zip

diff --git a/config.toml b/config.toml index 43ab763..3450dc2 100644 --- a/config.toml +++ b/config.toml
@@ -4,12 +4,12 @@ title = "Alan Pearce"
4	theme = "hyde"	4	theme = "hyde"
5	pygmentsUseClasses = true	5	pygmentsUseClasses = true
6	pygmentsCodeFences = true	6	pygmentsCodeFences = true
7	copyright = "Licensed under a Creative Commons Attribution 4.0 International License."
8		7
9	[Params]	8	[Params]
10	Description = "Developer, Emacser"	9	Description = "Developer, Emacser"
11	themeColor = "theme-base-0b"	10	themeColor = "theme-base-0b"
12	layoutReverse = true	11	layoutReverse = true
		12	copyright = "Licensed under a Creative Commons Attribution 4.0 International License."
13		13
14	[Params.GPG]	14	[Params.GPG]
15	fingerprint = "B9E4 E797 2F41 CD50 0FB9 CD05 AE86 25A6 3F6F 8FD5"	15	fingerprint = "B9E4 E797 2F41 CD50 0FB9 CD05 AE86 25A6 3F6F 8FD5"
@@ -20,9 +20,6 @@ url = "/public_key.asc"
20	image = "/img/me-thumb.jpg"	20	image = "/img/me-thumb.jpg"
21		21
22	[[menu.main]]	22	[[menu.main]]
23	name = "Home"
24	URL = "/"
25	[[menu.main]]
26	name = "Posts"	23	name = "Posts"
27	URL = "/post/"	24	URL = "/post/"
28	[[menu.main]]	25	[[menu.main]]


diff --git a/layouts/index.html b/layouts/index.html index 1d1c3e8..870efea 100644 --- a/layouts/index.html +++ b/layouts/index.html
@@ -1,40 +1,35 @@
1	{{ partial "head.html" . }}	1	{{ define "main" -}}
2	<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">	2	<section class="about">
3	<main class="content container" role="main">	3	{{ .Content }}
4	<section class="about">	4	</section>
5	{{ .Content }}	5	<section class="recent">
6	</section>	6	<h2>Recent Posts</h2>
7	<section class="recent">	7	<ul class="posts">
8	<h2>Recent Posts</h2>	8	{{- range first 3 .Data.Pages }}
9	<ul class="posts">	9	<li>
10	{{ range first 3 .Data.Pages }}	10	<a class="post-title" href="{{ .RelPermalink \| replaceRE "/$" "" }}">{{ .Title }}</a>
11	<li>	11	<time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
12	<a class="post-title" href="{{ .RelPermalink \| replaceRE "/$" "" }}">{{ .Title }}</a>	12	</li>
13	<time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>	13	{{- end }}
14	</li>	14	</ul>
15	{{ end }}	15	</section>
16	</ul>	16	<section class="contact">
17	</section>	17	<h2>Contact</h2>
18	<section class="contact">	18	<ul>
19	<h2>Contact</h2>	19	{{- range .Site.Menus.contact }}
20	<ul>	20	<li>
21	{{ range .Site.Menus.contact }}	21	{{- if hasPrefix .URL "mailto:" }}
22	<li>	22	<a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>
23	{{ if hasPrefix .URL "mailto:" }}	23	{{- else }}
24	<a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>	24	<a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>
25	{{ else }}	25	{{- end }}
26	<a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>	26	</li>
27	{{ end }}	27	{{- end }}
28	</li>	28	</ul>
29	{{ end }}	29	</section>
30	</ul>	30	<footer>
31	</section>	31	{{- with .Site.Params.GPG }}
32	<footer>	32	GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>
33	{{ with .Site.Params.GPG }}	33	{{- end }}
34	GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>	34	</footer>
35	{{ end }}	35	{{- end }} \ No newline at end of file
36	</footer>
37	</main>
38	{{ partial "sidebar.html" . }}
39	</body>
40	</html>


diff --git a/layouts/partials/head.html b/layouts/partials/head.html deleted file mode 100644 index 2cf88f5..0000000 --- a/layouts/partials/head.html +++ /dev/null
@@ -1,19 +0,0 @@
1	<!DOCTYPE html>
2	<html lang="en-GB">
3	<head>
4	<meta charset="UTF-8">
5	<meta name="viewport" content="width=device-width,initial-scale=1">
6
7	{{ if .IsHome }}
8	<title>{{ .Site.Title }}</title>
9	{{ else }}
10	<title>{{ .Title }} · {{ .Site.Title }}</title>
11	{{ end }}
12
13	<link rel="stylesheet" href="/css/poole.css">
14	<link rel="stylesheet" href="/css/syntax.css">
15	<link rel="stylesheet" href="/css/hyde.css">
16	<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}">
17	<link href="{{ if .IsPage }}{{ .Permalink \| replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
18	<link href="{{ .Site.Params.GPG.url \| absURL }}" rel="pgpkey">
19	</head>


diff --git a/layouts/partials/hook_head_end.html b/layouts/partials/hook_head_end.html new file mode 100644 index 0000000..3442304 --- /dev/null +++ b/layouts/partials/hook_head_end.html
@@ -0,0 +1 @@
			<link href="{{ if .IsPage }}{{ .Permalink \| replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical"> \ No newline at end of file


diff --git a/themes/hyde b/themes/hyde
	Subproject 61b24805867fc6d2aa67ede189d43faf86220ad		Subproject 6f7b8a114d998778a2cf7772a29feb3bff6cba8