Merge remote-tracking branch 'alanpearce/master'

6 files changed, 26 insertions, 7 deletions

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9bbcb38..b3b1c25 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,7 +5,7 @@
 			<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>
+					<a class="post-title u-url" itemprop="url" href="{{ .Permalink | replaceRE "/$" "" }}"><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 }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 034cb26..26df731 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -3,7 +3,9 @@
 		<main class="content container" role="main">
 			<article class="post">
 				<header>
-					<h1 class="post-title p-name" itemprop="name">{{ .Title }}</h1>
+					<a class="u-url" href="{{ .Permalink | replaceRE "/$" "" }}">
+						<h1 class="post-title p-name" itemprop="name">{{ .Title }}</h1>
+					</a>
 					<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">
diff --git a/layouts/index.html b/layouts/index.html
index 510c2e6..6e16765 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -6,7 +6,7 @@
 				<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>
+						<a class="post-title" itemprop="url" href="{{ .RelPermalink | replaceRE "/$" "" }}"><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 }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 4c79ead..59304c2 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -14,5 +14,5 @@
 		<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">
+		<link href="{{ if .IsPage }}{{ .Permalink | replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
 	</head>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 5b23f00..d4f8e2d 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,12 +1,18 @@
 		<aside class="sidebar container">
 			<header class="sidebar-about h-card vcard p-author" itemprop="author" itemscope itemtype="http://schema.org/Person">
+				{{ if (isset .Site.Author "image") }}
+				<a class="u-url u-uid" 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" itemprop="name">{{ .Site.Title }}</h1>
 				{{ else }}
 				<span class="site-title u-name fn" itemprop="name">{{ .Site.Title }}</span>
 				{{ end }}
 
-				<p class="lead">
+				<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>
 
diff --git a/static/css/hyde.css b/static/css/hyde.css
index 97bbcb7..cad1095 100644
--- a/static/css/hyde.css
+++ b/static/css/hyde.css
@@ -32,7 +32,7 @@
  */
 
 html {
-  font-family: "PT Sans", "Ubuntu Sans", "Liberation Sans", "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Tahoma, 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
@@ -80,13 +84,20 @@ html {
   color: #fff;
   margin-top: 0;
   font-family: Georgia, serif;
-  font-size: 3.25rem;
+  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%;
+}
+
 .contact-head {
   color: #fff;
   margin-bottom: 0;