de-dent calls to script and style partials in layouts

jputrino · jputrino · commit c76ae70813c3 · 2023-03-22T10:43:27.000-06:00
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -4,35 +4,35 @@
 <head>  
 {{ block "head" . }}
 
-    {{ partial "meta.html" . }}
+{{ partial "meta.html" . }}
 
-    {{ partial "favicon.html" . }}
+{{ partial "favicon.html" . }}
 
-    {{ partial "styles.html" . }}
+{{ partial "styles.html" . }}
 
-    {{ if in .Params.doctypes "devportal" }}
-      {{ partial "devportal/style.html" . }}
-    {{ end }}
+{{ if in .Params.doctypes "devportal" }}
+{{ partial "devportal/style.html" . }}
+{{ end }}
 
-    {{ if fileExists "/layouts/partials/head_custom.html" }}
-      {{ partial "head_custom.html" . }}
-    {{ end }}
+{{ if fileExists "/layouts/partials/head_custom.html" }}
+{{ partial "head_custom.html" . }}
+{{ end }}
 
-    {{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
+{{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
       
-      {{ partial "trustarc.html" . }}
+{{ partial "trustarc.html" . }}
 
-      {{ partial "tealium-profile.html" . }}
+{{ partial "tealium-profile.html" . }}
 
-    {{ end }}
+{{ end }}
 
 {{ end }}
 
 </head>
 
 <body>
   {{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }} 
-    {{ partial "universal-tag.html" . }}
+{{ partial "universal-tag.html" . }}
   {{ end }}
 
   <header>
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
@@ -38,13 +38,10 @@
 {{ end }}
 
 
-{{/* set custom CSP to load styles and scripts with special handling for GTM scripts (requires unsafe-inline) and Dev Portal page(s) (requires 'unsafe-eval') 
-    https://code.jquery.com/ 
-    https://cdn.jsdelivr.net/ 
-    https://static.cloud.coveo.com 
-    https://kit.fontawesome.com/ 
-    https://*.netlify.app 
-    https://gist.github.com
+{{/* set custom CSP to load styles and scripts with special handling for GTM scripts (requires unsafe-inline) and Dev Portal page(s) (requires 'unsafe-eval') */}}
+<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'
+    https://consent.trustarc.com/ https://mktg.tags.f5.com/basic/prod/utag.sync.js https://static.cloud.coveo.com/ https://*.f5.com/
+    https://*.netlify.app https://gist.github.com 
     https://tag.demandbase.com/pscSDsz4.min.js
     https://munchkin.brightfunnel.com/js/build/bf-munchkin.min.js
     https://www.googletagmanager.com/gtm.js
@@ -53,12 +50,8 @@
     https://www.google-analytics.com/plugins/ua/linkid.js
     https://cdn.bizible.com/scripts/bizible.js
     https://cdn.bizible.com/xdc.js
-    https://consent.trustarc.com/
     https://f5networksglobalprod.122.2o7.net/
     https://f5networksnginxdocs.122.2o7.net/
-    https://*.f5.com */}}
-<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'
-    https://consent.trustarc.com/ https://mktg.tags.f5.com/basic/prod/utag.sync.js https://static.cloud.coveo.com/ https://*.f5.com/
     {{ if in .Params.doctypes "devportal" }} 'unsafe-eval' {{end}}; 
     worker-src 'self' blob:">
 {{/* end */}}
