From 5e32dcfa88c2aeb624205361c98c3dbd5d1fc878 Mon Sep 17 00:00:00 2001 From: Tommy Date: Fri, 31 Dec 2021 22:40:35 -0500 Subject: [PATCH] Remove '14 Eyes' info and legacy pages (#504) Co-authored-by: Jonah Aragon --- 404.html | 3 -- _data/nav/4_privacy.yml | 5 -- _includes/breadcrumbs.html | 30 ----------- _layouts/page.html | 1 - _layouts/recommendation.html | 2 - assets/css/dark.scss | 1 - ...reat_seal_of_the_united_states_obverse.svg | 2 - assets/img/legacy_svg/layout/ukusa.svg | 2 - collections/_pages/providers/dns.md | 1 - index.html | 53 ------------------- legacy_pages/providers.html | 24 --------- legacy_pages/providers/email.html | 2 +- legacy_pages/providers/vpn.html | 3 +- legacy_pages/software.html | 23 -------- legacy_pages/software/cal-card.html | 1 - 15 files changed, 2 insertions(+), 151 deletions(-) delete mode 100644 _includes/breadcrumbs.html delete mode 100644 assets/img/legacy_svg/layout/great_seal_of_the_united_states_obverse.svg delete mode 100644 assets/img/legacy_svg/layout/ukusa.svg delete mode 100644 legacy_pages/providers.html delete mode 100644 legacy_pages/software.html diff --git a/404.html b/404.html index 483d1ee9..cc82e627 100644 --- a/404.html +++ b/404.html @@ -11,9 +11,6 @@ layout: default
diff --git a/_data/nav/4_privacy.yml b/_data/nav/4_privacy.yml index 3db2423e..f9c79c0c 100644 --- a/_data/nav/4_privacy.yml +++ b/_data/nav/4_privacy.yml @@ -5,8 +5,3 @@ items: title: Threat Modeling icon: fad fa-bullseye-arrow file: _evergreen/threat-modeling.html - - type: link - title: Global Mass Surveillance - icon: fad fa-drone-alt - file: legacy_pages/providers.html - anchor: ukusa diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html deleted file mode 100644 index b512ffd4..00000000 --- a/_includes/breadcrumbs.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
- -
-
- Edit on GitHub -
-
diff --git a/_layouts/page.html b/_layouts/page.html index bb3593f5..8addccbd 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -8,6 +8,5 @@ layout: default

{% endif %} {{ content }} {% include hr.html %} - {% include breadcrumbs.html %} {% include footer.html %} diff --git a/_layouts/recommendation.html b/_layouts/recommendation.html index 1717f5cf..3f1eed82 100644 --- a/_layouts/recommendation.html +++ b/_layouts/recommendation.html @@ -2,7 +2,6 @@ layout: default ---
- {% include breadcrumbs.html %}
{% if page.logo %}
{{ page.title }} logo @@ -21,6 +20,5 @@ layout: default {{ content }} {% include downloads.html %} {% include hr.html %} - {% include breadcrumbs.html %} {% include footer.html %}
diff --git a/assets/css/dark.scss b/assets/css/dark.scss index c9148bd1..bae80275 100644 --- a/assets/css/dark.scss +++ b/assets/css/dark.scss @@ -15,7 +15,6 @@ $card-bg: lighten( $dark, 5% ); $body-color: $light; $link-color: lighten( $link-color, 30% ); $mark-bg: darken( $primary, 60% ); -$breadcrumb-bg: lighten( $dark, 5% ); $hr-border-color: $body-color; @import "./node_modules/bootstrap/scss/variables"; diff --git a/assets/img/legacy_svg/layout/great_seal_of_the_united_states_obverse.svg b/assets/img/legacy_svg/layout/great_seal_of_the_united_states_obverse.svg deleted file mode 100644 index 6a161f6d..00000000 --- a/assets/img/legacy_svg/layout/great_seal_of_the_united_states_obverse.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/legacy_svg/layout/ukusa.svg b/assets/img/legacy_svg/layout/ukusa.svg deleted file mode 100644 index a2e26f7a..00000000 --- a/assets/img/legacy_svg/layout/ukusa.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/collections/_pages/providers/dns.md b/collections/_pages/providers/dns.md index 04da2e50..753eb7fd 100644 --- a/collections/_pages/providers/dns.md +++ b/collections/_pages/providers/dns.md @@ -2,7 +2,6 @@ layout: page title: "Encrypted DNS Resolvers" description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers." -breadcrumb: "DNS" --- -
-
-
-
-

Privacy Tools

-

The devices, software, and services that will protect your privacy highly depend on your use case, workflow, and threat model. But, if you don't know where to get started, we've chosen some recommended tools to get you going :)

