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.

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

Privacy fixes for google fonts and 3rd party JS #36

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
heroku-build:
git push https://git.heroku.com/projectcallistodotorg.git HEAD:master -f
get-bootstrap:
wget https://github.com/twbs/bootstrap/releases/download/v3.3.7/bootstrap-3.3.7-dist.zip -O- | bsdtar -C js/static -xvf-
get-jquery:
wget https://code.jquery.com/jquery.min.js -Ojs/static/jquery.min.js
wget https://code.jquery.com/jquery.min.map -Ojs/static/jquery.min.map
get-fontawesome:
wget https://use.fontawesome.com/releases/v5.8.1/fontawesome-free-5.8.1-web.zip -O- | bsdtar -C js/static -xvf-
6 changes: 4 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@
ga('create', 'UA-53121135-1', 'auto');
ga('send', 'pageview');
</script>
<script src="https://code.jquery.com/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>

<script src="js/static/jquery.min.js"></script>
<script src="js/static/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>

<script src="js/wufoo.js"></script>
<script src="js/toast.js"></script>
<script src="js/contactModal.js"></script>
Expand Down
10 changes: 4 additions & 6 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
<meta name="author" content="Callisto">
<link rel="icon" href="images/callisto_logo.png">

<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link href="/css/static/fontawesome-pro-5.8.1-web/css/all.min.css" rel="stylesheet" type="text/css">
<link href="/css/static/fontawesome-pro-5.8.1-web/css/v4-shims.min.css" rel="stylesheet" type="text/css">
<link href="/js/static/bootstrap-3.3.7-dist/css/bootstrap.min.css" rel="stylesheet" type="text/css">

<link href="https://fonts.googleapis.com/css?family=Montserrat: 100,300,500,600,700|Open+Sans|Oswald|Playfair+Display" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Raleway:100,300,400,500,600,700,900|Sorts+Mill+Goudy:100,300,400,400i" rel="stylesheet">
<link href="/css/fonts.css" rel="stylesheet" type="text/css">

<link href="{{ page.css }}?{{site.time | date: '%s%N'}}" rel="stylesheet" type="text/css">

<script src="https://donorbox.org/install-popup-button.js" type="text/javascript" defer></script>

<script> window.DonorBox = { widgetLinkClassName: 'custom-dbox-popup' } </script>
<script type="text/javascript">
// redirect if URL ends in a '/'
Expand Down
306 changes: 306 additions & 0 deletions css/fonts.css

Large diffs are not rendered by default.

306 changes: 306 additions & 0 deletions css/fonts.css~

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions css/static/bootstrap.min.css

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions css/static/fontawesome-pro-5.8.1-web/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Font Awesome Pro License
------------------------

Font Awesome Pro is commercial software that requires a paid license. Full
Font Awesome Pro license: https://fontawesome.com/license.

# Commercial License
The Font Awesome Pro commercial license allows you to pay for FA Pro once, own
it, and use it just about everywhere you'd like.

# Attribution
Attribution is not required by the Font Awesome Pro commercial license.

# Brand Icons
All brand icons are trademarks of their respective owners. The use of these
trademarks does not indicate endorsement of the trademark holder by Font
Awesome, nor vice versa. **Please do not use brand logos for any purpose except
to represent the company, product, or service to which they refer.**
Loading