diff --git a/.gitignore b/.gitignore index bd3e973d..e6cb179f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ _site/ .sass-cache/ .jekyll-metadata .DS_Store +font/assets/ +font/_sass/ +font/.fontcustom-manifest.json +assets/webfonts/ptio-font-preview.html diff --git a/_config.yml b/_config.yml index 355e9fe6..eac523d4 100644 --- a/_config.yml +++ b/_config.yml @@ -8,3 +8,4 @@ plugins: sitemap: file: "/sitemap.xml" include: [".well-known"] +exclude: ["font", "vendor"] diff --git a/_includes/cardv2.html b/_includes/cardv2.html index bc055202..13fdab57 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -92,7 +92,7 @@
{% if include.windows %} {% if include.windows != "" %} - + {% else %} @@ -102,27 +102,27 @@ {% if include.mac %} {% if include.mac != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.linux %} {% if include.linux != "" %} - - + + {% else %} - + {% endif %} {% endif %} - {% if include.bsd %} - {% if include.bsd != "" %} - + {% if include.freebsd %} + {% if include.freebsd != "" %} + {% else %} @@ -130,9 +130,29 @@ {% 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 %} @@ -142,7 +162,7 @@ {% if include.chrome %} {% if include.chrome != "" %} - + {% else %} @@ -152,7 +172,7 @@ {% if include.safari %} {% if include.safari != "" %} - + {% else %} @@ -162,7 +182,7 @@ {% if include.opera %} {% if include.opera != "" %} - + {% else %} @@ -172,7 +192,7 @@ {% if include.edge %} {% if include.edge != "" %} - + {% else %} @@ -180,9 +200,29 @@ {% 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 %} @@ -192,31 +232,31 @@ {% if include.ios %} {% if include.ios != "" %} - - + + {% else %} - + {% endif %} {% endif %} - {% if include.fire %} - {% if include.fire != "" %} - - + {% if include.sailfish %} + {% if include.sailfish != "" %} + + {% else %} - + {% endif %} {% endif %} {% if include.web %} {% if include.web != "" %} - - + + {% else %} - + {% endif %} {% endif %} @@ -225,25 +265,25 @@ {{include.icon3}} {% if include.github %} - + {% endif %} {% if include.gitlab %} - + {% endif %} {% if include.git %} - + {% endif %} {% if include.source %} - + {% endif %} diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index 6bba6c32..02dd1455 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -12,10 +12,9 @@ description="Privacy Badger is a browser add-on that stops adve website="https://www.eff.org/privacybadger" forum="https://forum.privacytools.io/t/discussion-privacy-badger/265" github="https://github.com/EFForg/privacybadger" -firefox="" -chrome="" -opera="" -android="" +firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17" +chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp" +opera="https://addons.opera.com/en/extensions/details/privacy-badger/" %} {% include cardv2.html @@ -25,12 +24,11 @@ description="uBlock Origin is an efficient WebRTC and Worth Mentioning diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html index 3e56763e..a4b5dff9 100644 --- a/_includes/sections/file-sharing.html +++ b/_includes/sections/file-sharing.html @@ -7,8 +7,8 @@ website="https://send.firefox.com/" description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security." forum="https://forum.privacytools.io/t/discussion-firefox-send/755" github="https://github.com/mozilla/send" -web="" -android="" +web="https://send.firefox.com/" +googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend" %} {% include cardv2.html @@ -19,21 +19,26 @@ tor="http://elx57ue5uyfplgva.onion/" description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files." forum="https://forum.privacytools.io/t/discussion-onionshare/754" github="https://github.com/micahflee/onionshare" -windows="" -mac="" -linux="" +windows="https://onionshare.org/#downloads" +mac="https://onionshare.org/#downloads" +linux="https://onionshare.org/#downloads" +freebsd="https://www.freshports.org/www/onionshare/" +openbsd="http://openports.se/net/onionshare" %} {% include cardv2.html title="Magic Wormhole" image="/assets/img/tools/Magic-Wormhole.png" -website="https://github.com/warner/magic-wormhole" +website="https://magic-wormhole.readthedocs.io" description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another." forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756" github="https://github.com/warner/magic-wormhole" -windows="" -mac="" -linux="" +windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" +mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" +linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" +freebsd="https://www.freshports.org/net/py-magic-wormhole/" +openbsd="https://pypi.org/project/magic-wormhole/" +netbsd="https://pypi.org/project/magic-wormhole/" %}

