diff --git a/config/_default/server.toml b/config/_default/server.toml index 678004108c..f50b439734 100644 --- a/config/_default/server.toml +++ b/config/_default/server.toml @@ -29,8 +29,10 @@ Permissions-Policy = """ # "form-action" is NOT set, so it allows everything (it doesn't default to default-src). If restricted, It must allow at least www.paypal.com and its redirects Content-Security-Policy = """ default-src 'none'; - font-src 'self'; + font-src 'self' https://fonts.gstatic.com; + frame-ancestors 'self' https://isrg.formstack.com; style-src 'unsafe-inline' 'self'; + style-src-elem 'self' https://fonts.googleapis.com; script-src 'unsafe-eval' 'unsafe-inline' 'self' data: https://www.google-analytics.com https://www.googleadservices.com diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 293b407428..e69de29bb2 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,83 +0,0 @@ -{{ if and (ne .Section "docs") (ne .Section "documents") (not .Params.no_donate_footer) }} - -{{ end }} - -{{ if ne .Section "documents" }} - -{{ end }}{{/* if ne .Section "documents" */}} - -{{ $js := resources.Get "js/main.js" | fingerprint "sha512" }} - diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 1e2d802e94..29924765b9 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -3,28 +3,10 @@ {{ if ne .Title .Site.Title }}{{ .Title }} - {{ end }} {{ .Site.Title }} - - - - - - - - - - {{ $style := resources.Get "css/main.scss" | resources.ToCSS | minify | fingerprint "sha512" }} - - - - {{ if .Params.canonicalUrl }} - - {{ else }} - - {{ end }} - {{ with .Site.Home.OutputFormats.Get "RSS" -}} - - {{ end }} - {{ if .Page.Params.do_not_index }} - {{ end }} + + + + {{ $embedPagestyle := resources.Get "css/embedpage.scss" | resources.ToCSS | minify }} + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index ca4b90c62d..e69de29bb2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,60 +0,0 @@ -{{ if ne .Section "documents" }} - -
- {{ i18n "site_banner_text" }} -
-
-{{ end }}{{/* if ne .Section "documents" */}} diff --git a/layouts/partials/hero.html b/layouts/partials/hero.html index d206b48ce5..3cb6d97913 100644 --- a/layouts/partials/hero.html +++ b/layouts/partials/hero.html @@ -1,6 +1,6 @@ {{ if ne .Section "documents" }} {{ $bgImage := printf "images/%d.jpg" (.Param "top_graphic") | relURL }} -
+

{{ .Title }}

diff --git a/netlify.toml b/netlify.toml index 60b0ab30dd..efbef7b855 100644 --- a/netlify.toml +++ b/netlify.toml @@ -38,8 +38,10 @@ Permissions-Policy = """ # "form-action" is NOT set, so it allows everything (it doesn't default to default-src). If restricted, It must allow at least www.paypal.com and its redirects Content-Security-Policy = """ default-src 'none'; - font-src 'self'; - style-src 'unsafe-inline' 'self'; + font-src 'self' https://fonts.gstatic.com; + frame-ancestors 'self' https://isrg.formstack.com; + style-src 'self'; + style-src-elem 'self' https://fonts.googleapis.com; script-src 'unsafe-eval' 'unsafe-inline' 'self' data: https://www.google-analytics.com https://www.googleadservices.com diff --git a/src/css/embedpage.scss b/src/css/embedpage.scss new file mode 100644 index 0000000000..bf371e65d6 --- /dev/null +++ b/src/css/embedpage.scss @@ -0,0 +1,3 @@ +* { + font-family: 'Open Sans', serif; +} \ No newline at end of file