Skip to content

Commit

Permalink
Merge pull request #732 from miterion/master
Browse files Browse the repository at this point in the history
Remove relLangURL from script and favicon links
  • Loading branch information
stp-ip authored Apr 8, 2020
2 parents 33618f0 + c34b986 commit 2a95b5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@

{{- with .Site.Params.custom -}}
{{- with .favicon }}
<link rel="shortcut icon" type="image/x-icon" href="{{ . | relLangURL }}">
<link rel="icon" {{ with $.Site.Params.custom.favicon_ico_sizes }}sizes="{{ . }}"{{ end }} type="image/x-icon" href="{{ . | relLangURL }}">
<link rel="shortcut icon" type="image/x-icon" href="{{ . }}">
<link rel="icon" {{ with $.Site.Params.custom.favicon_ico_sizes }}sizes="{{ . }}"{{ end }} type="image/x-icon" href="{{ . | relURL }}">
{{- end }}

{{- with .favicon_png }}
<link rel="icon" href="{{ . | relLangURL }}">
<link rel="apple-touch-icon-precomposed" href="{{ . | relLangURL }}">
<link rel="icon" href="{{ . | relURL }}">
<link rel="apple-touch-icon-precomposed" href="{{ . | relURL }}">
{{- end }}

{{- with .favicon_svg }}
<link rel="icon" type="image/svg+xml" href="{{ . | relLangURL }}">
<link rel="icon" type="image/svg+xml" href="{{ . | relURL }}">
{{- end -}}

{{ if and (not .favicon) (not .favicon_png) (not .favicon_svg) }}
Expand All @@ -84,7 +84,7 @@
</script>
{{- $script_template := resources.Get "scripts/syna-head.js" -}}
{{- $script := $script_template | resources.Minify | resources.Fingerprint }}
<script {{- safeHTMLAttr (printf " src=\"%s\"" ($script.RelPermalink | relLangURL)) -}}></script>
<script {{- safeHTMLAttr (printf " src=\"%s\"" ($script.RelPermalink)) -}}></script>

{{- range (.Scratch.Get "page_config") -}}
{{- range .Params.config -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/js.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{{- if (.defer | default true) -}}
{{- safeHTMLAttr (print " defer") -}}
{{- end -}}
{{- safeHTMLAttr (printf " src=\"%s\"" ($script.RelPermalink | relLangURL)) -}}></script>
{{- safeHTMLAttr (printf " src=\"%s\"" ($script.RelPermalink)) -}}></script>
{{- else if .script -}}
{{ .script | safeHTML }}
{{- end -}}
Expand Down

0 comments on commit 2a95b5d

Please sign in to comment.