diff --git a/.htaccess b/.htaccess index 327ebb6c3c7a..381bb1ced01e 100644 --- a/.htaccess +++ b/.htaccess @@ -24,3 +24,14 @@ Redirect permanent /datafusion-python https://datafusion.apache.org/python # redirect all ballista URLs to new website Redirect permanent /ballista https://datafusion.apache.org/ballista + +# fix Safari Content Security Policy errors +Header add Content-Security-Policy-Report-Only "default-src 'self' data: blob: https://*.apache.org/ https://www.apachecon.com/ https://www.communityovercode.org/; \ + script-src 'self' https://*.apache.org/ 'sha256-zcLnLb0EtdHEeff3LAr93euk343CTrN0BMhlaeAD8yY=' 'sha256-eeHr1PLkM55qPqkpxjBDHGtxfQf3RvEYoENHzN4IL0Q='; \ + style-src 'self' 'sha256-88sV2hhBstoYcag54b2hPpN+Oei7wd2Roz3k+RXEAfk=' 'sha256-B3D8HD6PV1HtGZ5Z3qkXsN6p/LAiwBn9jehRuPkMBhQ=' 'sha256-qo7STIM1L/OgU9y0De47mqod1UZFLJfTn36bRC42rfA='; \ + frame-ancestors 'self'; \ + frame-src 'self' data: blob:; \ + img-src 'self' data: https://*.apache.org/; \ + worker-src 'self' data: blob:; \ + connect-src 'self' https://*.apache.org/ https://api.github.com/; \ + font-src 'self' https://*.apache.org/;" diff --git a/NOTICE.txt b/NOTICE.txt index f9a6829016d9..9b85c2f870ce 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -11,3 +11,6 @@ This product includes software from https://github.com/buttons/github-buttons (B The deployed version of the website includes files generated by Jekyll (MIT) * Copyright (c) 2008-2022 Tom Preston-Werner and Jekyll contributors * https://github.com/jekyll/jekyll + +This product includes software from https://www.latofonts.com (SIL Open Font License, Version 1.1) +* Copyright (c) 2010-2011 by Lukasz Dziedzic diff --git a/_includes/top.html b/_includes/top.html index 9b21a7573829..ad20deb3e80a 100644 --- a/_includes/top.html +++ b/_includes/top.html @@ -3,16 +3,6 @@ - {% if page.title %} @@ -88,8 +78,6 @@ onUpdate(); - - diff --git a/assets/fonts/lato-v24-latin-italic.woff2 b/assets/fonts/lato-v24-latin-italic.woff2 new file mode 100644 index 000000000000..851630ff8569 Binary files /dev/null and b/assets/fonts/lato-v24-latin-italic.woff2 differ diff --git a/assets/fonts/lato-v24-latin-regular.woff2 b/assets/fonts/lato-v24-latin-regular.woff2 new file mode 100644 index 000000000000..ff60934dd0ea Binary files /dev/null and b/assets/fonts/lato-v24-latin-regular.woff2 differ diff --git a/css/main.scss b/css/main.scss index ffe40235ab23..21e7466c20a7 100644 --- a/css/main.scss +++ b/css/main.scss @@ -22,6 +22,22 @@ body { line-height: 1.52; } +@font-face { + font-display: swap; + font-family: Lato; + font-style: normal; + font-weight: 400; + src: url('/assets/fonts/lato-v24-latin-regular.woff2') format('woff2'); +} + +@font-face { + font-display: swap; + font-family: Lato; + font-style: italic; + font-weight: 400; + src: url('/assets/fonts/lato-v24-latin-italic.woff2') format('woff2'); +} + .footer { font-size: .8em; }