diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 74af2f96..26eeb34c 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -78,16 +78,12 @@ {% endif %} {% if include.tor %} - Tor + data-original-title="Requires specific software to access: torproject.org"> + {% endif %} {% if include.i2p %} diff --git a/_sass/_vars.scss b/_sass/_vars.scss index e3f4d624..3f405561 100644 --- a/_sass/_vars.scss +++ b/_sass/_vars.scss @@ -24,3 +24,4 @@ $reddit: #ff5700; $linkedin: #4875b4; $email: #444; $diaspora: #2f3537; +$tor: #7d4698; diff --git a/_sass/ptio-font.scss b/_sass/ptio-font.scss index 472edbd5..058512e5 100644 --- a/_sass/ptio-font.scss +++ b/_sass/ptio-font.scss @@ -32,7 +32,8 @@ .ptio-mix:before, .ptio-netbsd:before, .ptio-openbsd:before, -.ptio-sailfish-os:before { +.ptio-sailfish-os:before, +.ptio-tor:before { display: inline-block; font-family: "ptio-font"; font-style: normal; @@ -48,7 +49,7 @@ } .ptio-f-droid:before { content: "\f100"; } -.ptio-i2p-garlic:before { content: "\f10a"; } +.ptio-i2p-garlic:before { content: "\f10c"; } .ptio-ios:before { content: "\f101"; } .ptio-linux:before { content: "\f102"; } .ptio-macos:before { content: "\f103"; } @@ -56,3 +57,4 @@ .ptio-netbsd:before { content: "\f104"; } .ptio-openbsd:before { content: "\f105"; } .ptio-sailfish-os:before { content: "\f106"; } +.ptio-tor:before { content: "\f10b"; } diff --git a/assets/css/dark.scss b/assets/css/dark.scss index b4bd072e..af63f410 100644 --- a/assets/css/dark.scss +++ b/assets/css/dark.scss @@ -99,6 +99,9 @@ img { border-color: darken($danger, 10%); } +.btn-tor { background: desaturate($tor, 10%); } +.btn-tor:hover { background: darken($tor, 5%); } + .card { box-shadow: none !important; } diff --git a/assets/css/style.scss b/assets/css/style.scss index 2ef5510a..8b969301 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -202,12 +202,21 @@ footer { vertical-align: middle; } + .btn-icon { font-size: 1.5rem; padding: 0.5rem; border-radius: 0.25rem; display: flex; height: 2.4rem; + color: #ddd; +} + +.btn-tor { + background: $tor; +} +.btn-tor:hover { + background: darken($tor, 5%); } diff --git a/assets/img/layout/tor.png b/assets/img/layout/tor.png deleted file mode 100644 index 95a698a3..00000000 Binary files a/assets/img/layout/tor.png and /dev/null differ diff --git a/assets/img/layout/tor.svg b/assets/img/layout/tor.svg deleted file mode 100644 index ee116050..00000000 --- a/assets/img/layout/tor.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/webfonts/ptio-font.eot b/assets/webfonts/ptio-font.eot index 7a99ea90..c0fd15e4 100644 Binary files a/assets/webfonts/ptio-font.eot and b/assets/webfonts/ptio-font.eot differ diff --git a/assets/webfonts/ptio-font.svg b/assets/webfonts/ptio-font.svg index f19245ae..8e812895 100644 --- a/assets/webfonts/ptio-font.svg +++ b/assets/webfonts/ptio-font.svg @@ -1,11 +1,11 @@ -Created by FontForge 20190801 at Tue Nov 5 22:26:01 2019 +Created by FontForge 20190801 at Wed Nov 6 20:45:23 2019 By Dawid Potocki @@ -22,7 +22,7 @@ Created by FontForge 20190801 at Tue Nov 5 22:26:01 2019 bbox="-0.00195312 -64.0049 512.014 448" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+0020-F10A" + unicode-range="U+0020-F10C" /> - + diff --git a/assets/webfonts/ptio-font.ttf b/assets/webfonts/ptio-font.ttf index 6a6a4827..06ccba79 100644 Binary files a/assets/webfonts/ptio-font.ttf and b/assets/webfonts/ptio-font.ttf differ diff --git a/assets/webfonts/ptio-font.woff b/assets/webfonts/ptio-font.woff index 4c9f0a3a..8310d2f5 100644 Binary files a/assets/webfonts/ptio-font.woff and b/assets/webfonts/ptio-font.woff differ diff --git a/assets/webfonts/ptio-font.woff2 b/assets/webfonts/ptio-font.woff2 index e6b6194d..03f91b94 100644 Binary files a/assets/webfonts/ptio-font.woff2 and b/assets/webfonts/ptio-font.woff2 differ diff --git a/font/svg/tor.svg b/font/svg/tor.svg new file mode 100644 index 00000000..b372ffde --- /dev/null +++ b/font/svg/tor.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +