diff options
| author | Alan Pearce | 2017-06-23 13:22:08 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-06-23 13:22:08 +0200 |
| commit | 57a032d9f3665033484471fd1e355e3b3caff641 (patch) | |
| tree | c7b622c9a9ab5ab7ac8d9092543b615d1a6550fd /layouts | |
| parent | 80ecb4689b15c3260d83f57dafb81bd73bd32942 (diff) | |
| parent | 987cab567c5fc9bed00bf11b8693b44d40564e5e (diff) | |
| download | hyde-57a032d9f3665033484471fd1e355e3b3caff641.tar.lz hyde-57a032d9f3665033484471fd1e355e3b3caff641.tar.zst hyde-57a032d9f3665033484471fd1e355e3b3caff641.zip | |
Merge remote-tracking branch 'alanpearce/master'
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/list.html | 2 | ||||
| -rw-r--r-- | layouts/_default/single.html | 4 | ||||
| -rw-r--r-- | layouts/index.html | 2 | ||||
| -rw-r--r-- | layouts/partials/head.html | 2 | ||||
| -rw-r--r-- | layouts/partials/sidebar.html | 8 |
5 files changed, 13 insertions, 5 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> |