diff options
author | Maksim Iakunin <yakuninm+github@gmail.com> | 2021-10-20 16:43:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-20 16:43:34 +0300 |
commit | 4001d5e92fb79876021cb8f354a086f850ed63a4 (patch) | |
tree | ba92eb845d19217cfcd9bbbd035b4341d698f935 | |
parent | 30ca3e0a083ed63832257cf219dc1facc87b0e42 (diff) | |
parent | 04b2081f6e67f56dc6fb447b0c6de5f4c52fde75 (diff) |
Merge branch 'master' into 2021-10-19_meta-description
-rw-r--r-- | layouts/partials/head.html | 2 | ||||
-rw-r--r-- | layouts/partials/post-summary.html | 6 | ||||
-rw-r--r-- | layouts/partials/title.html | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/layouts/partials/head.html b/layouts/partials/head.html index cbeb1d9..abfb06c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -4,7 +4,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="referrer" content="no-referrer-when-downgrade"> -<title>{{ if and (.Title) (not .IsHome) }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title> +{{ partial "title.html" }} <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}"> {{ with .OutputFormats.Get "rss" -}} diff --git a/layouts/partials/post-summary.html b/layouts/partials/post-summary.html index 12dd4c9..7961f62 100644 --- a/layouts/partials/post-summary.html +++ b/layouts/partials/post-summary.html @@ -6,11 +6,7 @@ {{ if not .Site.Params.disableSummary }} <div class="content post-summary p-summary"> - {{ if isset .Params "description" }} - {{ .Description | safeHTML }} - {{ else }} - {{ .Summary | safeHTML }}… - {{ end }} + {{ .Summary | safeHTML }} </div> {{ end }} {{ if and (.Truncated) (.Site.Params.readMore) }} diff --git a/layouts/partials/title.html b/layouts/partials/title.html new file mode 100644 index 0000000..648d9df --- /dev/null +++ b/layouts/partials/title.html @@ -0,0 +1 @@ +<title>{{ if and (.Title) (not .IsHome) }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title> |