From 6b14a9c37f71db8bf55fa09eebde3f78264ae0bf Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 3 May 2021 21:13:50 -0500 Subject: [PATCH] Migrate to Bootstrap 5 --- _config.yml | 3 + _includes/badge.html | 16 +- _includes/breadcrumbs.html | 8 +- _includes/footer.html | 1 + _includes/head.html | 4 +- _includes/legacy/card.html | 6 +- _includes/legacy/cardv2.html | 144 ++++++------ _includes/legacy/sections/android-addons.html | 6 +- .../sections/android-operating-systems.html | 6 +- _includes/legacy/sections/browser-addons.html | 10 +- _includes/legacy/sections/browser-tweaks.html | 2 +- .../sections/calendar-contacts-sync.html | 2 +- _includes/legacy/sections/cloud-storage.html | 2 +- .../legacy/sections/decentralized-video.html | 2 +- _includes/legacy/sections/dns.html | 92 ++++---- _includes/legacy/sections/email-clients.html | 8 +- .../legacy/sections/email-providers.html | 14 +- .../legacy/sections/file-encryption.html | 2 +- _includes/legacy/sections/file-sharing.html | 2 +- _includes/legacy/sections/file-sync.html | 4 +- _includes/legacy/sections/fourteen-eyes.html | 32 +-- .../legacy/sections/hosting-provider.html | 2 +- .../legacy/sections/instant-messenger.html | 28 +-- _includes/legacy/sections/ios-addons.html | 6 +- .../legacy/sections/key-disclosure-law.html | 50 ++--- .../sections/metadata-removal-tools.html | 4 +- _includes/legacy/sections/notebooks.html | 2 +- .../legacy/sections/operating-systems.html | 4 +- .../legacy/sections/password-managers.html | 2 +- _includes/legacy/sections/paste-services.html | 2 +- .../legacy/sections/privacy-resources.html | 2 +- .../legacy/sections/productivity-tools.html | 2 +- _includes/legacy/sections/quotes.html | 6 +- _includes/legacy/sections/resources.html | 2 +- .../legacy/sections/router-firmware.html | 2 +- _includes/legacy/sections/search-engines.html | 2 +- .../sections/self-contained-networks.html | 2 +- .../legacy/sections/selfhosted-cloud.html | 2 +- .../legacy/sections/social-networks.html | 2 +- .../sections/social-news-aggregator.html | 2 +- _includes/legacy/sections/teamchat.html | 4 +- .../sections/tor-operating-systems.html | 2 +- .../legacy/sections/video-frontends.html | 2 +- .../sections/voice-video-messenger.html | 2 +- _includes/legacy/sections/vpn.html | 8 +- _includes/legacy/sections/warrant-canary.html | 2 +- _includes/legacy/sections/windows10.html | 4 +- _includes/nav.html | 8 +- _includes/recommendation-card.html | 10 +- _layouts/default.html | 7 +- _layouts/page.html | 1 - _layouts/post.html | 2 +- _sass/custom.scss | 211 +----------------- _sass/sortable.scss | 4 +- _sass/variables.scss | 82 +++---- assets/css/app.scss | 2 + assets/css/dark.scss | 2 + assets/js/main.js | 9 +- ...22-self-hosting-shadowsocks-vpn-outline.md | 4 +- index.html | 10 +- legacy_pages/providers/email.html | 20 +- legacy_pages/providers/vpn.html | 8 +- notices.md | 6 +- package-lock.json | 60 ++--- package.json | 6 +- 65 files changed, 374 insertions(+), 592 deletions(-) diff --git a/_config.yml b/_config.yml index c91c7304..5e89b198 100644 --- a/_config.yml +++ b/_config.yml @@ -47,6 +47,9 @@ build: date: time: +kramdown: + auto_ids: true + # Build settings plugins: - jekyll-feed diff --git a/_includes/badge.html b/_includes/badge.html index f069d819..0b2e9df2 100644 --- a/_includes/badge.html +++ b/_includes/badge.html @@ -1,18 +1,18 @@ {% if include.link %} {{ include.text }} -{% else %}> {{ include.text }}{% endif %} + data-bs-toggle="tooltip" + title="{{ include.tooltip }}"> {{ include.text }} +{% else %}> {{ include.text }}{% endif %} {% else %} {{include.text}} + data-bs-toggle="tooltip" + title="{{ include.tooltip }}" + > {{include.text}} {% else %} > {% if include.icon %}{% endif %} {{include.text}} {% endif %} diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index f830460f..12c4a5f7 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -4,7 +4,7 @@ {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
  1. - Home + Home
    2. {% for crumb in crumbs offset: 1 %} {% if forloop.last %} @@ -16,7 +16,7 @@ {% else %}
  2. - {{ crumb | replace:'-',' ' | remove:'.html' | capitalize }} + {{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}
    3. {% endif %} @@ -24,7 +24,7 @@
-
- Edit +
+ Edit
diff --git a/_includes/footer.html b/_includes/footer.html index d9565d0c..6a6a6081 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,4 +1,5 @@ {% include hr.html %} +{% include breadcrumbs.html %}

Privacy Guides is a socially motivated website that provides information for protecting your data security and privacy.

diff --git a/_includes/head.html b/_includes/head.html index 82e8e63c..4576d7c7 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -34,7 +34,7 @@ - + - + diff --git a/_includes/legacy/card.html b/_includes/legacy/card.html index 9a294a60..40e15352 100644 --- a/_includes/legacy/card.html +++ b/_includes/legacy/card.html @@ -17,7 +17,7 @@ {% assign text = label_data[1] %} {% assign tooltip = label_data[2] | default: "" %} {% assign help_icon = '' %} - {{text}} {{ help_icon + {{text}} {{ help_icon }} {% else %} >{{text}} @@ -56,11 +56,11 @@ {% endif %} {% if include.tor %} - Tor + Tor {% endif %} {% if include.git %} - Git + Git {% endif %} {% if include.extra_button %} diff --git a/_includes/legacy/cardv2.html b/_includes/legacy/cardv2.html index c7e593f6..f5d03ef0 100644 --- a/_includes/legacy/cardv2.html +++ b/_includes/legacy/cardv2.html @@ -2,7 +2,7 @@

{% if include.badges %} - {{ include.title }} + {{ include.title }} {% assign badges = include.badges | split:"|" %} {% for badge in badges %} {% assign badge_data = badge | split:":" %} @@ -11,10 +11,10 @@ {% assign tooltip = badge_data[2] | default: false %} {% assign help_icon = '' %} {{text}} {{ help_icon }} {% else %} > {{text}} @@ -73,11 +73,11 @@ {% endif %}

-
+
+ class="btn btn-secondary mt-1 me-1"> Website @@ -85,7 +85,7 @@ + class="btn btn-primary mt-1 me-1"> Privacy Policy @@ -94,22 +94,22 @@ - + class="btn btn-tor mt-1 me-1" + data-bs-toggle="tooltip" + data-bs-placement="bottom" + title="Requires specific software to access: torproject.org"> + {% endif %} {% if include.i2p %} - + class="btn btn-blue mt-1 me-1" + data-bs-toggle="tooltip" + data-bs-placement="bottom" + title="Requires specific software to access: geti2p.net"> + {% endif %}
@@ -117,171 +117,171 @@
{% if include.windows %} {% if include.windows != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.mac %} {% if include.mac != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.linux %} {% if include.linux != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.freebsd %} {% if include.freebsd != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.openbsd %} {% if include.openbsd != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.netbsd %} {% if include.netbsd != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.firefox %} {% if include.firefox != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.chrome %} {% if include.chrome != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.safari %} {% if include.safari != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.opera %} {% if include.opera != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.edge %} {% if include.edge != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.fdroid %} {% if include.fdroid != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.googleplay %} {% if include.googleplay != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.android %} {% if include.android != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.ios %} {% if include.ios != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.sailfish %} {% if include.sailfish != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.web %} {% if include.web != "" %} - - + + {% else %} - + {% endif %} {% endif %} @@ -290,25 +290,25 @@ {{include.icon3}} {% if include.github %} - + {% endif %} {% if include.gitlab %} - + {% endif %} {% if include.git %} - + {% endif %} {% if include.source %} - + {% endif %} diff --git a/_includes/legacy/sections/android-addons.html b/_includes/legacy/sections/android-addons.html index ae4c2bad..2375f4d1 100644 --- a/_includes/legacy/sections/android-addons.html +++ b/_includes/legacy/sections/android-addons.html @@ -1,10 +1,10 @@ -

Android Privacy Add-ons

+

Android Privacy Add-ons

- NetGuard + NetGuard

Control your traffic with NetGuard

@@ -14,7 +14,7 @@
- Orbot + Orbot

Tor for Android with Orbot

diff --git a/_includes/legacy/sections/android-operating-systems.html b/_includes/legacy/sections/android-operating-systems.html index 7282c30c..6215b47b 100644 --- a/_includes/legacy/sections/android-operating-systems.html +++ b/_includes/legacy/sections/android-operating-systems.html @@ -1,6 +1,6 @@ -

Mobile Operating Systems

+

Mobile Operating Systems

-

Android-based Operating Systems

+

Android-based Operating Systems

-

+

Encrypted DNS Client Recommendations for Desktop -

+ {% include legacy/cardv2.html @@ -574,11 +574,11 @@ We also log how many times this or that tracker has been blocked. We need this i privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy" %} -

+

Encrypted DNS Client Recommendations for Android -

+ {% include legacy/cardv2.html @@ -601,11 +601,11 @@ We also log how many times this or that tracker has been blocked. We need this i source="https://git.frostnerd.com/PublicAndroidApps/smokescreen" %} -

+

Encrypted DNS Client Recommendations for iOS -

+ {% include legacy/cardv2.html diff --git a/_includes/legacy/sections/email-clients.html b/_includes/legacy/sections/email-clients.html index 4dcd5971..19ec215f 100644 --- a/_includes/legacy/sections/email-clients.html +++ b/_includes/legacy/sections/email-clients.html @@ -1,4 +1,4 @@ -

Desktop Email Clients

+

Desktop Email Clients

{% include legacy/cardv2.html title="Thunderbird" @@ -46,9 +46,9 @@ -

Mobile Email Clients

+

Mobile Email Clients

-

Android Email Clients

+

Android Email Clients

{% include legacy/cardv2.html title="FairEmail" @@ -72,7 +72,7 @@ googleplay="https://play.google.com/store/apps/details?id=com.fsck.k9" %} -

iOS Email Clients

+

iOS Email Clients

{% include legacy/cardv2.html title="Canary Mail" diff --git a/_includes/legacy/sections/email-providers.html b/_includes/legacy/sections/email-providers.html index 74387a8a..8932124a 100644 --- a/_includes/legacy/sections/email-providers.html +++ b/_includes/legacy/sections/email-providers.html @@ -1,4 +1,4 @@ -

Recommended Email Services

+

Recommended Email Services

@@ -50,7 +50,7 @@ src="/assets/img/legacy_svg/3rd-party/mailboxorg.svg" height="70" width="200" - class="img-fluid d-block mr-auto ml-auto align-middle" + class="img-fluid d-block me-auto ms-auto align-middle" alt="Mailbox">
@@ -87,7 +87,7 @@ src="/assets/img/legacy_svg/3rd-party/posteo.svg" height="70" width="200" - class="img-fluid d-block mr-auto ml-auto align-middle" + class="img-fluid d-block me-auto ms-auto align-middle" alt="Posteo">
@@ -124,7 +124,7 @@ data-theme-src="/assets/img/legacy_svg/3rd-party/disroot-dark.svg" height="70" width="200" - class="img-fluid d-block mr-auto ml-auto align-middle" + class="img-fluid d-block me-auto ms-auto align-middle" alt="Disroot">
@@ -161,7 +161,7 @@ data-theme-src="/assets/img/legacy_svg/3rd-party/tutanota-dark.svg" height="70" width="200" - class="img-fluid d-block mr-auto ml-auto align-middle" + class="img-fluid d-block me-auto ms-auto align-middle" alt="Tutanota">
@@ -203,7 +203,7 @@ data-theme-src="/assets/img/legacy_svg/3rd-party/startmail-dark.svg" height="70" width="200" - class="img-fluid d-block mr-auto ml-auto align-middle" + class="img-fluid d-block me-auto ms-auto align-middle" alt="StartMail">
diff --git a/_includes/legacy/sections/file-encryption.html b/_includes/legacy/sections/file-encryption.html index 4984f82b..b33995d3 100644 --- a/_includes/legacy/sections/file-encryption.html +++ b/_includes/legacy/sections/file-encryption.html @@ -1,4 +1,4 @@ -

File Encryption Software

+

File Encryption Software