Merge branch 'master' into 2021-10-19_meta-description
This commit is contained in:
commit
4001d5e92f
@ -4,7 +4,7 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<meta name="referrer" content="no-referrer-when-downgrade">
|
<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 -}}">
|
<meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}">
|
||||||
|
|
||||||
{{ with .OutputFormats.Get "rss" -}}
|
{{ with .OutputFormats.Get "rss" -}}
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
|
|
||||||
{{ if not .Site.Params.disableSummary }}
|
{{ if not .Site.Params.disableSummary }}
|
||||||
<div class="content post-summary p-summary">
|
<div class="content post-summary p-summary">
|
||||||
{{ if isset .Params "description" }}
|
{{ .Summary | safeHTML }}
|
||||||
{{ .Description | safeHTML }}
|
|
||||||
{{ else }}
|
|
||||||
{{ .Summary | safeHTML }}…
|
|
||||||
{{ end }}
|
|
||||||
</div>
|
</div>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ if and (.Truncated) (.Site.Params.readMore) }}
|
{{ if and (.Truncated) (.Site.Params.readMore) }}
|
||||||
|
1
layouts/partials/title.html
Normal file
1
layouts/partials/title.html
Normal file
@ -0,0 +1 @@
|
|||||||
|
<title>{{ if and (.Title) (not .IsHome) }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title>
|
Loading…
Reference in New Issue
Block a user