-
-
-
-
- -
-
- -

Browsers

-
-
- -
-
- -
-
- -

Software

-
-
- -
-
- -
-
- -

OS

-
-
- -
-
- -
-
- -

Providers

-
-
- -
-
-
-
-
diff --git a/legacy_pages/providers.html b/legacy_pages/providers.html deleted file mode 100644 index c1125eab..00000000 --- a/legacy_pages/providers.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: page -permalink: /providers/ -title: "Providers" -description: "There's a ton of people providing services online. Discover which ones you should avoid and our recommendations for a variety of services." ---- - -
- -
- -{% include legacy/sections/fourteen-eyes.html %} - -{% include legacy/sections/key-disclosure-law.html %} - -{% include legacy/sections/warrant-canary.html %} diff --git a/legacy_pages/providers/email.html b/legacy_pages/providers/email.html index 8583ef5a..739791c0 100644 --- a/legacy_pages/providers/email.html +++ b/legacy_pages/providers/email.html @@ -18,7 +18,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

{% include badge.html color="info" text="Jurisdiction" %}

-

Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on global mass surveillance and avoiding the US and UK to learn more about why we feel this is important.

+

Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, and there are other factors to consider.

Minimum to Qualify:

diff --git a/legacy_pages/providers/vpn.html b/legacy_pages/providers/vpn.html index e2924e87..25146383 100644 --- a/legacy_pages/providers/vpn.html +++ b/legacy_pages/providers/vpn.html @@ -3,7 +3,6 @@ layout: page permalink: /providers/vpn/ title: "VPN Services" description: "Find a no-logging VPN operator who isn't out to sell or read your web traffic." -breadcrumb: "VPN" ---
@@ -30,7 +29,7 @@ breadcrumb: "VPN"

{% include badge.html color="info" text="Jurisdiction" %}

-

Operating outside the five/nine/fourteen-eyes countries is not a guarantee of privacy necessarily, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on global mass surveillance and avoiding the US and UK to learn more about why we feel this is important.

+

Operating outside the five/nine/fourteen-eyes countries is not a guarantee of privacy necessarily, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States.

Minimum to Qualify:

diff --git a/legacy_pages/software.html b/legacy_pages/software.html deleted file mode 100644 index 0260abbc..00000000 --- a/legacy_pages/software.html +++ /dev/null @@ -1,23 +0,0 @@ ---- -layout: page -permalink: /software/ -title: "Software" -description: "Discover a variety of open-source software built to protect your privacy and keep your digital data secure." ---- - -

Click on whatever software you need to view our recommendations.

- -
- -
diff --git a/legacy_pages/software/cal-card.html b/legacy_pages/software/cal-card.html index d4fcf0e8..24dae557 100644 --- a/legacy_pages/software/cal-card.html +++ b/legacy_pages/software/cal-card.html @@ -3,7 +3,6 @@ layout: page permalink: /software/calendar-contacts/ title: "Calendar and Contact Sync Tools" description: "Discover free, open-source, and secure ways to sync your contacts and calendars across your devices." -breadcrumb: "Calendar and Contacts" --- {% include legacy/sections/calendar-contacts-sync.html %}