Merge branch 'master' into exclude-google-analytics-when-running-under-hugo-local-server

This commit is contained in:
kimcc
2020-04-15 17:20:22 -05:00
committed by GitHub
11 changed files with 326 additions and 254 deletions

View File

@@ -8,5 +8,5 @@
</div>
{{ $script := resources.Get "js/main.js" | minify | fingerprint -}}
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}></script>
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
</footer>

View File

@@ -5,5 +5,5 @@
<p><a href="https://gohugo.io" target="_blank" rel="noopener">Built with Hugo</a></p>
{{ $script := resources.Get "js/main.js" | minify | fingerprint -}}
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}></script>
<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
</footer>

View File

@@ -29,7 +29,6 @@
{{ with .OutputFormats.Get "RSS" }}
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
{{ end }}
{{- if not .Site.IsServer -}}
{{ template "_internal/google_analytics.html" . }}
{{- end -}}

View File

@@ -1,6 +1,6 @@
{{ if or .Page.Params.math .Site.Params.math }}
<!-- KaTeX -->
<link rel="stylesheet" type="text/css" href="{{ "css/katex.min.css" | relURL }}">
<script type="text/javascript" src="{{ "js/katex.min.js" | relURL }}"></script>
<script type="text/javascript" src="{{ "js/auto-render.min.js" | relURL }}"onload="renderMathInElement(document.body);"></script>
<link rel="stylesheet" type="text/css" href="{{ "css/katex.min.css" | relURL }}" crossorigin="anonymous">
<script type="text/javascript" src="{{ "js/katex.min.js" | relURL }}" crossorigin="anonymous"></script>
<script type="text/javascript" src="{{ "js/auto-render.min.js" | relURL }}"onload="renderMathInElement(document.body);" crossorigin="anonymous"></script>
{{ end }}