From a544ec9a40a58db23d748c5768b2da992dfcdf26 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Sat, 2 May 2020 09:33:38 +0200
Subject: [PATCH] Fix meta description and make theme more mobile friendly

---
 assets/css/style.scss              | 23 ++++++++++++++++++++
 layouts/_default/baseof.html       |  2 +-
 layouts/_default/single.html       |  7 +-----
 layouts/_default/summary.html      |  2 +-
 layouts/partials/list_meta.html    |  5 -----
 layouts/partials/post_actions.html | 13 ++++++++++++
 layouts/partials/post_meta.html    |  5 -----
 layouts/partials/summary_meta.html | 34 ++++++++++++++++++++++++++++++
 8 files changed, 73 insertions(+), 18 deletions(-)
 create mode 100644 layouts/partials/post_actions.html
 create mode 100644 layouts/partials/summary_meta.html

diff --git a/assets/css/style.scss b/assets/css/style.scss
index 597f494..01e5a9d 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -581,6 +581,29 @@ select {
 	}
 }
 
+.actions {
+	@extend .clearfix;
+	margin-top: 15px;
+	margin-bottom: 15px;
+	font-size: .75rem;
+	line-height: 1;
+	@include color(color, contrast-text);
+	.action-item {
+		float: left;
+		margin: 0 6px 6px 0;
+		text-transform: uppercase;
+		@include color(background, contrast-background);
+		&:hover {
+			@include color(background, main-color);
+		}
+		.action-link {
+			@extend .btn;
+			display: block;
+			padding: 10px 15px;
+		}
+	}
+}
+
 @mixin subarticle-element {
 	padding-top: 10px;
 	padding-bottom: 10px;
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6573cc6..27beece 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,7 +6,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<title>{{ block "title" . }}{{ if not .IsHome }}{{ with .Title }}{{ . }} - {{end}}{{ end }}{{ .Site.Title }}{{ end }}</title>
 	<meta name="theme-color" content="{{ .Param "colors.main" | default "#0275D8" }}">
-	<meta name="description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{else}}{{ .Params.Description }}{{end}}">
+	<meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
 	{{ template "_internal/opengraph.html" . }}
 	{{ template "_internal/schema.html" . }}
 	{{ template "_internal/twitter_cards.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 145ca71..3083c70 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,13 +8,8 @@
 			{{ if not .Params.nometa }}
 			<div class="post-meta">
 				{{ partial "post_meta" . }}
-				{{ if (.Param "speak") }}
-				<div id="speakBtn" class="item" style="display: none;"></div>
-				{{ $speakScript := resources.Get "js/speak.js" | minify | fingerprint }}
-				<script>const speakText = "{{ T "speak" }}";const stopSpeakText = "{{ T "stopspeak" }}";</script>
-				<script defer src="{{ $speakScript.RelPermalink }}" integrity="{{ $speakScript.Data.Integrity }}"></script>
-				{{ end }}
 			</div>
+			{{ partial "post_actions" . }}
 			{{ end }}
 		</header>
 		{{ partial "oldcontentwarning" . }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 4150aa0..7bb6818 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -13,7 +13,7 @@
 		{{ end }}
 		{{ end }}
 		{{ if not .Params.nometa }}
-		{{ with partialCached "post_meta" . .RelPermalink }}
+		{{ with partialCached "summary_meta" . .RelPermalink }}
 		<div class="list-meta">{{ . }}</div>
 		{{ end }}
 		{{ end }}
diff --git a/layouts/partials/list_meta.html b/layouts/partials/list_meta.html
index 705ca50..d7e4a46 100644
--- a/layouts/partials/list_meta.html
+++ b/layouts/partials/list_meta.html
@@ -1,8 +1,3 @@
-{{ if .Param "shareLink" }}
-<div class="item">
-	<a href="https://www.addtoany.com/share#url={{ .Permalink }}{{ with .Title }}&title={{ . }}{{ end }}" target="_blank" rel="nofollow noopener noreferrer">{{ T "share" }}</a>
-</div>
-{{ end }}
 {{ if .IsTranslated }}
 <div class="item">
 	{{ i18n "translations" }}: {{ $delimiter := "" }}{{ range .Translations }}{{ $delimiter }}<a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>{{ $delimiter = ", " }}{{ end }}
diff --git a/layouts/partials/post_actions.html b/layouts/partials/post_actions.html
new file mode 100644
index 0000000..0137475
--- /dev/null
+++ b/layouts/partials/post_actions.html
@@ -0,0 +1,13 @@
+{{ if or (.Param "shareLink") (.Param "speak") }}
+<div class="actions">
+	{{ if (.Param "shareLink") }}
+	<div class="action-item"><a class="action-link" href="https://www.addtoany.com/share#url={{ .Permalink }}{{ with .Title }}&title={{ . }}{{ end }}" target="_blank" rel="nofollow noopener noreferrer">{{ T "share" }}</a></div>
+	{{ end }}
+	{{ if (.Param "speak") }}
+	<div class="action-item"><div id="speakBtn" class="action-link" style="display: none;"></div></div>
+	{{ $speakScript := resources.Get "js/speak.js" | minify | fingerprint }}
+	<script>const speakText = "{{ T "speak" }}";const stopSpeakText = "{{ T "stopspeak" }}";</script>
+	<script defer src="{{ $speakScript.RelPermalink }}" integrity="{{ $speakScript.Data.Integrity }}"></script>
+	{{ end }}
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post_meta.html b/layouts/partials/post_meta.html
index 97469c0..8b9aaaa 100644
--- a/layouts/partials/post_meta.html
+++ b/layouts/partials/post_meta.html
@@ -27,11 +27,6 @@
 </div>
 {{ end }}
 {{ end }}
-{{ if .Param "shareLink" }}
-<div class="item">
-	<a href="https://www.addtoany.com/share#url={{ .Permalink }}{{ with .Title }}&title={{ . }}{{ end }}" target="_blank" rel="nofollow noopener noreferrer">{{ T "share" }}</a>
-</div>
-{{ end }}
 {{ with .Param "syndicate" }}
 <div class="item">
 	{{ T "also_on" }}:{{ $delimiter := "" }}{{ range $index, $link := . }}{{ $delimiter }} <a class="u-syndication" href="{{ $link }}" target="_blank" rel="nofollow noopener noreferrer">{{ (urls.Parse $link).Host }}</a>{{ $delimiter = "," }}{{ end }}
diff --git a/layouts/partials/summary_meta.html b/layouts/partials/summary_meta.html
new file mode 100644
index 0000000..4f49a95
--- /dev/null
+++ b/layouts/partials/summary_meta.html
@@ -0,0 +1,34 @@
+{{ if not (eq .FirstSection.RelPermalink .RelPermalink) }}
+<div class="item">
+	<a href="{{ .FirstSection.RelPermalink }}">{{ .FirstSection.Title }}</a>
+</div>
+{{ end }}
+{{ if not .Date.IsZero }}
+<div class="item">
+	<time class="dt-published" datetime="{{.Date.Format "2006-01-02T15:04:05Z07:00"}}">{{.Date.Format ( .Site.Params.dateformat | default "January 02, 2006")}}</time>
+</div>
+{{ end }}
+{{ if ne .Date .Lastmod }}
+<div class="item">
+	<time class="dt-updated" datetime="{{.Lastmod.Format "2006-01-02T15:04:05Z07:00"}}">{{ T "meta_lastmod" }}: {{.Lastmod.Format ( .Site.Params.dateformat | default "January 02, 2006")}}</time>
+</div>
+{{ end }}
+{{ with .Param "indieweb.reply" }}
+{{ if .link }}
+<div class="item">
+	{{ T "meta_reply_to" }}: <a class="u-in-reply-to" href="{{ .link }}" target="_blank" rel="noopener">{{ .title | default .link }}</a>
+</div>
+{{ end }}
+{{ end }}
+{{ with .Param "indieweb.like" }}
+{{ if .link }}
+<div class="item">
+	{{ T "meta_like_of" }}: <a class="u-like-of" href="{{ .link }}" target="_blank" rel="noopener">{{ .title | default .link }}</a>
+</div>
+{{ end }}
+{{ end }}
+{{ if .IsTranslated }}
+<div class="item">
+	{{ i18n "translations" }}: {{ $delimiter := "" }}{{ range .Translations }}{{ $delimiter }}<a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>{{ $delimiter = ", " }}{{ end }}
+</div>
+{{ end }}
\ No newline at end of file