Worth Mentioning

diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index cca3e64f..3ccab45c 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -14,8 +14,13 @@ labels="success:VoIP" website="https://signal.org/" forum="https://forum.privacytools.io/t/discussion-signal/664" github="https://github.com/signalapp" -android="" -ios="" +playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms" +windows="https://signal.org/download/" +mac="https://signal.org/download/" +linux="https://signal.org/download/" +playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms" +android="https://signal.org/android/apk/#apk-danger" +ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669" %} @@ -27,12 +32,13 @@ labels="warning:
Complete Comparison diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index 5248e5c5..d718ece0 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -17,7 +17,7 @@ description='Knoppix is an operating system based on Debian designed to be run d badges="info:GNU/Linux" labels="warning:contrib:This software may depend on or recommend non-free software." website="https://www.knopper.net/knoppix/index-en.html" -source="https://www.knopper.net/knoppix-info/index-en.html" +source="https://www.knopper.net/knoppix-info/index-en.html#license" %} {% include cardv2.html diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index 1e0021a1..e6cd694a 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -10,13 +10,15 @@ image="/assets/img/tools/Joplin.png" description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes." website="https://joplinapp.org/" github="https://github.com/laurent22/joplin" -windows="" -mac="" -linux="" -ios="" -android="" -firefox="" -chrome="" +windows="https://joplinapp.org/#desktop-applications" +mac="https://joplinapp.org/#desktop-applications" +linux="https://joplinapp.org/#desktop-applications" +freebsd="https://www.npmjs.com/package/joplin" +googleplay="https://joplinapp.org/images/BadgeAndroid.png" +android="https://joplinapp.org/#mobile-applications" +ios="https://itunes.apple.com/us/app/joplin/id1315599797" +firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/" +chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek" %} {% include cardv2.html @@ -25,12 +27,13 @@ image="/assets/img/tools/StandardNotes.png" description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors." website="https://standardnotes.org/" github="https://github.com/standardnotes" -windows="" -mac="" -linux="" -ios="" -android="" -web="" +windows="https://standardnotes.org/#get-started" +mac="https://standardnotes.org/#get-started" +linux="https://standardnotes.org/#get-started" +ios="https://itunes.apple.com/us/app/standard-notes/id1285392450" +fdroid="https://f-droid.org/packages/com.standardnotes/" +googleplay="https://play.google.com/store/apps/details?id=com.standardnotes" +web="https://app.standardnotes.org/" %} {% include cardv2.html @@ -39,10 +42,13 @@ image="/assets/img/tools/Turtl.png" description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with." website="https://turtlapp.com/" github="https://github.com/turtl" -windows="" -mac="" -linux="" -android="" +windows="https://turtlapp.com/download/" +mac="https://turtlapp.com/download/" +linux="https://turtlapp.com/download/" +googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl" +android="https://turtlapp.com/download/" +firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/" +chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml" %}

Warning

diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 9dc6d511..945b434d 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -31,8 +31,8 @@ image="/assets/img/tools/Debian.png" description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.' badges="info:GNU/Linux" website="https://www.debian.org/" -git="https://salsa.debian.org/qa/debsources" tor="http://sejnfjrq6szgca7v.onion" +gitlab="https://salsa.debian.org/qa/debsources" %}

Warning

diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html index c0f79ae6..aac8d968 100644 --- a/_includes/sections/password-managers.html +++ b/_includes/sections/password-managers.html @@ -13,14 +13,19 @@ forum="https://forum.privacytools.io/t/discussion-bitwarden/1343" github="https://github.com/bitwarden" web="https://vault.bitwarden.com/#/" - linux="https://vault.bitwarden.com/download/?app=desktop&platform=linux" - mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos" + windows="https://bitwarden.com/#download" + linux="https://bitwarden.com/#download" + freebsd="https://www.npmjs.com/package/@bitwarden/cli" + openbsd="https://www.npmjs.com/package/@bitwarden/cli" + netbsd="https://www.npmjs.com/package/@bitwarden/cli" + mac="https://bitwarden.com/#download" firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb" safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6" opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/" edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL" - android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" + fdroid="https://mobileapp.bitwarden.com/fdroid/" + googleplay="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8" %} @@ -32,9 +37,16 @@ website="https://keepassxc.org/" forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" github="https://github.com/keepassxreboot/keepassxc" - web="https://keepassxc.org/" + windows="https://keepassxc.org/download/#windows" linux="https://keepassxc.org/download/#linux" mac="https://keepassxc.org/download/#mac" + freebsd="https://www.freshports.org/security/keepassxc/" + openbsd="http://openports.se/security/keepassxc" + netbsd="http://pkgsrc.se/security/keepassxc" + fdroid="https://f-droid.org/packages/com.kunzisoft.keepass.libre/" + googleplay="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free" + firefox="https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser" + chrome="https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk" %} {% @@ -45,9 +57,14 @@ website="https://lesspass.com/" forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" github="https://github.com/lesspass/lesspass" + windows="https://pypi.org/project/lesspass/" + mac="https://pypi.org/project/lesspass/" + linux="https://pypi.org/project/lesspass/" + freebsd="https://pypi.org/project/lesspass/" firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/" chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih" - android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en" + fdroid="https://f-droid.org/packages/com.lesspass.android" + googleplay="https://play.google.com/store/apps/details?id=com.lesspass.android" %}

Worth Mentioning

diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html index 8c95490d..9f9e2004 100644 --- a/_includes/sections/productivity-tools.html +++ b/_includes/sections/productivity-tools.html @@ -19,9 +19,13 @@ website="https://etherpad.org/" forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538" github="https://github.com/ether/etherpad-lite" - windows="https://etherpad.org/#download" - linux="https://etherpad.org/#download" - mac="https://etherpad.org/#download" + web="https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad" + windows="https://github.com/ether/etherpad-lite#windows" + linux="https://github.com/ether/etherpad-lite#installation" + mac="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" + freebsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" + openbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" + netbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" %} {% @@ -33,11 +37,13 @@ forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539" tor="http://writeas7pm7rcdqg.onion" git="https://code.as/writeas" - web="https://write.as/apps" + web="https://write.as/pad" + windows="https://github.com/writeas/writeas-cli" + mac="https://github.com/writeas/writeas-cli" linux="https://write.as/apps" chrome="https://write.as/apps" - android="https://write.as/apps" - ios="https://write.as/apps" + googleplay="https://play.google.com/store/apps/details?id=com.abunchtell.writeas" + ios="https://itunes.apple.com/app/apple-store/id1000755153" %}

@@ -55,9 +61,12 @@ website="https://0xacab.org/jvoisin/mat2" forum="https://forum.privacytools.io/t/discussion-mat/1559" gitlab="https://0xacab.org/jvoisin/mat2" - linux="" - mac="" - windows="" + windows="https://pypi.org/project/mat2/" + mac="https://pypi.org/project/mat2/" + linux="https://pypi.org/project/mat2/" + freebsd="https://pypi.org/project/mat2/" + openbsd="https://pypi.org/project/mat2/" + netbsd="https://pypi.org/project/mat2/" %}

diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index db043aea..1f785d5e 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -8,7 +8,6 @@ badges="info:Linux" labels="warning:contrib:This software may depend on or recommend non-free software." website="https://openwrt.org/" git="https://git.openwrt.org/" -github="https://github.com/openwrt" %} {% include cardv2.html diff --git a/_includes/sections/social-networks.html b/_includes/sections/social-networks.html index 8acac077..30718d58 100644 --- a/_includes/sections/social-networks.html +++ b/_includes/sections/social-networks.html @@ -11,9 +11,16 @@ description='Mastodon is a social network based on open web protocols and free, website="https://joinmastodon.org/" forum="https://forum.privacytools.io/t/discussion-mastodon/289" github="https://github.com/tootsuite/mastodon" -android="" -ios="" -web="" +windows="https://joinmastodon.org/apps" +mac="https://joinmastodon.org/apps" +linux="https://joinmastodon.org/apps" +freebsd="https://joinmastodon.org/apps" +openbsd="https://joinmastodon.org/apps" +netbsd="https://joinmastodon.org/apps" +android="https://joinmastodon.org/apps" +sailfish="https://joinmastodon.org/apps" +ios="https://joinmastodon.org/apps" +web="https://joinmastodon.org/#getting-started" %} {% include cardv2.html @@ -23,8 +30,8 @@ description="diaspora* is based on three key philosophies: Decentralization, fre website="https://diasporafoundation.org/" forum="https://forum.privacytools.io/t/discussion-diaspora/290" github="https://github.com/diaspora/diaspora" -android="" -web="" +android="https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora#Android" +web="https://diasporafoundation.org/" %} {% include cardv2.html @@ -34,20 +41,21 @@ description="Friendica has an emphasis on extensive privacy settings and easy se website="https://friendi.ca/" forum="https://forum.privacytools.io/t/discussion-friendica/291" github="https://github.com/friendica/friendica" -windows="" -linux="" -android="" -web="" +windows="https://friendi.ca/resources/mobile-clients/" +linux="https://friendi.ca/resources/mobile-clients/" +android="https://friendi.ca/resources/mobile-clients/" +sailfish="https://friendi.ca/resources/mobile-clients/" +web="https://friendi.ca/" %} {% include cardv2.html title="PixelFed - Instagram Alternative" image="/assets/img/provider/pixelfed.png" description='A free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or join one.' -website="https://pixelfed.social/" +website="https://pixelfed.org/" forum="https://forum.privacytools.io/t/discussion-pixelfed/293" github="https://github.com/pixelfed" -web="" +web="https://pixelfed.org/" %} {% include cardv2.html @@ -56,12 +64,8 @@ image="/assets/img/provider/gnu-social.png" description="A social communication software for both public and private communications. It is widely supported and has a large userbase. It is already used by the Free Software Foundation." website="https://gnu.io/social/" forum="https://forum.privacytools.io/t/discussion-gnu-social/292" -github="https://github.com/foocorp/gnu-social" -android="" -ios="" -linux="" -windows="" -web="" +gitlab="https://git.gnu.io/gnu/gnu-social/" +web="https://gnu.io/social/" %}

Worth Mentioning

diff --git a/_includes/sections/social-news-aggregator.html b/_includes/sections/social-news-aggregator.html index 753727a9..20969791 100644 --- a/_includes/sections/social-news-aggregator.html +++ b/_includes/sections/social-news-aggregator.html @@ -8,15 +8,12 @@ title="Aether" image="/assets/img/tools/aether.png" description='Free/libre and open source decentralized social news aggregator with a built in voting system.' -website="https://github.com/nehbit/aether" +website="https://getaether.net/" forum="https://forum.privacytools.io/t/discussion-aether/1256" github="https://github.com/nehbit/aether" -windows="" -mac="" -linux="" -android="" -ios="" -bsd="" +windows="https://getaether.net/download/" +mac="https://getaether.net/download/" +linux="https://getaether.net/download/" %} {% include cardv2.html @@ -25,13 +22,8 @@ image="/assets/img/tools/tildes.png" description='Tildes is a web-based self-hostable online bulletin board. It is licensed under GPL 3.0.' website="https://tildes.net" forum="https://forum.privacytools.io/t/discussion-tildes/1257" -git="https://gitlab.com/tildes/" -windows="" -mac="" -linux="" -android="" -ios="" -bsd="" +gitlab="https://gitlab.com/tildes/tildes" +web="https://tildes.net" %} {% include cardv2.html @@ -40,12 +32,8 @@ image="/assets/img/tools/raddle.png" description="Raddle is a public Postmill instance focused on privacy and anti-censorship." website="https://raddle.me" forum="https://forum.privacytools.io/t/discussion-raddle/1258" -git="https://gitlab.com/postmill/" -windows="" -mac="" -linux="" -android="" -ios="" +gitlab="https://gitlab.com/postmill/" +web="https://raddle.me" %}

