diff options
-rw-r--r-- | layouts/_default/list.html | 26 | ||||
-rw-r--r-- | layouts/_default/single.html | 52 | ||||
-rw-r--r-- | layouts/index.html | 38 | ||||
-rw-r--r-- | layouts/partials/head.html | 41 | ||||
-rw-r--r-- | layouts/partials/sidebar.html | 55 | ||||
-rw-r--r-- | static/css/hyde.css | 43 | ||||
-rw-r--r-- | static/css/poole.css | 4 |
7 files changed, 142 insertions, 117 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 7659d47..9bbcb38 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,16 +1,16 @@ {{ partial "head.html" . }} -<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}"> - + <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}" itemscope itemtype="http://schema.org/Blog"> + <main class="content container" role="main"> + <h1 class="page-title">{{ .Title }}</h1> + <ul class="posts"> + {{ range .Data.Pages }} + <li itemscope itemtype="http://schema.org/BlogPosting"> + <a class="post-title" itemprop="url" href="{{ .RelPermalink }}"><span itemprop="name">{{ .Title }}<span></a> + <time class="post-date" itemprop="datePublished" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> + </li> + {{ end }} + </ul> + </main> {{ partial "sidebar.html" . }} - - <div class="content container"> - <ul class="posts"> - {{ range .Data.Pages }} - <li> - <span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span> - </li> - {{ end }} - </ul> - </div> -</body> + </body> </html> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 96c9f94..034cb26 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,19 +1,37 @@ - {{ partial "head.html" . }} - <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}"> - {{ partial "sidebar.html" . }} +{{ partial "head.html" . }} + <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}} h-entry" itemscope itemtype="http://schema.org/BlogPosting"> + <main class="content container" role="main"> + <article class="post"> + <header> + <h1 class="post-title p-name" itemprop="name">{{ .Title }}</h1> + <time class="post-date dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}" itemprop="datePublished">{{ .Date.Format "Monday, 2 January 2006" }}</time> + </header> + <main class="post-content e-content" itemprop="articleBody"> + {{ .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 }} + <span itemprop="keywords"> + <a class="p-category" href="/tags/{{ . | urlize }}/">{{ . }}</a> + </span> + {{ end }} - <div class="content container"> - <div class="post"> - <h1>{{ .Title }}</h1> - <span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span> - {{ .Content }} - </div> - - {{ if and (isset .Site.Params "disqusShortname") (ne .Site.Params.disqusShortname "") }} - <h2>Comments</h2> - {{ partial "disqus" . }} - {{ end }} - </div> - - </body> + </p> + {{ end }} + </footer> + </article> + </main> +{{ partial "sidebar.html" . }} + </body> </html> diff --git a/layouts/index.html b/layouts/index.html index 36f3ac2..510c2e6 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,26 +1,18 @@ {{ partial "head.html" . }} -<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}"> - + <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}" itemscope itemtype="http://schema.org/Blog"> + <main class="content container" role="main"> + <section class="recent"> + <h2>Recent Posts</h2> + <ul class="posts"> + {{ range first 10 .Data.Pages }} + <li itemscope itemtype="http://schema.org/BlogPosting"> + <a class="post-title" itemprop="url" href="{{ .RelPermalink }}"><span itemprop="name">{{ .Title }}</span></a> + <time class="post-date" itemprop="datePublished" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time> + </li> + {{ end }} + </ul> + </section> + </main> {{ partial "sidebar.html" . }} - - <div class="content container"> -<div class="posts"> - - {{ range .Data.Pages }} - <div class="post"> - <h1 class="post-title"> - <a href="{{ .Permalink }}"> - {{ .Title }} - </a> - </h1> - - <span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span> - - {{ .Content }} - </div> - {{ end }} -</div> -</div> - - </body> + </body> </html> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 110c99e..4c79ead 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,29 +1,18 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"{{with .Site.LanguageCode}} xml:lang="{{.}}" lang="{{.}}"{{end}}> -<head> - <link href="http://gmpg.org/xfn/11" rel="profile"> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - {{ .Hugo.Generator }} +<html lang="en-GB"> + <head> + <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, maximum-scale=1"> + {{ 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 rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/syntax.css"> - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css"> - <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700|Abril+Fatface"> - - <!-- Icons --> - <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png"> - <link rel="shortcut icon" href="/favicon.png"> - - <!-- RSS --> - <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> -</head> + <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="{{ .Permalink }}" rel="canonical"> + </head> diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 48fec6a..5b23f00 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,19 +1,40 @@ -<div 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}} - </p> - </div> + <aside class="sidebar container"> + <header class="sidebar-about h-card vcard p-author" itemprop="author" itemscope itemtype="http://schema.org/Person"> + {{ if eq .Title .Site.Title }} + <h1 class="site-title u-name fn" itemprop="name">{{ .Site.Title }}</h1> + {{ else }} + <span class="site-title u-name fn" itemprop="name">{{ .Site.Title }}</span> + {{ end }} - <ul class="sidebar-nav"> - <li><a href="/">Home</a> </li> - {{ range .Site.Menus.main }} - <li><a href="{{.URL}}"> {{ .Name }} </a></li> - {{end}} - </ul> + <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}} + </p> - <p>{{ with .Site.Params.copyright }}{{.}}{{ else }}© {{ now.Format "2006"}}. All rights reserved. {{end}}</p> - </div> -</div> + <nav> + <ul class="sidebar-nav"> + {{ range .Site.Menus.main }} + <li><a href="{{.URL}}" class="u-url url"{{ if eq .URL "/" }} rel="me" {{ end }}itemprop="url"> {{ .Name }} </a></li> + {{end}} + </ul> + </nav> + + <aside class="contact"> + <h3 class="contact-head">Contact me</h3> + <ul class="contact-list"> + {{ range .Site.Menus.contact }} + <li> + {{ if hasPrefix .URL "mailto:" }} + <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a> + {{ else }} + <a href="{{ .URL }}" itemprop="url" rel="me">{{ .Name }}</a> + {{ end }} + </li> + {{ end }} + </ul> + </aside> + </header> + + <footer> + Licensed under a <a rel="license" itemprop="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..97bbcb7 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", "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Tahoma, sans-serif; } @media (min-width: 48em) { html { @@ -55,7 +55,7 @@ html { .sidebar { text-align: center; - padding: 2rem 1rem; + padding: 2rem 2rem; color: rgba(255,255,255,.5); background-color: #202020; } @@ -76,15 +76,24 @@ html { } /* About section */ -.sidebar-about h1 { +.site-title { color: #fff; margin-top: 0; - font-family: "Abril Fatface", serif; + font-family: Georgia, serif; font-size: 3.25rem; + font-weight: bold; + line-height: 1.25; + margin-bottom: 0.5rem; + display: block; +} + +.contact-head { + color: #fff; + margin-bottom: 0; } /* Sidebar nav */ -.sidebar-nav { +.sidebar-nav, .contact-list { padding-left: 0; list-style: none; } @@ -181,8 +190,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 +198,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 +206,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 +214,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 +222,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 +230,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 +238,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 +246,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; |