diff options
| -rw-r--r-- | config.toml | 5 | ||||
| -rw-r--r-- | layouts/index.html | 75 | ||||
| -rw-r--r-- | layouts/partials/head.html | 19 | ||||
| -rw-r--r-- | layouts/partials/hook_head_end.html | 1 | ||||
| m--------- | themes/hyde | 0 |
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" . }} -<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}"> - <main class="content container" role="main"> - <section class="about"> - {{ .Content }} - </section> - <section class="recent"> - <h2>Recent Posts</h2> - <ul class="posts"> - {{ range first 3 .Data.Pages }} - <li> - <a class="post-title" href="{{ .RelPermalink | replaceRE "/$" "" }}">{{ .Title }}</a> - <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> - </li> - {{ end }} - </ul> - </section> - <section class="contact"> - <h2>Contact</h2> - <ul> - {{ range .Site.Menus.contact }} - <li> - {{ if hasPrefix .URL "mailto:" }} - <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a> - {{ else }} - <a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a> - {{ end }} - </li> - {{ end }} - </ul> - </section> - <footer> - {{ with .Site.Params.GPG }} - GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a> - {{ end }} - </footer> - </main> - {{ partial "sidebar.html" . }} -</body> -</html> +{{ define "main" -}} +<section class="about"> + {{ .Content }} + </section> + <section class="recent"> + <h2>Recent Posts</h2> + <ul class="posts"> + {{- range first 3 .Data.Pages }} + <li> + <a class="post-title" href="{{ .RelPermalink | replaceRE "/$" "" }}">{{ .Title }}</a> + <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> + </li> + {{- end }} + </ul> + </section> + <section class="contact"> + <h2>Contact</h2> + <ul> + {{- range .Site.Menus.contact }} + <li> + {{- if hasPrefix .URL "mailto:" }} + <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a> + {{- else }} + <a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a> + {{- end }} + </li> + {{- end }} + </ul> + </section> + <footer> + {{- with .Site.Params.GPG }} + GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a> + {{- end }} + </footer> +{{- end }} \ No newline at end of file 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 }} · {{ .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 |