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 00000000..be46dc6b 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..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 00000000..226c3a37 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..ade7c8db 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..02a6a25a 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..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 @@ + +