diff options
Diffstat (limited to 'themes/default/layouts')
| -rw-r--r-- | themes/default/layouts/partials/csp.html | 8 | ||||
| -rw-r--r-- | themes/default/layouts/partials/head.html | 17 |
2 files changed, 18 insertions, 7 deletions
diff --git a/themes/default/layouts/partials/csp.html b/themes/default/layouts/partials/csp.html index 62489ec..d148498 100644 --- a/themes/default/layouts/partials/csp.html +++ b/themes/default/layouts/partials/csp.html @@ -1,8 +1,8 @@ -{{ $upgrade := "" }} +{{- $upgrade := "" -}} -{{ if .Site.Params.production }} - {{ $upgrade = "upgrade-insecure-requests" }} -{{ end }} +{{- if .Site.Params.csp.upgrade -}} + {{ $upgrade = "upgrade-insecure-requests;" }} +{{- end -}} <base href="{{ .Site.BaseURL }}"> <meta name="referrer" content="{{ .Site.Params.csp.referrer }}"> diff --git a/themes/default/layouts/partials/head.html b/themes/default/layouts/partials/head.html index e45b5d6..fd04ed0 100644 --- a/themes/default/layouts/partials/head.html +++ b/themes/default/layouts/partials/head.html @@ -35,13 +35,24 @@ <!-- Content Security Policy --> {{- partial "csp.html" . -}} -<!-- Style Sheets --> +<!-- Style Sheets & Scripts --> +{{- if .Site.Params.production -}} + +{{- $default := resources.Get "css/default.css" -}} +{{- $syntax := resources.Get "css/syntax-highlight-default.css" -}} +{{ $css := slice $default $syntax | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }} +<link rel="stylesheet" href="{{ $css.Permalink }}"> +{{ $js := resources.Get "js/index.js" | resources.Minify | fingerprint }} +<script src="{{ $js.Permalink }}"></script> + +{{ else }} + <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/default.css"> <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/syntax-highlight-default.css"> - -<!-- Scripts --> <script src="{{ .Site.BaseURL }}/js/index.js"></script> +{{- end -}} + <!-- No Scripts --> <noscript> <style> |