Worth Mentioning

diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 8196eba3..28649c53 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -13,11 +13,12 @@ website="https://rocket.chat/" forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223" github="https://github.com/rocketchat/" - android="" - ios="" - mac="" - windows="" - linux="" + windows="https://rocket.chat/install" + mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840" + linux="https://rocket.chat/install" + fdroid="https://f-droid.org/packages/chat.rocket.android" + googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android" + ios="https://itunes.apple.com/app/rocket-chat/id1148741252" %} {% @@ -30,12 +31,15 @@ forum="https://forum.privacytools.io/t/discussion-keybase/1224" tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/" github="https://github.com/Keybase" - android="" - ios="" - mac="" - windows="" - linux="" - web="" + windows="https://keybase.io/docs/the_app/install_windows" + mac="https://keybase.io/docs/the_app/install_macos" + linux="https://keybase.io/docs/the_app/install_linux" + freebsd="https://www.freshports.org/security/keybase/" + googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US" + ios="https://keybase.io/_/download/keybase-for-ios" + firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/" + chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj" + web="https://keybase.io/" %} diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html index 51f10040..13252fe7 100644 --- a/_includes/sections/voice-video-messenger.html +++ b/_includes/sections/voice-video-messenger.html @@ -11,12 +11,12 @@ website="https://www.linphone.org/" description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication." forum="https://forum.privacytools.io/t/discussion-linphone/751" github="https://github.com/BelledonneCommunications" -ios="" -android="" -windows="" -linux="" -mac="" -web="" +windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner" +linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner" +mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner" +fdroid="https://f-droid.org/packages/org.linphone" +googleplay="https://play.google.com/store/apps/details?id=org.linphone" +ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8" %} {% include cardv2.html @@ -26,9 +26,11 @@ website="https://mumble.info/" description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, it's missing end-to-end encryption, so self-hosting is recommended." forum="https://forum.privacytools.io/t/discussion-mumble/1289" github="https://github.com/mumble-voip/" -windows="" -linux="" -mac="" +windows="https://www.mumble.info/downloads" +linux="https://www.mumble.info/downloads" +mac="https://www.mumble.info/downloads" +android="https://www.mumble.info/downloads/#third-party-clients" +ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1" %}

Worth Mentioning

