Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try fix Content Security Policy errors (take 8) #602

Merged
merged 3 commits into from
Feb 20, 2025
+30 −12
Merged

Try fix Content Security Policy errors (take 8) #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49424b2
Vendor Lato font files
ianmcook Feb 20, 2025
aa6fddf
Update .htaccess
ianmcook Feb 20, 2025
2639b4c
Remove meta tag
ianmcook Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/;"
3 changes: 3 additions & 0 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 0 additions & 12 deletions _includes/top.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Security-Policy-Report-Only" content="
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' https://fonts.googleapis.com/ '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/ https://fonts.gstatic.com/;">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above meta tags *must* come first in the head; any other head content must come *after* these tags -->
{% if page.title %}
Expand Down Expand Up @@ -88,8 +78,6 @@
onUpdate();
</script>

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">

<link href="{{ site.baseurl }}/css/main.css" rel="stylesheet">
<link href="{{ site.baseurl }}/css/syntax.css" rel="stylesheet">
<script src="{% link /javascript/main.js %}"></script>
Expand Down
Binary file added assets/fonts/lato-v24-latin-italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/lato-v24-latin-regular.woff2
View file
Open in desktop
Binary file not shown.
16 changes: 16 additions & 0 deletions css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down