diff --git a/_data/nav/3_operating_systems.yml b/_data/nav/3_operating_systems.yml index e8ef5a60..cb36df23 100644 --- a/_data/nav/3_operating_systems.yml +++ b/_data/nav/3_operating_systems.yml @@ -11,7 +11,7 @@ items: file: _evergreen/linux-desktop.md - type: link title: Qubes OS - icon: fab fa-linux + icon: pg-qubes file: _evergreen/qubes.md - type: link title: Router diff --git a/_data/providers/cloud/1_nextcloud.yml b/_data/providers/cloud/1_nextcloud.yml index e07e311e..f72d59df 100644 --- a/_data/providers/cloud/1_nextcloud.yml +++ b/_data/providers/cloud/1_nextcloud.yml @@ -19,9 +19,9 @@ downloads: url: 'https://nextcloud.com/install/#install-clients' - icon: fab fa-freebsd url: 'https://www.freshports.org/www/nextcloud/' - - icon: ptio-openbsd + - icon: pg-openbsd url: 'http://openports.se/www/nextcloud' - - icon: ptio-netbsd + - icon: pg-netbsd url: 'http://pkgsrc.se/www/php-nextcloud' - icon: fab fa-android url: 'https://f-droid.org/packages/com.nextcloud.client/' diff --git a/_data/providers/cloud/3_tahoe-lafs.yml b/_data/providers/cloud/3_tahoe-lafs.yml index 1d93976c..cbd4ffba 100644 --- a/_data/providers/cloud/3_tahoe-lafs.yml +++ b/_data/providers/cloud/3_tahoe-lafs.yml @@ -14,7 +14,7 @@ downloads: url: 'https://github.com/tahoe-lafs/tahoe-lafs#via-pip' - icon: fab fa-linux url: 'https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages' - - icon: ptio-netbsd + - icon: pg-netbsd url: 'http://pkgsrc.se/filesystems/tahoe-lafs' - icon: fab fa-github url: 'https://www.tahoe-lafs.org/trac/tahoe-lafs/browser' diff --git a/_includes/legacy/cardv2.html b/_includes/legacy/cardv2.html index d6bf23f2..1db48f8c 100644 --- a/_includes/legacy/cardv2.html +++ b/_includes/legacy/cardv2.html @@ -98,7 +98,7 @@ data-bs-toggle="tooltip" data-bs-placement="bottom" title="Requires specific software to access: torproject.org"> - + {% endif %} {% if include.i2p %} @@ -109,7 +109,7 @@ data-bs-toggle="tooltip" data-bs-placement="bottom" title="Requires specific software to access: geti2p.net"> - + {% endif %} @@ -128,20 +128,20 @@ {% if include.mac %} {% if include.mac != "" %} - + {% else %} - + {% endif %} {% endif %} {% if include.linux %} {% if include.linux != "" %} - + {% else %} - + {% endif %} {% endif %} @@ -158,20 +158,20 @@ {% if include.openbsd %} {% if include.openbsd != "" %} - + {% else %} - + {% endif %} {% endif %} {% if include.netbsd %} {% if include.netbsd != "" %} - + {% else %} - + {% endif %} {% endif %} @@ -228,10 +228,10 @@ {% if include.fdroid %} {% if include.fdroid != "" %} - + {% else %} - + {% endif %} {% endif %} @@ -258,20 +258,20 @@ {% if include.ios %} {% if include.ios != "" %} - + {% else %} - + {% endif %} {% endif %} {% if include.sailfish %} {% if include.sailfish != "" %} - + {% else %} - + {% endif %} {% endif %} diff --git a/_includes/recommendation-card.html b/_includes/recommendation-card.html index 46b20574..06e106f9 100644 --- a/_includes/recommendation-card.html +++ b/_includes/recommendation-card.html @@ -58,7 +58,7 @@ {% if item.website %} Visit {{ item.website | remove_first: "www." | split: "/" | slice: 2 }} {% if item.privacy_policy %} Privacy Policy{% endif %} - {% if item.website_tor %} + {% if item.website_tor %} {% endif %} {% endif %} {% endif %} diff --git a/_sass/pg-font.scss b/_sass/pg-font.scss new file mode 100644 index 00000000..7d58c8fe --- /dev/null +++ b/_sass/pg-font.scss @@ -0,0 +1,62 @@ +/* + Icon Font: pg-font +*/ + +@font-face { + font-family: "pg-font"; + src: url("../fonts/pg-font/pg-font.eot"); + src: url("../fonts/pg-font/pg-font.eot?#iefix") format("embedded-opentype"), + url("../fonts/pg-font/pg-font.woff2") format("woff2"), + url("../fonts/pg-font/pg-font.woff") format("woff"), + url("../fonts/pg-font/pg-font.ttf") format("truetype"), + url("../fonts/pg-font/pg-font.svg#pg-font") format("svg"); + font-weight: normal; + font-style: normal; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "pg-font"; + src: url("../fonts/pg-font/pg-font.svg#pg-font") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.pg-f-droid:before, +.pg-i2p:before, +.pg-ios:before, +.pg-linux:before, +.pg-macos:before, +.pg-mix:before, +.pg-netbsd:before, +.pg-openbsd:before, +.pg-sailfish-os:before, +.pg-qubes:before, +.pg-tor:before { + display: inline-block; + font-family: "pg-font"; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; +} + +.pg-f-droid:before { content: "\f100"; } +.pg-i2p:before { content: "\f10c"; } +.pg-ios:before { content: "\f101"; } +.pg-linux:before { content: "\f102"; } +.pg-macos:before { content: "\f103"; } +.pg-mix:before { content: "\f107"; } +.pg-netbsd:before { content: "\f104"; } +.pg-openbsd:before { content: "\f105"; } +.pg-sailfish-os:before { content: "\f106"; } +.pg-tor:before { content: "\f10b"; } +.pg-qubes:before { content: "\f108" } diff --git a/_sass/ptio-font.scss b/_sass/ptio-font.scss deleted file mode 100644 index e0c9b777..00000000 --- a/_sass/ptio-font.scss +++ /dev/null @@ -1,60 +0,0 @@ -/* - Icon Font: ptio-font -*/ - -@font-face { - font-family: "ptio-font"; - src: url("../fonts/ptio-font/ptio-font.eot"); - src: url("../fonts/ptio-font/ptio-font.eot?#iefix") format("embedded-opentype"), - url("../fonts/ptio-font/ptio-font.woff2") format("woff2"), - url("../fonts/ptio-font/ptio-font.woff") format("woff"), - url("../fonts/ptio-font/ptio-font.ttf") format("truetype"), - url("../fonts/ptio-font/ptio-font.svg#ptio-font") format("svg"); - font-weight: normal; - font-style: normal; -} - -@media screen and (-webkit-min-device-pixel-ratio:0) { - @font-face { - font-family: "ptio-font"; - src: url("../fonts/ptio-font/ptio-font.svg#ptio-font") format("svg"); - } -} - -[data-icon]:before { content: attr(data-icon); } - -[data-icon]:before, -.ptio-f-droid:before, -.ptio-i2p-garlic:before, -.ptio-ios:before, -.ptio-linux:before, -.ptio-macos:before, -.ptio-mix:before, -.ptio-netbsd:before, -.ptio-openbsd:before, -.ptio-sailfish-os:before, -.ptio-tor:before { - display: inline-block; - font-family: "ptio-font"; - font-style: normal; - font-weight: normal; - font-variant: normal; - line-height: 1; - text-decoration: inherit; - text-rendering: optimizeLegibility; - text-transform: none; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-smoothing: antialiased; -} - -.ptio-f-droid:before { content: "\f100"; } -.ptio-i2p-garlic:before { content: "\f10c"; } -.ptio-ios:before { content: "\f101"; } -.ptio-linux:before { content: "\f102"; } -.ptio-macos:before { content: "\f103"; } -.ptio-mix:before { content: "\f107"; } -.ptio-netbsd:before { content: "\f104"; } -.ptio-openbsd:before { content: "\f105"; } -.ptio-sailfish-os:before { content: "\f106"; } -.ptio-tor:before { content: "\f10b"; } diff --git a/assets/css/app.scss b/assets/css/app.scss index 815ff563..99274874 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -74,7 +74,7 @@ h1, h2, h3:not(.h5), h4 { // import /_sass/bootstrap.scss @import "./node_modules/bootstrap/scss/bootstrap"; -@import "ptio-font"; +@import "pg-font"; @import "flag-icon"; .textColor { diff --git a/assets/css/dark.scss b/assets/css/dark.scss index bae80275..3107a29f 100644 --- a/assets/css/dark.scss +++ b/assets/css/dark.scss @@ -103,7 +103,7 @@ $utilities: map-merge( // import /_sass/bootstrap.scss @import "./node_modules/bootstrap/scss/bootstrap"; -@import "ptio-font"; +@import "pg-font"; @import "flag-icon"; $svg-primary: $primary; diff --git a/assets/fonts/ptio-font/ptio-font.eof b/assets/fonts/pg-font/pg-font.eot similarity index 57% rename from assets/fonts/ptio-font/ptio-font.eof rename to assets/fonts/pg-font/pg-font.eot index 26b4266e..8981ed49 100644 Binary files a/assets/fonts/ptio-font/ptio-font.eof and b/assets/fonts/pg-font/pg-font.eot differ diff --git a/assets/fonts/ptio-font/ptio-font.svg b/assets/fonts/pg-font/pg-font.svg similarity index 88% rename from assets/fonts/ptio-font/ptio-font.svg rename to assets/fonts/pg-font/pg-font.svg index 6964b34c..b3d51c43 100644 --- a/assets/fonts/ptio-font/ptio-font.svg +++ b/assets/fonts/pg-font/pg-font.svg @@ -1,199 +1,218 @@ - - - - -Created by FontForge 20201107 at 1636800185 (Mon Mar 10 1975 10:40:18 UTC+0000 (Coordinated Universal Time)) - By elitejake - - - - - - - - - - - - - - - - - - + + + + +Created by FontForge 2022-03-20T10:13:48+00:00 + By elitejake + +CC0 1.0 Universal Public Domain Dedication. +See the license here: https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE + + + + + + + + + + + + + + + + + + diff --git a/assets/fonts/ptio-font/ptio-font.ttf b/assets/fonts/pg-font/pg-font.ttf similarity index 59% rename from assets/fonts/ptio-font/ptio-font.ttf rename to assets/fonts/pg-font/pg-font.ttf index 26b4266e..0cc3e40f 100644 Binary files a/assets/fonts/ptio-font/ptio-font.ttf and b/assets/fonts/pg-font/pg-font.ttf differ diff --git a/assets/fonts/pg-font/pg-font.woff b/assets/fonts/pg-font/pg-font.woff new file mode 100644 index 00000000..13603dd9 Binary files /dev/null and b/assets/fonts/pg-font/pg-font.woff differ diff --git a/assets/fonts/pg-font/pg-font.woff2 b/assets/fonts/pg-font/pg-font.woff2 new file mode 100644 index 00000000..c5b7db91 Binary files /dev/null and b/assets/fonts/pg-font/pg-font.woff2 differ diff --git a/assets/fonts/ptio-font/LICENSE b/assets/fonts/ptio-font/LICENSE deleted file mode 100644 index b5d0c56e..00000000 --- a/assets/fonts/ptio-font/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (c) 2019, Dawid Potocki - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/assets/fonts/ptio-font/ptio-font.eot b/assets/fonts/ptio-font/ptio-font.eot deleted file mode 100644 index c0fd15e4..00000000 Binary files a/assets/fonts/ptio-font/ptio-font.eot and /dev/null differ diff --git a/assets/fonts/ptio-font/ptio-font.woff b/assets/fonts/ptio-font/ptio-font.woff deleted file mode 100644 index 1d41099b..00000000 Binary files a/assets/fonts/ptio-font/ptio-font.woff and /dev/null differ diff --git a/assets/fonts/ptio-font/ptio-font.woff2 b/assets/fonts/ptio-font/ptio-font.woff2 deleted file mode 100644 index 45ef0f4d..00000000 Binary files a/assets/fonts/ptio-font/ptio-font.woff2 and /dev/null differ diff --git a/notices.md b/notices.md index 8bf17ab2..fafe9d6c 100644 --- a/notices.md +++ b/notices.md @@ -24,7 +24,6 @@ Privacy Guides additionally does not warrant that this website will be constantl This does not include third-party code embedded in this repository, or code where a superseding license is otherwise noted. The following are notable examples, but this list may not be all-inclusive: - [Sortable](https://github.com/privacyguides/privacyguides.org/blob/main/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE) -- The [PrivacyTools fonts and icons](https://github.com/privacyguides/privacyguides.org/tree/main/assets/fonts/ptio-font) are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE). Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub. That resource and this page itself are released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).