From 9493e3d4230e390eb3842852a2ff7a3c73a48782 Mon Sep 17 00:00:00 2001 From: xiao201261 <6511667+xiao201261@users.noreply.github.com> Date: Sun, 26 Apr 2020 15:17:20 +0800 Subject: fix multi head error --- layouts/_default/baseof.html | 2 - layouts/partials/head.html | 140 +++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 74 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8088892..fe4fc67 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,8 +1,6 @@ - - {{- block "title" . -}} {{ if .IsPage }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 88261db..0b7b4b2 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,77 +1,73 @@ -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <meta name="viewport" - content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui"> - <meta name="renderer" content="webkit"> - <meta http-equiv="Cache-Control" content="no-transform" /> - <meta http-equiv="Cache-Control" content="no-siteapp" /> - <meta name="apple-mobile-web-app-capable" content="yes"> - <meta name="apple-mobile-web-app-status-bar-style" content="black"> - <meta name="format-detection" content="telephone=no,email=no,adress=no"> - <!-- Color theme for statusbar --> - <meta name="theme-color" content="#000000" /> - <!-- 强制页面在当前窗口以独立页面显示,防止别人在框架里调用页面 --> - <meta http-equiv="window-target" content="_top" /> - <!-- baidu & google verification --> - {{ with .Site.Params.baiduVerification }} - <meta name="baidu-site-verification" content="{{.}}" />{{ end }} - {{ with .Site.Params.googleVerification }} - <meta name="google-site-verification" content="{{.}}" />{{ end }} - {{- if .Keywords -}} - {{ $length := len .Keywords | add -1 -}} - <meta name="keywords" - content="{{ range $index, $element := .Keywords }}{{ $element | safeHTML }}{{if ne $index $length }}, {{ end }}{{ end }}" /> - {{- else if .Site.Params.keywords -}} - {{ $length := len .Site.Params.keywords | add -1 -}} - <meta name="keywords" - content="{{ range $index, $element := .Site.Params.keywords }}{{ $element | safeHTML }}{{if ne $index $length }}, {{ end }}{{ end }}" /> - {{- end }} + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" + content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui"> + <meta name="renderer" content="webkit"> + <meta http-equiv="Cache-Control" content="no-transform" /> + <meta http-equiv="Cache-Control" content="no-siteapp" /> + <meta name="apple-mobile-web-app-capable" content="yes"> + <meta name="apple-mobile-web-app-status-bar-style" content="black"> + <meta name="format-detection" content="telephone=no,email=no,adress=no"> + <!-- Color theme for statusbar --> + <meta name="theme-color" content="#000000" /> + <!-- 强制页面在当前窗口以独立页面显示,防止别人在框架里调用页面 --> + <meta http-equiv="window-target" content="_top" /> + <!-- baidu & google verification --> + {{ with .Site.Params.baiduVerification }} + <meta name="baidu-site-verification" content="{{.}}" />{{ end }} + {{ with .Site.Params.googleVerification }} + <meta name="google-site-verification" content="{{.}}" />{{ end }} + {{- if .Keywords -}} + {{ $length := len .Keywords | add -1 -}} + <meta name="keywords" + content="{{ range $index, $element := .Keywords }}{{ $element | safeHTML }}{{if ne $index $length }}, {{ end }}{{ end }}" /> + {{- else if .Site.Params.keywords -}} + {{ $length := len .Site.Params.keywords | add -1 -}} + <meta name="keywords" + content="{{ range $index, $element := .Site.Params.keywords }}{{ $element | safeHTML }}{{if ne $index $length }}, {{ end }}{{ end }}" /> + {{- end }} - {{- if .Description -}} - <meta name="description" content="{{ .Description | safeHTML }}" /> - {{- else if .IsPage -}} - <meta name="description" content="{{ .Summary | plainify }}" /> - {{- else if .Site.Params.description -}} - <meta name="description" content="{{ .Site.Params.description | safeHTML }}" /> - {{- end -}} - - - - <!-- Site Generator --> - <meta name="generator" content="Hugo {{ .Site.Hugo.Version }} with theme pure" /> - <title> - {{- block "title" . -}} - {{ if .IsPage }}{{ .Title }} - {{ .Site.Title }}{{ else }}{{ .Site.Title }}{{ end }} + {{- if .Description -}} + <meta name="description" content="{{ .Description | safeHTML }}" /> + {{- else if .IsPage -}} + <meta name="description" content="{{ .Summary | plainify }}" /> + {{- else if .Site.Params.description -}} + <meta name="description" content="{{ .Site.Params.description | safeHTML }}" /> {{- end -}} - - - {{ range .AlternativeOutputFormats -}} - {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} - {{ end -}} - {{ $css := resources.Get "css/style.css" | minify | fingerprint}} - - {{ with .Site.Params.customCSS }} - {{ end }} - - {{- if eq .Site.Params.comment.type "gitalk"}} - - {{- end }} - - {{/* NOTE: These Hugo Internal Templates can be found starting at https://github.com/spf13/hugo/blob/master/tpl/tplimpl/template_embedded.go#L158 */}} - {{- template "_internal/opengraph.html" . -}} - {{- template "_internal/google_news.html" . -}} - {{- template "_internal/schema.html" . -}} - {{- template "_internal/twitter_cards.html" . -}} - - {{ `` | safeHTML }} - {{ `` | safeHTML }} + + + + {{- block "title" . -}} + {{ if .IsPage }}{{ .Title }} - {{ .Site.Title }}{{ else }}{{ .Site.Title }}{{ end }} + {{- end -}} + + + {{ range .AlternativeOutputFormats -}} + {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} + {{ end -}} + {{ $css := resources.Get "css/style.css" | minify | fingerprint}} + + {{ with .Site.Params.customCSS }} + {{ end }} + + {{- if eq .Site.Params.comment.type "gitalk"}} + + {{- end }} + + {{/* NOTE: These Hugo Internal Templates can be found starting at https://github.com/spf13/hugo/blob/master/tpl/tplimpl/template_embedded.go#L158 */}} + {{- template "_internal/opengraph.html" . -}} + {{- template "_internal/google_news.html" . -}} + {{- template "_internal/schema.html" . -}} + {{- template "_internal/twitter_cards.html" . -}} + + + {{ `` | safeHTML }} - \ No newline at end of file + {{ `` | safeHTML }} \ No newline at end of file -- cgit v1.2.3