From 81dd9f0ce1344ad2953479cc1705612efa9d2e4b Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 21:47:57 +0300 Subject: [PATCH 01/12] Add Code of Conduct (#1283) --- CODE_OF_CONDUCT.md | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..c03da44c --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,88 @@ +# privacytools.io Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to make participation in our project and +our community a harassment-free experience for everyone, regardless of a +distinction of any kind, such as age, body size, disability, ethnicity, sex +characteristics, gender identity and expression, level of experience, +education, socio-economic status, nationality, personal appearance, race, +religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention + or advances +* Trolling, insulting/derogatory, antagonistic comments and personal or + political attacks +* Promoting intolerance +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of +acceptable behavior and are expected to take appropriate and fair +corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem +inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies within all project spaces, and it also applies +when an individual is representing as a part of the project or its +community in public spaces. + +Examples of representing a project or community include using an official +project e-mail address, posting via an official social media account, or +acting as an appointed representative at an online or offline event. +Representation of a project may be further defined and clarified by +project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting blacklight447 via email on +blacklight447@privacytools.io or [any team member on our forum]. +The reports should include information on whether they can be shared to +other team members and how much may be told. + +[any team member on our forum]:https://forum.privacytools.io/g/team + +All complaints will be reviewed and investigated and will result in a +response that is deemed necessary and appropriate to the circumstances. +The project team is obligated to maintain confidentiality with regard to the +reporter of an incident. Further details of specific enforcement policies +may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is forked from and licensed under Creative Commons +BY-4.0, [Contributor Covenant version 1.4] by privacytools.io, which you can +[find on our GitHub repository]. + +[find on our GitHub repository]:https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md +[Contributor Covenant version 1.4]:https://contributor-covenant.org/version/1/4 -- 2.47.2 From 060491c4a6138b0eb8f771ace4d0f92efa483855 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Mon, 9 Sep 2019 10:21:33 +1200 Subject: [PATCH 02/12] Add our new custom icon font and fix platform links Fixes #1250, #1249 --- .gitignore | 2 + _includes/cardv2.html | 102 ++++-- .../sections/browser-recommendation.html | 27 +- _includes/sections/cloud-storage.html | 18 +- _includes/sections/dns.html | 6 +- _includes/sections/email-clients.html | 4 +- _includes/sections/password-managers.html | 1 + _includes/sections/social-networks.html | 38 ++- .../sections/social-news-aggregator.html | 28 +- _sass/ptio-font.scss | 52 ++++ assets/css/style.scss | 15 +- assets/webfonts/ptio-font-preview.html | 294 ++++++++++++++++++ assets/webfonts/ptio-font.eot | Bin 0 -> 4376 bytes assets/webfonts/ptio-font.svg | 123 ++++++++ assets/webfonts/ptio-font.ttf | Bin 0 -> 4200 bytes assets/webfonts/ptio-font.woff | Bin 0 -> 2976 bytes assets/webfonts/ptio-font.woff2 | Bin 0 -> 2384 bytes font/Gemfile | 5 + font/Gemfile.lock | 27 ++ font/LICENSE | 13 + font/Makefile | 11 + font/README.md | 12 + font/fontcustom.yml | 15 + font/svg/f-droid.svg | 2 + font/svg/ios.svg | 2 + font/svg/macos.svg | 2 + font/svg/netbsd.svg | 2 + font/svg/openbsd.svg | 2 + font/svg/sailfish-os.svg | 2 + 29 files changed, 709 insertions(+), 96 deletions(-) create mode 100644 _sass/ptio-font.scss create mode 100644 assets/webfonts/ptio-font-preview.html create mode 100644 assets/webfonts/ptio-font.eot create mode 100644 assets/webfonts/ptio-font.svg create mode 100644 assets/webfonts/ptio-font.ttf create mode 100644 assets/webfonts/ptio-font.woff create mode 100644 assets/webfonts/ptio-font.woff2 create mode 100644 font/Gemfile create mode 100644 font/Gemfile.lock create mode 100644 font/LICENSE create mode 100644 font/Makefile create mode 100644 font/README.md create mode 100644 font/fontcustom.yml create mode 100644 font/svg/f-droid.svg create mode 100644 font/svg/ios.svg create mode 100644 font/svg/macos.svg create mode 100644 font/svg/netbsd.svg create mode 100644 font/svg/openbsd.svg create mode 100644 font/svg/sailfish-os.svg diff --git a/.gitignore b/.gitignore index bd3e973d..fab475b9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ _site/ .sass-cache/ .jekyll-metadata .DS_Store +font/assets/ +font/.fontcustom-manifest.json diff --git a/_includes/cardv2.html b/_includes/cardv2.html index bc055202..bfe97090 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -92,7 +92,7 @@
{% if include.windows %} {% if include.windows != "" %} - + {% else %} @@ -102,17 +102,17 @@ {% if include.mac %} {% if include.mac != "" %} - - + + {% else %} - + {% endif %} {% endif %} {% if include.linux %} {% if include.linux != "" %} - + {% else %} @@ -120,9 +120,9 @@ {% 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 %} @@ -182,7 +202,7 @@ {% if include.android %} {% if include.android != "" %} - + {% else %} @@ -190,33 +210,53 @@ {% endif %} {% endif %} - {% if include.ios %} - {% if include.ios != "" %} - - + {% if include.fdroid %} + {% if include.fdroid != "" %} + + {% else %} - + {% endif %} {% endif %} - {% if include.fire %} - {% if include.fire != "" %} - - + {% if include.googleplay %} + {% if include.googleplay != "" %} + + {% 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 %} @@ -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-recommendation.html b/_includes/sections/browser-recommendation.html index e4dde461..e1969768 100644 --- a/_includes/sections/browser-recommendation.html +++ b/_includes/sections/browser-recommendation.html @@ -8,12 +8,15 @@ recommendations: WebRTC and 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/_sass/ptio-font.scss b/_sass/ptio-font.scss new file mode 100644 index 00000000..6318fc70 --- /dev/null +++ b/_sass/ptio-font.scss @@ -0,0 +1,52 @@ +/* + 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-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-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..a820c2be --- /dev/null +++ b/assets/webfonts/ptio-font-preview.html @@ -0,0 +1,294 @@ + + + + ptio-font glyphs preview + + + + + + + + + +
+
+

ptio-font contains 6 glyphs:

+ Toggle Preview Characters +
+ + +
+
+ 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 0000000000000000000000000000000000000000..be46dc6b9a9459e83f50bbb5b0e3331f1c92188c GIT binary patch literal 4376 zcmds5Ym8(^b*@uYx9Yz7KDuw;JG0Z%&zZivGdsOK-96nq#_X(-cQIh_#>5U0IC#9f zvk$yGtDS`aKfn?Qfk6mGF$fScphO4~fp#G%lCg}4@*v8eD2Zf{C88kZp9NL`OMqth z>UMj*k*x4Px93)!bL!MrkMpQoGZ!;>9Xf@93SgKn~i*?D%I?G;*AS(EkgTW7tZ?t^FSwNcPu z1~0KEm|$m4pZ>$Qe(K9l{RgIYKcuw>-hOQGz{~IY4V2yi{?W5nwy(X^dimGjpU3;) z+4tROvY75=OdLhKys*7@?ce}NEP{;L7asq>&e!YlyU>0gW9|zV&u^bg9{$olq3s2{ z6PvGUt^EZO|%~e-@Lkg z<^1NKEn_=^CCI*aZFld+Uw`iT5@X?iqWx^KHmvWHANk?W-W}fkOXf{&@}n>I{u1rX z)CcGH~B6%v=8V6ZnH15AbNB(~i=lKzc8 z!z_sJrycNboYlW%^X#K{`UTqPwkv=+vvcYkdxAAzQuO_U@3S7}c8}4)`^wV<_sneM zZ$OA0ovzF%zycT*kMTS6)@FV02WL=fOu{kDdZ#OHz9e5#=*2K5Gt|LPLmB?BHIsUE z0%V4IbvQ71fID;ZDgXboEPS1<%zpn&hv}>0FXVTvt5_~C?D2Ve2pgeU?ne zjGkr72>!d+o7qF`5flEEL4(G_)*zdVUq^$qnuL@tQldJocK7u(n&jP$(Ri4)Rgw?Q0p|ndSeD#S>H*XD0i`yiWjT*#20Y6`?YUZJjYpE;zf3!d z+UdtmH73pVK5#eBH0oKU+DNP6d~oEh72|;>4o+hKPQoT0tFQ$VNt2CXwTpF*u|o5j zHDia0oyvxF!g4o8$H?s9Ak8{G>X_|oP@Sqtz&q_OU-c_NPzfG-&(_v^ww}5t&+o~% zR(K;zYe$=J82-UJtP9BzTZerUV35HD7|yqNpJuQ2x~S;&sCiOUG&l93BDl!ymf3tyPu|2a}C<2fw_Fr4|0t?h)Ek`gf;Pa`um+ zq~=1i{MMDGke1MPzV3d*b@#u-Ey1;`H9_cXz6As+b?;ET44EaApeIZ2{ukU*$)z2) zG#|b5vHY;Nz@^qr@37<2+uThqEZ(=Ej^Y{NsCBBY@@EPbL-mcVV&tA*W6d9fhyci>*fk;hsH2Xbhp#i@cALO5F3$q(L5Rs@Jkz%W~1A(Ng+d=DUIF} z6LYK7t|n$v$3Siyf63Y^ONN7dl=rhX#y}g4(rE()$|Ez#Dq7%j}-3|;j1ZoGyn~d|B8OPlW7Tg#Qu*AYy!64d!Wl&TO4CAkcHX|6nHItY^ zPlg3_k5*}ljnNb6OyKl+H!Y$!||wX-oC03pk(*aB#+^0SIghWCAUy}C}^ zwxl4sRXcgC+Zk@vwaa764;JU@)hJ1qYn}4^XtjRqzQg;U=UQm7RFWjfmP94nc8Iv< z90hpawJn-21;p=Y7K-y_zohEI^Bhasm9U)n(k9O(dy{)Y04pd9$;q;jodgN=54KX* ziv-UqULrj121FLz*Mb(MAs1X^Qbd;VM=Or}H$2V?}GUq+~ijR;t3uiCh(UemRJ+4?4s`E1|2EUkT&OmNg%?0^|pS zV|fz?n1JEpNF7!Xy4A6TXLieW%x-CPBIj$mI`awm*38$%@u< zu+ooJ7J9L#pE~S#zC1M7v=P4FLP~}eEc)gOSxcO+DW@jIn&Vfb$Xs`RS zY?W;=+!0{S@g&VurZnM5ogpDvDYZ!2f;y4USPY=?7C!Dtu zRr$pFoZ{l>LSz1?T=(-s$>9=gES0KrWgR{GPQ{}Lf$o>1Q)_;vkj#jpGl!MFp}8OW zx?XFQb^%xECL0u&=O(_no38;jl^@49`6k{0=Cuxrod){p-Rl?5HwV3b^RDLY zAweHs+guy;*P-=)&+Yf#oH-s|`K&EE$&yQv-g828TCdRz$2KPzw+ z;QTPTS|RD|tev~Qd+D6Gw7X|r**?3wr>>sA@z~xuy?gEaRn*?z_NB*nF6~`h+ubv$ Vg!`izsql**T|WM#5#D*v{vB|N2hjik literal 0 HcmV?d00001 diff --git a/assets/webfonts/ptio-font.svg b/assets/webfonts/ptio-font.svg new file mode 100644 index 00000000..89ef0e9f --- /dev/null +++ b/assets/webfonts/ptio-font.svg @@ -0,0 +1,123 @@ + + + + + +Created by FontForge 20190801 at Mon Sep 9 10:18:13 2019 + By Dawid Potocki + + + + + + + + + + + + + + + diff --git a/assets/webfonts/ptio-font.ttf b/assets/webfonts/ptio-font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..226c3a3779d65d858d5b5f03b8c973ef006b11c4 GIT binary patch literal 4200 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 J>#OeB{{{rO^;Q4? literal 0 HcmV?d00001 diff --git a/assets/webfonts/ptio-font.woff b/assets/webfonts/ptio-font.woff new file mode 100644 index 0000000000000000000000000000000000000000..ade7c8db9d945d4bba266fccaed221c332eb956e GIT binary patch literal 2976 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 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..b68aa4ba --- /dev/null +++ b/font/README.md @@ -0,0 +1,12 @@ +# 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` | | 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..33b645dc --- /dev/null +++ b/font/svg/ios.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 @@ + + -- 2.47.2 From a8b467fd1aeb1cc628ebde48f39e21124ce1804d Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Mon, 9 Sep 2019 11:54:42 +1200 Subject: [PATCH 03/12] gitignore font/_sass --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fab475b9..4dac60c7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ _site/ .jekyll-metadata .DS_Store font/assets/ +font/_sass/ font/.fontcustom-manifest.json -- 2.47.2 From a0936af79e4a0ba59203818e039d6a8ae80d0e1c Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 07:39:00 +1200 Subject: [PATCH 04/12] Exclude 'font/' from Jekyll build --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index 355e9fe6..f560684c 100644 --- a/_config.yml +++ b/_config.yml @@ -8,3 +8,4 @@ plugins: sitemap: file: "/sitemap.xml" include: [".well-known"] +exclude: ["font"] -- 2.47.2 From 59c664be789c4464e586bcf18dfd02f2b87c140d Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 16:53:00 +1200 Subject: [PATCH 05/12] Move Android icon after F-Droid and Google Play --- _includes/cardv2.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index bfe97090..d66e9bef 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -200,16 +200,6 @@ {% endif %} {% endif %} - {% if include.android %} - {% if include.android != "" %} - - - - {% else %} - - {% endif %} - {% endif %} - {% if include.fdroid %} {% if include.fdroid != "" %} @@ -230,6 +220,16 @@ {% endif %} {% endif %} + {% if include.android %} + {% if include.android != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + {% if include.ios %} {% if include.ios != "" %} -- 2.47.2 From 934abffed513da674a2a0bba4348a4095fa772ca Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 16:57:46 +1200 Subject: [PATCH 06/12] Add building font notes --- font/README.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/font/README.md b/font/README.md index b68aa4ba..9b9c9bfc 100644 --- a/font/README.md +++ b/font/README.md @@ -9,4 +9,28 @@ This font contains icons we need, which Font Awesome does not have. | 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` | | +| Sailfish OS | `ptio-sailfish-os` | https://github.com/FortAwesome/Font-Awesome/issues/15498 | + +## 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 +``` -- 2.47.2 From f79b26a7d60f9e8a2d2a27ff968b6a8bbbbb7b40 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 16:58:21 +1200 Subject: [PATCH 07/12] Fix all the other sections --- _includes/sections/browser-addons.html | 57 +++++++++---------- .../sections/calendar-contacts-sync.html | 12 +++- _includes/sections/cloud-storage.html | 7 +-- _includes/sections/email-alternatives.html | 13 +++-- _includes/sections/email-clients.html | 20 ++++--- _includes/sections/file-encryption.html | 23 +++++--- _includes/sections/file-sharing.html | 23 +++++--- _includes/sections/instant-messenger.html | 22 ++++--- .../sections/live-operating-systems.html | 2 +- _includes/sections/notebooks.html | 40 +++++++------ _includes/sections/operating-systems.html | 2 +- _includes/sections/password-managers.html | 26 +++++++-- _includes/sections/productivity-tools.html | 27 ++++++--- _includes/sections/router-firmware.html | 1 - _includes/sections/teamchat.html | 26 +++++---- _includes/sections/voice-video-messenger.html | 20 ++++--- 16 files changed, 191 insertions(+), 130 deletions(-) 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 Worth Mentioning diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index bbf0e8b8..5a67b9fd 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -29,10 +29,9 @@ description="S4 (Simple Secure Storage Service) is Least Authority's verifiably website="https://leastauthority.com/" forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288" github="https://github.com/LeastAuthority" -windows="" -mac="" -linux="" -freebsd="" +windows="https://github.com/gridsync/gridsync#installation-and-running" +mac="https://github.com/gridsync/gridsync#installation-and-running" +linux="https://github.com/gridsync/gridsync#installation-and-running" %} diff --git a/_includes/sections/email-alternatives.html b/_includes/sections/email-alternatives.html index 94c48ff8..64eee0fa 100644 --- a/_includes/sections/email-alternatives.html +++ b/_includes/sections/email-alternatives.html @@ -8,9 +8,9 @@ meaning that you need-not inherently trust any entities like root certificate au website="https://bitmessage.org/" forum="https://forum.privacytools.io/t/discussion-bitmessage/661" github="https://github.com/Bitmessage/PyBitmessage" -windows="" -mac="" -linux="" +windows="https://github.com/Bitmessage/PyBitmessage/releases" +mac="https://github.com/Bitmessage/PyBitmessage/releases" +linux="https://repology.org/project/pybitmessage/versions" %} {% include cardv2.html @@ -20,9 +20,10 @@ description="Retroshare creates encrypted connections to your friends. Nobody ca website="https://retroshare.cc/" forum="https://forum.privacytools.io/t/discussion-retroshare/662" github="https://github.com/RetroShare/RetroShare" -windows="" -mac="" -linux="" +windows="https://retroshare.cc/downloads.html#windows" +mac="https://retroshare.cc/downloads.html#mac" +linux="https://retroshare.cc/downloads.html#gnulinux" +freebsd="https://retroshare.cc/downloads.html#freebsd" %} diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html index 9327f207..f1f8f814 100644 --- a/_includes/sections/email-clients.html +++ b/_includes/sections/email-clients.html @@ -7,10 +7,12 @@ description="Thunderbird is a free, open source, cross-platform email, newsgroup website="https://www.thunderbird.net/" forum="https://forum.privacytools.io/t/discussion-thunderbird/659" source="https://hg.mozilla.org/comm-central/" -windows="" -mac="" -linux="" -freebsd="" +windows="https://www.thunderbird.net/en-US/" +mac="https://www.thunderbird.net/en-US/" +linux="https://www.thunderbird.net/en-US/" +freebsd="https://www.freshports.org/mail/thunderbird/" +openbsd="http://openports.se/mail/mozilla-thunderbird" +netbsd="http://pkgsrc.se/mail/thunderbird" %} {% include cardv2.html @@ -20,10 +22,12 @@ description="Claws Mail is a free and open source, GTK-based email and news clie website="https://www.claws-mail.org/" forum="https://forum.privacytools.io/t/discussion-claws-mail/660" git="https://git.claws-mail.org/" -windows="" -mac="" -linux="" -freebsd="" +windows="https://www.claws-mail.org/win32/" +mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F" +linux="https://www.claws-mail.org/downloads.php?section=downloads" +freebsd="https://www.freshports.org/mail/claws-mail/" +openbsd="http://openports.se/mail/claws-mail" +netbsd="http://pkgsrc.se/mail/claws-mail" %} diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html index aa99e83b..f66d584a 100644 --- a/_includes/sections/file-encryption.html +++ b/_includes/sections/file-encryption.html @@ -24,11 +24,15 @@ description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government." website="https://gnupg.org/" forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533" - git="https://gnupg.org/download/git.html" - windows="https://gnupg.org/download/index.html" - linux="https://gnupg.org/download/index.html" - mac="https://gnupg.org/download/index.html" - android="https://gnupg.org/download/index.html" + git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git" + windows="https://gpg4win.org/download.html" + linux="https://gnupg.org/download/index.html#binary" + freebsd="https://www.freshports.org/security/gnupg/" + openbsd="http://openports.se/security/gnupg" + netbsd="http://pkgsrc.se/security/gnupg" + mac="https://gpgtools.org/" + fdroid="https://f-droid.org/app/org.sufficientlysecure.keychain" + googleplay="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain" %} {% @@ -38,9 +42,12 @@ description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 180+ archive formats." website="http://www.peazip.org" forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534" - source="https://sourceforge.net/projects/peazip/files/" - windows="https://www.peazip.org/" - linux="https://www.peazip.org/" + source="https://osdn.net/projects/peazip" + windows="https://www.peazip.org/peazip-64bit.html" + linux="https://www.peazip.org/peazip-linux.html" + freebsd="https://www.freshports.org/archivers/peazip/" + openbsd="https://www.peazip.org/peazip-bsd.html" + netbsd="https://www.peazip.org/peazip-bsd.html" %}

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 4efa0a13..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,10 +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" %} {% @@ -46,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/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

-- 2.47.2 From 02810cca3c744a0a356420f373531e2d122cd82f Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 17:38:01 +1200 Subject: [PATCH 08/12] Add rounded rectangle to the iOS icon --- assets/webfonts/ptio-font.eot | Bin 4376 -> 4432 bytes assets/webfonts/ptio-font.svg | 19 ++++++++++--------- assets/webfonts/ptio-font.ttf | Bin 4200 -> 4256 bytes assets/webfonts/ptio-font.woff | Bin 2976 -> 2988 bytes assets/webfonts/ptio-font.woff2 | Bin 2384 -> 2436 bytes font/svg/ios.svg | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/assets/webfonts/ptio-font.eot b/assets/webfonts/ptio-font.eot index be46dc6b9a9459e83f50bbb5b0e3331f1c92188c..7b81c0df2dc232e12b743323935b8d4950ce7652 100644 GIT binary patch delta 579 zcmYjOOK1~O6g@BVNybU?Cdte+F__Fu?W7SWCYhON!A}rMB`ZV0FH(Y5U0AK!g+jFm zU5IvJm_=P!sM3|Vhy+}S*y74%mkQ#-g)Vd_b|ux95W&T}@7#0GJ-mD0V{6kAjwgWC zwy>XHS{ZM)>-WNI!goMfY`;IUYaT%4(v{m6W2YD20o*Y_RxVGsE~sZ>pM%}Rnferd z&iFFZ=`*ccvp7dy0^|V8jjOGh=^Mtk6F~eFR5`w6ecx&CmiTJvm6RBM)~sX5~I(yFeCmhBDoQ{O9*eZ=;?np@R}+@4rd^F-H} zk7XC`65eYxyzSpCQqz>EEYk(~^<+gaX7^O)++5Dht&&mGDn`>O-BcAtBSzuysFyLd zWFpPpIB52IM%zyxrgro!GQN{@(*D`>NZq#Ujh%TTOVv0pM3T`sjb-xrOff1%)F@Th zwg7<*ycGg@zy>a&ds6H~3L}{BFA(4%;ne^OQ1E4dMMxwZl&Di|pbQR#mzXw*X9Fz2 tz{UWJjQO<=_Y1D^<$Qm{ToR#`=}I(hMFccjW&*=r5YgbJ+j@ delta 491 zcmcbhG((A1LXd$WV`5_3~6C#jY& zFz~4W#r72B7niJ=euI~Rf&T$eKAC|LNCI(p^U3$|{5D@1xS4n(-Rn>R4p zGI44!E@EE7vW+!w^Ec+{jP$k0OilC|)l5Mu#Fh0Jm6g~;MdTUf7)3?+n3R>&n6!C>`S^tS zLbL7dv+buks;fJy+iNk&i;KzVC^#7h8Zv4zN{fn0X^W zMA5a>#idl -Created by FontForge 20190801 at Mon Sep 9 10:18:13 2019 +Created by FontForge 20190801 at Tue Sep 10 17:35:44 2019 By Dawid Potocki @@ -19,7 +19,7 @@ Created by FontForge 20190801 at Mon Sep 9 10:18:13 2019 panose-1="2 0 5 3 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="0 -64.0039 512.014 447.998" + bbox="0 -64.0039 512.014 448" underline-thickness="25.6" underline-position="-51.2" unicode-range="U+0020-F106" @@ -39,12 +39,13 @@ c0 65.3486 -53.2041 118.553 -118.552 118.553zM255.998 183.253c53.7549 0 97.0977 l-0.00292969 -0.00195312c-32.5244 0 -60.0645 -22.4082 -68.1191 -52.5068h36.2764c6.25879 11.125 18.0098 18.6348 31.8438 18.6348c20.4668 0 36.6953 -16.2285 36.6953 -36.6953s-16.2285 -36.6953 -36.6953 -36.6953c-14.7617 0 -27.2246 8.49902 -33.0781 20.8838 h-35.6152c7.25195 -31.2285 35.3633 -54.7568 68.6953 -54.7568c38.7725 0 70.5684 31.7949 70.5684 70.5693c0 38.7734 -31.7959 70.5684 -70.5684 70.5684z" /> +d="M125.831 448h260.341c69.7109 0 125.831 -56.1201 125.831 -125.831v-260.341c0 -69.7109 -56.1201 -125.831 -125.831 -125.831h-260.341c-69.7109 0 -125.831 56.1201 -125.831 125.831v260.341c0 69.7109 56.1201 125.831 125.831 125.831zM59.2627 96.6289h32.8428 +v139.813h-32.8428v-139.813zM75.6191 254.78c10.2881 0 18.334 7.91406 18.334 17.8066c0 10.0244 -8.0459 17.9385 -18.334 17.9385c-10.1572 0 -18.2021 -7.91406 -18.2021 -17.9385c0 -9.89355 8.0459 -17.8066 18.2021 -17.8066zM201.456 290.132 +c-55.5283 0 -90.3516 -37.8545 -90.3516 -98.4004s34.8174 -98.2686 90.3516 -98.2686c55.3975 0 90.2197 37.7227 90.2197 98.2686s-34.8174 98.4004 -90.2197 98.4004zM201.456 261.111c33.9004 0 55.5283 -26.9062 55.5283 -69.3799 +c0 -42.3398 -21.6309 -69.249 -55.5283 -69.249c-34.0312 0 -55.5283 26.9062 -55.5283 69.249c0 42.4746 21.5 69.3799 55.5283 69.3799zM305.53 150.183c1.45117 -35.0879 30.2061 -56.7168 73.9971 -56.7168c46.0342 0 75.0547 22.6865 75.0547 58.8281 +c0 28.3584 -16.3564 44.3203 -55.0029 53.1543l-21.8955 5.0127c-23.3467 5.54004 -32.9775 12.9268 -32.9775 25.5898c0 15.8281 14.5098 26.3789 36.0088 26.3789c21.7637 0 36.6689 -10.6846 38.251 -28.4893h32.4492 +c-0.791992 33.5029 -28.4883 56.1914 -70.4346 56.1914c-41.4199 0 -70.834 -22.8184 -70.834 -56.585c0 -27.1699 16.6191 -44.0576 51.7051 -52.1006l24.666 -5.80371c24.0049 -5.67188 33.7686 -13.5859 33.7686 -27.3027c0 -15.8281 -15.96 -27.1699 -38.9092 -27.1699 +c-23.2129 0 -40.7568 11.4756 -42.8652 29.0205h-32.9775z" /> - + -- 2.47.2 From 2dbc7461336a7a9b6b45aad57c53ce15e5a35802 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 18:09:58 +1200 Subject: [PATCH 09/12] Add custom Linux icon, why not --- _includes/cardv2.html | 4 ++-- _sass/ptio-font.scss | 2 ++ assets/webfonts/ptio-font-preview.html | 17 ++++++++++++++- assets/webfonts/ptio-font.eot | Bin 4432 -> 5236 bytes assets/webfonts/ptio-font.svg | 29 ++++++++++++++++++++++--- assets/webfonts/ptio-font.ttf | Bin 4256 -> 5060 bytes assets/webfonts/ptio-font.woff | Bin 2988 -> 3540 bytes assets/webfonts/ptio-font.woff2 | Bin 2436 -> 2880 bytes font/README.md | 3 +++ font/svg/linux.svg | 2 ++ 10 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 font/svg/linux.svg diff --git a/_includes/cardv2.html b/_includes/cardv2.html index d66e9bef..13fdab57 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -113,10 +113,10 @@ {% if include.linux %} {% if include.linux != "" %} - + {% else %} - + {% endif %} {% endif %} diff --git a/_sass/ptio-font.scss b/_sass/ptio-font.scss index 6318fc70..4ab4452e 100644 --- a/_sass/ptio-font.scss +++ b/_sass/ptio-font.scss @@ -26,6 +26,7 @@ [data-icon]:before, .ptio-f-droid:before, .ptio-ios:before, +.ptio-linux:before, .ptio-macos:before, .ptio-netbsd:before, .ptio-openbsd:before, @@ -46,6 +47,7 @@ .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"; } diff --git a/assets/webfonts/ptio-font-preview.html b/assets/webfonts/ptio-font-preview.html index a820c2be..b7608ff7 100644 --- a/assets/webfonts/ptio-font-preview.html +++ b/assets/webfonts/ptio-font-preview.html @@ -163,6 +163,7 @@ [data-icon]:before, .ptio-f-droid:before, .ptio-ios:before, +.ptio-linux:before, .ptio-macos:before, .ptio-netbsd:before, .ptio-openbsd:before, @@ -183,6 +184,7 @@ .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"; } @@ -202,7 +204,7 @@
-

ptio-font contains 6 glyphs:

+

ptio-font contains 7 glyphs:

Toggle Preview Characters
@@ -233,6 +235,19 @@
+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp diff --git a/assets/webfonts/ptio-font.eot b/assets/webfonts/ptio-font.eot index 7b81c0df2dc232e12b743323935b8d4950ce7652..5d81b15bd5af0f77ed833a5b56a8574b12f14dca 100644 GIT binary patch delta 1197 zcmYLI&2Jk;6rcCzYj@ zlO-;2KuEz7NEHX9UV7nxa_J=^E&KsoEA<9~Tct`MK$M!d0mRJC$M1dq=FQIc*)J#6 zZp_$sm3@_q){X1S`_F%n#h)=&xycx7oPA|&c=nH1kuf+=`1On18#@n9{PySmkJ+^H zB}tq&x88r_kBL4y5+V;lY4!Zzflm4kfe|2N~^4qPS&oNfoCD}JS*WTHE@xrGgc7;{O zWbhUPnrSRwztMUveD+snh%L3dU)-1fu4?{peuy0I5O&x<>SG_cGe2Z~Wb=oNAwP~( zxct}TvBb>o!xG$``S_gCa5O(+eTsBub`A$P|7-RUu7N(dh3kMiIryEI%v2Zo;3nK= zFSASRJ@yIviv0u;W1Xa`v_-A7>UDdnt1YyPeIE&SCwZ@XdOXRguj7Ou^>KH+j-z1{ zRT?)TP0~aUi#biWqPe>cqbBHqPEvBtbf(gLFg@MPC&NUOe;>3;o0tys5yk5Dq1SC^ zdSHR)-8G<`#DLgjDkB;c+d^7o$tU!!!!d(A9aiIlUXSbw>t0rX*m80tlB1lG7razE zk$Io@`cvrjdD~L1-hh^vLKi(wlj39?K93*}X;~!;jR3%Ow7)E!a(&s2>nfDe0R)sb z5U3P#FIx$k3Hi#=yKtq;2bz|6o6tFrmMR7%mPRNE+f&_Ehk(sPKZ)rtpYA` zp*+`c9~T`V9A8%I)(CFN9zfufvTBI}IoGLMqSJ5+1mFtv%GIi_hW={V7zd577ZB@Q zfC5mFP$eOVhHI)aa)g$ilpGxgYfJr6qa$1OER8Bl?abOnWKXsq?-Ye9MewvSh?0KJ zvMV^2rfDQk86uHDpgFpc^Mdrya0sQV$dEf0<)cHtquL>$ivcGFh{~3CV8JJ&K-Ca_h>~clTy1rA6=mNBlRQ Cm7UfA delta 388 zcmeyOaY2bKK#+l9fxtvIGnSsYu7MLBnv_^yGcX9WFfcI4_y_A7`G1f3&A`AI0puqn z=Oz|>RQ&#H;uEEMff}F)M|w_W8gFFFAqEC!4+aKqfsE9|6p<+2dqBB6Kx~!)6kz_$ zcob-Y2#~Lmky}#1V$2`_1Gg}lVv z)FOrFVGIm>Ko>CXFUT)0Su_0xFGD7SfCNxMG6N%!1mZx~xjpgxHeVUInScTe3^(UI z+W@2g|NFn6iJ1}TNCplDh%{Iao!DPn>PKaMxbTP cj7*Hoj4X_-jBJeTlVwD7C;N*?b0ORY08*V>LI3~& diff --git a/assets/webfonts/ptio-font.svg b/assets/webfonts/ptio-font.svg index 6a002170..7955a125 100644 --- a/assets/webfonts/ptio-font.svg +++ b/assets/webfonts/ptio-font.svg @@ -5,7 +5,7 @@ --> -Created by FontForge 20190801 at Tue Sep 10 17:35:44 2019 +Created by FontForge 20190801 at Tue Sep 10 18:07:02 2019 By Dawid Potocki @@ -19,10 +19,10 @@ Created by FontForge 20190801 at Tue Sep 10 17:35:44 2019 panose-1="2 0 5 3 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="0 -64.0039 512.014 448" + bbox="-0.00811547 -64.0039 512.014 448" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+0020-F106" + unicode-range="U+0020-F107" /> + + -- 2.47.2 From cd44d5631492982108dc8c045d2a0c87d69e1e77 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 20:10:43 +1200 Subject: [PATCH 10/12] gitignore assets/webfonts/ptio-font-preview.html --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4dac60c7..e6cb179f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ _site/ font/assets/ font/_sass/ font/.fontcustom-manifest.json +assets/webfonts/ptio-font-preview.html -- 2.47.2 From e2688dd62ebe96cf04a668c0ca8b146773703c91 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 20:18:07 +1200 Subject: [PATCH 11/12] Fix Travis --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index f560684c..eac523d4 100644 --- a/_config.yml +++ b/_config.yml @@ -8,4 +8,4 @@ plugins: sitemap: file: "/sitemap.xml" include: [".well-known"] -exclude: ["font"] +exclude: ["font", "vendor"] -- 2.47.2 From 4f51b47e22844fe3dd951e80f4c0a68813000ef1 Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Tue, 10 Sep 2019 20:24:36 +1200 Subject: [PATCH 12/12] Center Linux icon --- assets/webfonts/ptio-font.eot | Bin 5236 -> 5232 bytes assets/webfonts/ptio-font.svg | 48 ++++++++++++++++---------------- assets/webfonts/ptio-font.ttf | Bin 5060 -> 5056 bytes assets/webfonts/ptio-font.woff | Bin 3540 -> 3528 bytes assets/webfonts/ptio-font.woff2 | Bin 2880 -> 2884 bytes 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/webfonts/ptio-font.eot b/assets/webfonts/ptio-font.eot index 5d81b15bd5af0f77ed833a5b56a8574b12f14dca..da3e19b082366b2247e592ed72354a2087d4819b 100644 GIT binary patch delta 821 zcmYjPJ8KkC6u#%&*Ua3VxwEsgGg-}RceA@$0&C1Bvk0eq)A*DY+@qv}=Nks6T`})57o%3BT_xt3RNx2d;_IgeB#MaNs z_S(^V>hx2_N>A3dj+}hV7;~;(zkB7t#Mf2E_zA{>$)(E+m*TVMAJN$kjckbs{tezS z22_bnEZw+uM|9aC!Y>GqUteBa@OFZi`Dv)1TOsz<%JR)y$1gnWlFc+Jt}&pQ#&+fB z*1SFZgBc`(u}|xP|8E`q9&93qw}c(`_joS{-VQcd2if3v{sEpNYj51gWq^3&7mv&^ zYY#TzBfMd!*hO}mJz&q+XRwSl5*_DF+blt^*~=(qJJ84O%qXgIK5xtItUC(2rjs;l zHEX)2(rmib%z874CUpn3N=GrB=|eAHw~bXokS1A=dLQO?>t*Ro8n>DhO4kC=s#V(s z0oO{CV>hGH6k632IorXx4zxO=9sp^k>wBtLt2j-lRA0dR5CV}FRkDA-k6;?wj455J zj5+0sv{J5WdKoVLfTIz@vr{og&|$Tbj{6Q6Q>gl30jX)hUrThTE2SvK<<@gXrUO+_ zpioH#LIGDgRF)T9>H5A1xD-|d1>bV5VVuXtxDI+KU6kZ1IHFn<;-DRx(qo7A?UFL& zb&@*aKBFy4jYAQ*90hn@h&~LvTspogReZyRF94BisVR>(T%~RVK-UN2J;A*wE~_vo z=)6^&Ld)|r#YV%i5V_=BOhef=5@Z6t=BVk)$E1gbgLENZFIKUr^Ebtb!+tfb%aPei uJA__T2qNpbiVH1VkRx)>O&b&?dLhNlFmG7!%Lo;1gj5^V=meVoe&Qcf<#QVV delta 849 zcmYjPO^6gn6t4GP{d9MAcg^(lbnlG2v*V020KdekGB3f_QM}S2=B_Z8<&4yJFq1LofINoUb}SuVtQu& z7Uy2^EY>(c@8B;XfR)6dwd)(d%87^=|H-(0ZT-Ue;8pyrJPqBm8ytQ5)B4XFCw{y$ z<~9>%Tou48&&BPB?Q`zv2Vs!|Li~IGjr!{K?9*%)30^Sv#FzAb4ZN7`iXn>Gr}8B{ z!P$R1zu`JSw)2q^JHJ;2kKnmDB`%6z#BK3dyoQPpy{xXwzU$X;+MgC|lm28C$D(jxxjaAsC&vFdr4;@`3AZ#*nul&x$FJRoE9S z@=-k<^x3rO#LORb_COkw(T01D3)W^cx|^wDNP{5^hSZILNh|D9%{;a=&scAj;9dnH znI}4H&PM>YXTnA0C5=TtZER|%lm`f?;z**_NP#<&A{y73%iFPsV6E*$m52~XOZi-( zr}lP+fiL60v{qsrY7ItePzqE~)lP=KvQ3DkmX6{ua#9;ONNHdL4}FpWN+KYnO_YFg zp4^!=W5_1Ngeo>LOkF}>4mD+h^?fU`2Z5Rt5GPC$mD*N zFGH*Y;7bgWdfn7rxSUw)p$$zFu|X0vfUZbgEx)VQ$n&r~Rqb_^HIVp{u$ouYl4aEl zB17m`yyGfBOW?}w>Ol%DmAlnLN9|mrHm4URjim}qlQ2$P;AsUvsf diff --git a/assets/webfonts/ptio-font.svg b/assets/webfonts/ptio-font.svg index 7955a125..85940b6e 100644 --- a/assets/webfonts/ptio-font.svg +++ b/assets/webfonts/ptio-font.svg @@ -5,7 +5,7 @@ --> -Created by FontForge 20190801 at Tue Sep 10 18:07:02 2019 +Created by FontForge 20190801 at Tue Sep 10 20:23:41 2019 By Dawid Potocki @@ -19,7 +19,7 @@ Created by FontForge 20190801 at Tue Sep 10 18:07:02 2019 panose-1="2 0 5 3 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="-0.00811547 -64.0039 512.014 448" + bbox="0 -64.0039 512.014 448" underline-thickness="25.6" underline-position="-51.2" unicode-range="U+0020-F107" @@ -47,28 +47,28 @@ c0 28.3584 -16.3564 44.3203 -55.0029 53.1543l-21.8955 5.0127c-23.3467 5.54004 -3 c-0.791992 33.5029 -28.4883 56.1914 -70.4346 56.1914c-41.4199 0 -70.834 -22.8184 -70.834 -56.585c0 -27.1699 16.6191 -44.0576 51.7051 -52.1006l24.666 -5.80371c24.0049 -5.67188 33.7686 -13.5859 33.7686 -27.3027c0 -15.8281 -15.96 -27.1699 -38.9092 -27.1699 c-23.2129 0 -40.7568 11.4756 -42.8652 29.0205h-32.9775z" /> +d="M451.886 44.2285l-0.000976562 0.00292969c11.0996 -12.3984 15.8984 -21.4971 15.499 -29.6963c-0.5 -8.2002 -6.49902 -13.7998 -13.8994 -18.2988c-14.8994 -8.99902 -37.2979 -15.7988 -50.8965 -32.1973c-14.2002 -16.8984 -31.6992 -26.5977 -48.2969 -27.8975 +c-16.5 -1.30078 -31.998 6.29883 -40.2979 22.998v0.0996094c-1.09961 2.09961 -1.89941 4.39941 -2.49902 6.69922c-21.498 -1.19922 -40.1963 5.2998 -55.0947 4.09961c-21.999 -1.19922 -35.7979 -6.49902 -48.2969 -6.59863 +c-4.7998 -10.5996 -14.2988 -17.5986 -25.8984 -20.1992c-15.9971 -3.69922 -36.0957 0 -55.8936 10.3994c-18.4971 9.79883 -41.9961 8.89941 -59.2949 12.499c-8.69922 1.7998 -16.2979 4.99902 -20.0977 12.2988c-3.7002 7.29883 -3 17.2979 2.19922 31.6973 +c1.7002 5.09961 0.400391 12.6992 -0.799805 20.7979c-0.599609 3.90039 -1.2002 7.89941 -1.2002 11.7998c0 4.29883 0.700195 8.49902 2.7998 12.3984c4.5 8.5 11.7998 12.0986 18.499 14.499s12.7988 4 16.999 8.2998c5.19922 5.49902 10.0986 14.3984 16.5977 20.1982 +c-2.59961 17.1963 0.200195 35.3955 6.2002 53.2939c12.5967 37.8975 39.1953 74.1934 58.0938 96.6914c16.0986 22.8975 20.7988 41.2959 22.498 64.6943c1.10059 31.7969 -24.4971 135.389 77.8945 135.188c80.8936 -0.0996094 76.2949 -85.3916 75.7949 -131.288 +c-0.300781 -30.0977 16.2979 -50.4961 33.3965 -71.9951c15.2002 -18 35.0986 -44.2969 46.4971 -74.3936c9.2998 -24.6006 12.8994 -51.7969 3.7002 -79.0947c1.39941 -0.5 2.7998 -1.2002 4.09961 -2c1.39941 -0.799805 2.7002 -1.7998 4 -2.89941 +c6.59863 -5.59961 8.69922 -14.2988 10.499 -22.3984c1.89941 -8.09863 3.59961 -15.6982 7.19922 -19.6982zM255.603 360.714h0.000976562c-3.19922 -7.19922 -3.89941 -14.8984 -2.89941 -21.7979c3.59961 -0.900391 8.89941 -2.40039 12.999 -4.39941 +c-2.09961 12.1982 4.49902 23.498 11.7988 22.998c8.89941 -0.300781 13.8984 -15.499 9.09961 -27.2979c-0.800781 -1.90039 -2.7998 -3.40039 -3.90039 -4.59961c6.69922 -2.30078 10.999 -4.10059 12.5986 -4.90039c7.90039 9.5 10.7998 26.1982 4.2998 40.3975 +c-9.7998 21.3984 -34.1973 21.7979 -43.9971 -0.400391zM214.905 372.214l0.000976562 -0.00195312c-18.8994 0 -23.998 -37.4951 -8.39941 -52.0938c7.79883 5.69922 6.89941 4.69922 5.89941 5.49902c-8 6.89941 -6.59961 27.3975 1.7998 28.0977 +c6.29883 0.5 10.7988 -10.6992 9.59863 -19.5986c3.09961 2.10059 6.69922 3.60059 10.1992 4.59961c1.7002 19.2988 -8.99902 33.498 -19.0986 33.498zM202.571 304.373v0.000976562c-4.67871 -4.16504 2.83789 -10.7852 9.23438 -15.0332 +c7.7998 -4.59961 11.999 -11.499 19.998 -14.999c2.59961 -1.09961 5.7002 -1.89941 9.59961 -2.09961c18.3984 -1.09961 27.0977 11.2988 38.1973 14.8984c9.13184 2.93262 27.8037 17.0635 12.1982 22.1064c-11.2988 4.89941 -16.2979 5.2002 -22.5977 9.2998 +c-10.2988 6.59863 -18.7979 8.89844 -25.8975 8.89844c-14.3994 0 -23.2129 -9.7832 -27.8984 -14.1982c-0.513672 -0.485352 -6.63477 -4.27441 -12.834 -8.87402zM198.104 -17.0264l-0.000976562 -0.000976562c2.10059 20.5 -24.9951 34.9072 -34.4941 54.8057 +l-19.5977 35.5967c-6.7998 9.19922 -13.7988 14.7988 -21.8984 15.999c-7.69922 1.19922 -12.1992 -1.40039 -17.2988 -6.89941c-4.7998 -5.09961 -8.7998 -12.2998 -14.2988 -17.999c-7.7998 -6.49902 -3.46777 -3.30859 -13.7666 -7.00879 +c-6.2998 -2.19922 -9.67383 1.18066 -13.1729 -5.51855c-2.7002 -4.99902 -2.10059 -12.1992 -0.900391 -19.998c1.2002 -7.89941 3 -16.2988 0.600586 -23.8984v-0.200195c-5 -13.6982 -5 -18.8076 -2.60059 -23.5068c7.90039 -15.3994 38.7402 -1.04199 68.6377 -16.8408 +c31.3965 -16.3994 66.0918 -19.6279 68.791 15.4697zM203.207 11.0391h-0.000976562c37.5967 -25.6973 82.1943 -15.6982 114.291 7.19922c3.2002 11 6.2998 13.7119 6.7998 21.4111c0.799805 15.1992 1.59961 28.6982 4.39941 39.8975 +c3.09961 12.5986 9.2998 23.0977 21.3984 27.2979c2.2998 21.0977 18.6992 21.0977 38.2969 12.498c7.74512 -0.880859 18.4053 -13.8916 -24.2979 3.69141c-5.29883 29.0977 -17.498 62.9043 -23.5977 74.3027c-11.5 21.3975 -29.498 61.7178 -37.1973 92.1143 +c-4.5 -6.39941 -12.3994 -11.8984 -22.2979 -14.998c-4.7002 -1.5 -9.69922 -5.5 -15.8994 -9c-13.8994 -7.99902 -29.998 -8.79883 -42.3965 1.2002c-4.5 3.59961 -7.99902 7.59961 -12.5986 10.2988c-1.60059 0.900391 -5.09961 3.2998 -6.2002 4.10059 +c-2 -37.7979 -27.2979 -81.7168 -39.2969 -109.114c-8.2998 -19.6973 -13.1992 -59.9453 -13.7988 -80.6436c-50.0469 44.9688 11.1963 143.627 -15.5986 27.9473c3.5 -11.1982 11.0996 -21.498 24.5977 -29.8975c0 0 24.7988 -14.2979 38.2979 -32.4971 +c7.39941 -9.99902 9.69922 -18.6982 7.39941 -24.8975c-2.5 -6.7002 -9.59961 -8.89941 -16.6992 -8.89941c4.7998 -6 5.60254 -6.40527 14.3994 -12.0117zM450.692 14.4092h0.00195312c1.61133 9.45215 -6.78027 17.3408 -12.0107 24.373 +c-10 11.3008 -7.10352 30.2266 -16.9805 38.752c-6.92188 5.97363 -6.30957 8.30957 -14.5107 8.71191c-7.7002 -8.79883 -25.7988 -19.5977 -38.3975 -16.2988c-11.499 2.90039 -17.998 10.293 -18.7979 23.4912c-0.299805 -0.199219 -0.700195 -0.299805 -1 -0.5 +c-7.09961 -3.89941 -4.96777 -4.79199 -7.56738 -15.0918c-2.5 -10.1992 -3.40039 -23.498 -4.2002 -38.6973c-0.700195 -11.7998 -6.19922 -26.3984 -9.89941 -40.5967c-3.49902 -13.1992 -6.50391 -17.6836 -1.80371 -28.7832 +c7.19922 -14.498 13.8164 -20.3359 28.0146 -19.2363c14.1982 1.10059 28.6523 10.9092 41.8516 26.6074c21.9971 26.5977 54.4004 20.4707 55.2998 37.2686z" />