diff options
| -rw-r--r-- | layouts/_default/baseof.html | 8 | ||||
| -rw-r--r-- | layouts/_default/list.html | 18 | ||||
| -rw-r--r-- | layouts/_default/single.html | 43 | ||||
| -rw-r--r-- | layouts/index.html | 2 | ||||
| -rw-r--r-- | layouts/partials/head.html | 54 | ||||
| -rw-r--r-- | layouts/partials/sidebar.html | 31 | ||||
| -rw-r--r-- | static/css/hyde.css | 49 | ||||
| -rw-r--r-- | static/css/poole.css | 4 |
8 files changed, 124 insertions, 85 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 4fada03..ddf0d35 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,9 +1,9 @@ {{ partial "head.html" . }} <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}"> - {{ partial "sidebar.html" . }} - <main class="content container"> - {{ block "main" . -}}{{- end }} - </main> +{{ partial "sidebar.html" . }} + <div class="content container"> +{{ block "main" . -}}{{- end }} + </div> {{ template "_internal/google_analytics_async.html" . }} </body> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 47a6453..5b51eba 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,9 +1,11 @@ -{{ define "main" -}} -<ul class="posts"> -{{ range .Data.Pages -}} - <li> - <span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list" datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span> - </li> -{{- end }} -</ul> +{{ define "main" }} + <h1 class="page-title">{{ .Title }}</h1> + <ul class="posts"> + {{ range .Data.Pages -}} + <li> + <a class="post-title u-url" href="{{ .RelPermalink }}">{{ .Title }}</a> + <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> + </li> + {{ end -}} + </ul> {{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 735bbf7..d5d1774 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,12 +1,35 @@ {{ define "main" -}} -<div class="post"> - <h1>{{ .Title }}</h1> - <time datetime={{ .Date.Format "2006-01-02T15:04:05Z0700" }} class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</time> - {{ .Content }} -</div> - -{{ if .Site.DisqusShortname -}} -<h2>Comments</h2> -{{ template "_internal/disqus.html" . }} -{{- end }} + <article class="post h-entry"> + <header> + <a class="u-url" href="{{ .Permalink | replaceRE "/$" "" }}"> + <h1 class="post-title p-name">{{ .Title }}</h1> + </a> + <time class="post-date dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> + </header> + <main class="post-content e-content"> + {{ .Content }} + </main> + <footer class="footer"> + {{- if .Params.categories }} + <span> + Category: + {{- range .Params.categories }} + <a class="p-category" href="/categories/{{ . | lower | urlize }}/">{{ . }}</a> + {{- end }} + </span> + {{- end }} + {{- if .Params.tags }} + <p> + Tags: + {{- range .Params.tags }} + <a class="p-category" href="/tags/{{ . | urlize }}/">{{ . }}</a> + {{- end }} + </p> + {{- end }} + </footer> + </article> + {{- if .Site.DisqusShortname }} + <h2>Comments</h2> + {{ template "_internal/disqus.html" . }} + {{- end }} {{- end }} diff --git a/layouts/index.html b/layouts/index.html index 6b273ff..f9ddeae 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -5,7 +5,7 @@ <h1 class="post-title"> <a href="{{ .Permalink }}">{{ .Title }}</a> </h1> - <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}" class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</time> + <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> {{ .Summary }} {{ if .Truncated }} <div class="read-more-link"> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 30ff316..d7b936c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,34 +1,26 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"{{with .Site.LanguageCode}} xml:lang="{{.}}" lang="{{.}}"{{end}}> -<head> - <link href="//gmpg.org/xfn/11" rel="profile"> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - {{ hugo.Generator }} +<html lang="en-GB"> + <head> + <link href="//gmpg.org/xfn/11" rel="profile"> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width,initial-scale=1"> - <!-- Enable responsiveness on mobile devices--> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + {{- if .IsHome }} + <title>{{ .Site.Title }}</title> + {{ else }} + <title>{{ .Title }} · {{ .Site.Title }}</title> + {{ end -}} - {{ if .IsHome -}} - <title>{{ .Site.Title }}</title> - {{- else -}} - <title>{{ .Title }} · {{ .Site.Title }}</title> - {{- end }} - - <!-- CSS --> - <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/print.css" media="print"> - <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css"> - <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/syntax.css"> - <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css"> - {{ partial "head_fonts.html" . }} - - <!-- Icons --> - <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png"> - <link rel="shortcut icon" href="/favicon.png"> - - <!-- RSS etc --> - {{ range .AlternativeOutputFormats -}} - {{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }} - {{ end -}} - - {{ partial "hook_head_end.html" . }} -</head> + <link rel="stylesheet" href="/css/print.css" media="print"> + <link rel="stylesheet" href="/css/poole.css"> + {{- if .IsPage }} + <link rel="stylesheet" href="/css/syntax.css"> + {{ else }} + <link rel="prefetch" href="/css/syntax.css"> + {{- end }} + <link rel="stylesheet" href="/css/hyde.css"> + {{ range .AlternativeOutputFormats -}} + {{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }} + {{ end -}} + {{ partial "hook_head_end.html" . }} + </head> diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 162fcad..c8fa089 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,11 +1,21 @@ -<aside class="sidebar"> - <div class="container sidebar-sticky"> - <div class="sidebar-about"> - <a href="{{ .Site.BaseURL }}"><h1>{{ .Site.Title }}</h1></a> - <p class="lead"> - {{ with .Site.Params.description }} {{.}} {{ else }}An elegant open source and mobile first theme for <a href="http://hugo.spf13.com">hugo</a> made by <a href="http://twitter.com/mdo">@mdo</a>. Originally made for Jekyll.{{end}} + <aside class="sidebar container"> + <header class="sidebar-about h-card vcard p-author"> + {{ if (isset .Site.Author "image") -}} + <a class="u-url u-uid" rel="me" href="{{ .Site.BaseURL }}"> + <img class="u-photo" src="{{ .Site.Author.image }}" width=128 height=128 /> + </a> + {{ end -}} + + {{ if eq .Title .Site.Title -}} + <h1 class="site-title u-name fn">{{ .Site.Title }}</h1> + {{ else -}} + <span class="site-title u-name fn">{{ .Site.Title }}</span> + {{ end -}} + + <p class="lead p-note"> + {{ with .Site.Params.Description }} {{.}} {{ else }}An elegant open source and mobile first theme for <a href="http://hugo.spf13.com">hugo</a> made by <a href="http://twitter.com/mdo">@mdo</a>. Originally made for Jekyll.{{end}} </p> - </div> + </header> <nav> <ul class="sidebar-nav"> @@ -16,6 +26,7 @@ </ul> </nav> - <p>{{ with .Site.Params.copyright }}{{.}}{{ else }}© {{ now.Format "2006"}}. All rights reserved. {{end}}</p> - </div> -</aside> + <footer> + Licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>. + </footer> + </aside> diff --git a/static/css/hyde.css b/static/css/hyde.css index 1ddbdda..0816c69 100644 --- a/static/css/hyde.css +++ b/static/css/hyde.css @@ -32,7 +32,7 @@ */ html { - font-family: "PT Sans", Helvetica, Arial, sans-serif; + font-family: "PT Sans", "Ubuntu Sans", "Liberation Sans", "Lucida Grande", "Helvetica Neue", Arial, sans-serif; } @media (min-width: 48em) { html { @@ -45,6 +45,10 @@ html { } } +code,pre { + font-family: "SFMono-Regular", "Lucida Console", "Liberation Mono", Menlo, Courier, monospace; +} + /* * Sidebar @@ -55,7 +59,7 @@ html { .sidebar { text-align: center; - padding: 2rem 1rem; + padding: 2rem 2rem; color: rgba(255,255,255,.5); background-color: #202020; } @@ -76,11 +80,22 @@ html { } /* About section */ -.sidebar-about h1 { +.site-title { color: #fff; margin-top: 0; - font-family: "Abril Fatface", serif; - font-size: 3.25rem; + font-family: Georgia, serif; + font-size: 2.5rem; + font-weight: bold; + line-height: 1.25; + margin-bottom: 0.5rem; + display: block; +} + +.u-photo { + margin: auto; + margin-bottom: 1rem; + border: 2px solid white; + border-radius: 50%; } /* Sidebar nav */ @@ -181,8 +196,7 @@ a.sidebar-nav-item:focus { .theme-base-08 .sidebar { background-color: #ac4142; } -.theme-base-08 .content a, -.theme-base-08 .related-posts li a:hover { +.theme-base-08 .content a { color: #ac4142; } @@ -190,8 +204,7 @@ a.sidebar-nav-item:focus { .theme-base-09 .sidebar { background-color: #d28445; } -.theme-base-09 .content a, -.theme-base-09 .related-posts li a:hover { +.theme-base-09 .content a { color: #d28445; } @@ -199,8 +212,7 @@ a.sidebar-nav-item:focus { .theme-base-0a .sidebar { background-color: #f4bf75; } -.theme-base-0a .content a, -.theme-base-0a .related-posts li a:hover { +.theme-base-0a .content a { color: #f4bf75; } @@ -208,8 +220,7 @@ a.sidebar-nav-item:focus { .theme-base-0b .sidebar { background-color: #90a959; } -.theme-base-0b .content a, -.theme-base-0b .related-posts li a:hover { +.theme-base-0b .content a { color: #90a959; } @@ -217,8 +228,7 @@ a.sidebar-nav-item:focus { .theme-base-0c .sidebar { background-color: #75b5aa; } -.theme-base-0c .content a, -.theme-base-0c .related-posts li a:hover { +.theme-base-0c .content a { color: #75b5aa; } @@ -226,8 +236,7 @@ a.sidebar-nav-item:focus { .theme-base-0d .sidebar { background-color: #6a9fb5; } -.theme-base-0d .content a, -.theme-base-0d .related-posts li a:hover { +.theme-base-0d .content a { color: #6a9fb5; } @@ -235,8 +244,7 @@ a.sidebar-nav-item:focus { .theme-base-0e .sidebar { background-color: #aa759f; } -.theme-base-0e .content a, -.theme-base-0e .related-posts li a:hover { +.theme-base-0e .content a { color: #aa759f; } @@ -244,7 +252,6 @@ a.sidebar-nav-item:focus { .theme-base-0f .sidebar { background-color: #8f5536; } -.theme-base-0f .content a, -.theme-base-0f .related-posts li a:hover { +.theme-base-0f .content a { color: #8f5536; } diff --git a/static/css/poole.css b/static/css/poole.css index 7ddd054..ebf1fd3 100644 --- a/static/css/poole.css +++ b/static/css/poole.css @@ -41,6 +41,10 @@ box-sizing: border-box; } +main { + display: block; +} + html, body { margin: 0; |