diff --git a/_sass/ptio-font.scss b/_sass/ptio-font.scss new file mode 100644 index 00000000..4ab4452e --- /dev/null +++ b/_sass/ptio-font.scss @@ -0,0 +1,54 @@ +/* + Icon Font: ptio-font +*/ + +@font-face { + font-family: "ptio-font"; + src: url("../webfonts/ptio-font.eot"); + src: url("../webfonts/ptio-font.eot?#iefix") format("embedded-opentype"), + url("../webfonts/ptio-font.woff2") format("woff2"), + url("../webfonts/ptio-font.woff") format("woff"), + url("../webfonts/ptio-font.ttf") format("truetype"), + url("../webfonts/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("../webfonts/ptio-font.svg#ptio-font") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.ptio-f-droid:before, +.ptio-ios:before, +.ptio-linux:before, +.ptio-macos:before, +.ptio-netbsd:before, +.ptio-openbsd:before, +.ptio-sailfish-os: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-ios:before { content: "\f101"; } +.ptio-linux:before { content: "\f107"; } +.ptio-macos:before { content: "\f102"; } +.ptio-netbsd:before { content: "\f103"; } +.ptio-openbsd:before { content: "\f104"; } +.ptio-sailfish-os:before { content: "\f106"; } diff --git a/assets/css/style.scss b/assets/css/style.scss index 1591b926..601fb38b 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -5,6 +5,7 @@ @import 'bootstrap'; @import 'flag-icon'; @import 'fontawesome'; +@import 'ptio-font'; @import 'sortable-theme-bootstrap'; body { @@ -188,6 +189,15 @@ footer { } } +.hover-text-decoration-none:hover { + text-decoration: none; + -webkit-text-decoration-skip: object; +} + +.table td, .table th { + vertical-align: middle; +} + /* * Navbar @@ -353,8 +363,3 @@ input#nav-toggle, font-size: 0.875em; content: "\f186"; } - -.table td, .table th { - vertical-align: middle; -} - diff --git a/assets/webfonts/ptio-font-preview.html b/assets/webfonts/ptio-font-preview.html new file mode 100644 index 00000000..b7608ff7 --- /dev/null +++ b/assets/webfonts/ptio-font-preview.html @@ -0,0 +1,309 @@ + + + + ptio-font glyphs preview + + + + + + + + + +
+
+

ptio-font contains 7 glyphs:

+ Toggle Preview Characters +
+ + +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ + + +
+ + diff --git a/assets/webfonts/ptio-font.eot b/assets/webfonts/ptio-font.eot new file mode 100644 index 00000000..da3e19b0 Binary files /dev/null and b/assets/webfonts/ptio-font.eot differ diff --git a/assets/webfonts/ptio-font.svg b/assets/webfonts/ptio-font.svg new file mode 100644 index 00000000..85940b6e --- /dev/null +++ b/assets/webfonts/ptio-font.svg @@ -0,0 +1,147 @@ + + + + + +Created by FontForge 20190801 at Tue Sep 10 20:23:41 2019 + By Dawid Potocki + + + + + + + + + + + + + + + + diff --git a/assets/webfonts/ptio-font.ttf b/assets/webfonts/ptio-font.ttf new file mode 100644 index 00000000..92f93e55 Binary files /dev/null and b/assets/webfonts/ptio-font.ttf differ diff --git a/assets/webfonts/ptio-font.woff b/assets/webfonts/ptio-font.woff new file mode 100644 index 00000000..8cb1c763 Binary files /dev/null and b/assets/webfonts/ptio-font.woff differ diff --git a/assets/webfonts/ptio-font.woff2 b/assets/webfonts/ptio-font.woff2 new file mode 100644 index 00000000..bd2cdebd Binary files /dev/null and b/assets/webfonts/ptio-font.woff2 differ diff --git a/font/Gemfile b/font/Gemfile new file mode 100644 index 00000000..6e854e65 --- /dev/null +++ b/font/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "fontcustom", "~> 2.0" diff --git a/font/Gemfile.lock b/font/Gemfile.lock new file mode 100644 index 00000000..0ace0a2a --- /dev/null +++ b/font/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + ffi (1.11.1) + fontcustom (2.0.0) + json (~> 1.4) + listen (>= 1.0, < 4.0) + thor (~> 0.14) + json (1.8.6) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby_dep (1.5.0) + thor (0.20.3) + +PLATFORMS + ruby + +DEPENDENCIES + fontcustom (~> 2.0) + +BUNDLED WITH + 2.0.1 diff --git a/font/LICENSE b/font/LICENSE new file mode 100644 index 00000000..b5d0c56e --- /dev/null +++ b/font/LICENSE @@ -0,0 +1,13 @@ +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/font/Makefile b/font/Makefile new file mode 100644 index 00000000..c1ceb61a --- /dev/null +++ b/font/Makefile @@ -0,0 +1,11 @@ +build: + bundle exec fontcustom compile -F + mv ptio-font.woff assets/webfonts + mv _sass/ptio-font.css ../_sass/ptio-font.scss + mv assets/webfonts/* ../assets/webfonts/ + sed -i -e 's/..\/assets\//..\//g' ../_sass/ptio-font.scss + +default: + build + +.PHONY: build diff --git a/font/README.md b/font/README.md new file mode 100644 index 00000000..769b1312 --- /dev/null +++ b/font/README.md @@ -0,0 +1,39 @@ +# ptio-font + +This font contains icons we need, which Font Awesome does not have. + +| Name | CSS class | Issue | +|--- |--- |--- | +| F-Droid | `ptio-f-droid` | https://github.com/FortAwesome/Font-Awesome/issues/15492 | +| iOS | `ptio-ios` | https://github.com/FortAwesome/Font-Awesome/issues/4935 | +| macOS | `ptio-macos` | https://github.com/FortAwesome/Font-Awesome/issues/4936 | +| OpenBSD | `ptio-openbsd` | https://github.com/FortAwesome/Font-Awesome/issues/5345 | +| NetBSD | `ptio-netbsd` | https://github.com/FortAwesome/Font-Awesome/issues/15496 | +| Sailfish OS | `ptio-sailfish-os` | https://github.com/FortAwesome/Font-Awesome/issues/15498 | + +We also have custom Linux icon (`ptio-linux`), because I (@dawidpotocki) made it before and looks cleaner. +And since we are bundling additional font anyway, why not. + +## Building + +To build the font, you will need some of the following tools installed. + +| Name | Notes | +|--- |--- | +| `make` | Use distro's package manager | +| `ruby` | Use distro's package manager | +| `bundler` | Run `gem install bundler` | +| | | +| | | +| `woff-tools` | Use distro's package manager | +| or | | +| `yarn` or `npm` | Use distro's package manager | +| `sfnt2woff` | Run `yarn global add sfnt2woff` or `npm install -g sfnt2woff` | + +Then just run the following commands to build the font: + +``` +$ cd font/ +$ bundle # it will install FontCustom +$ make build # it will build a font and css +``` diff --git a/font/fontcustom.yml b/font/fontcustom.yml new file mode 100644 index 00000000..22594e09 --- /dev/null +++ b/font/fontcustom.yml @@ -0,0 +1,15 @@ +font_name: ptio-font +css_selector: .ptio-{{glyph}} +preprocessor_path: "" +autowidth: false +no_hash: true +force: false +debug: false +quiet: false + +input: + vectors: svg + +output: + fonts: assets/webfonts + css: _sass diff --git a/font/svg/f-droid.svg b/font/svg/f-droid.svg new file mode 100644 index 00000000..de1391b2 --- /dev/null +++ b/font/svg/f-droid.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/ios.svg b/font/svg/ios.svg new file mode 100644 index 00000000..1be11979 --- /dev/null +++ b/font/svg/ios.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/linux.svg b/font/svg/linux.svg new file mode 100644 index 00000000..9649ed4f --- /dev/null +++ b/font/svg/linux.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/macos.svg b/font/svg/macos.svg new file mode 100644 index 00000000..97b0f62c --- /dev/null +++ b/font/svg/macos.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/netbsd.svg b/font/svg/netbsd.svg new file mode 100644 index 00000000..f98c870c --- /dev/null +++ b/font/svg/netbsd.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/openbsd.svg b/font/svg/openbsd.svg new file mode 100644 index 00000000..ba4f968b --- /dev/null +++ b/font/svg/openbsd.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/sailfish-os.svg b/font/svg/sailfish-os.svg new file mode 100644 index 00000000..1f77e6eb --- /dev/null +++ b/font/svg/sailfish-os.svg @@ -0,0 +1,2 @@ + +