From 8a18980dfaf64f880f4930c55648d7bc06f27055 Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Thu, 24 Sep 2020 00:53:15 +0100 Subject: [PATCH 1/3] Add Mastodon button using NickKaramoff's toot.karamoff.dev --- README.md | 13 +++++++++++-- docs/index.html | 9 +++++++-- src/networks.js | 5 +++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a13b82e..7861dca 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ classes match the names of social networks:
+ @@ -117,8 +118,8 @@ on the whole container or on the specific buttons: Apart from the URL and title, some networks support extra parameters: - add `data-media` to an Odnoklassniki, Pinterest, or VK button to customize the pinned picture -- add `data-text` to a WhatsApp, Telegram or Viber button to add custom message text -- add `data-via` to a Twitter button to mention a user +- add `data-text` to a WhatsApp, Mastodon, Telegram or Viber button to add custom message text +- add `data-via` to a Twitter or Mastodon button to mention a user Here are all the custom parameters in their glory: @@ -129,6 +130,14 @@ Here are all the custom parameters in their glory: Pin + Send
``` + +## Copyright + +Includes the +[Mastodon logo](https://commons.wikimedia.org/wiki/File:Mastodon_Logotype_%28Simple%29.svg), +which is licensed under the +[APGLv3 license](https://www.gnu.org/licenses/agpl.html) or later. diff --git a/docs/index.html b/docs/index.html index f5eea3b..0f3a142 100644 --- a/docs/index.html +++ b/docs/index.html @@ -68,6 +68,7 @@ style="text-align: center"> + @@ -186,6 +187,7 @@ shareon();
<div class="shareon">
     <a class="facebook"></a>
     <a class="linkedin"></a>
+    <a class="mastodon"></a>
     <a class="messenger"></a>
     <a class="odnoklassniki"></a>
     <a class="pinterest"></a>
@@ -200,6 +202,7 @@ shareon();
+ @@ -241,8 +244,8 @@ shareon();

@@ -255,6 +258,7 @@ shareon(); <a class="pinterest" data-media="https://picsum.photos/500">Pin</a> <a class="telegram" data-text="Check this out!"></a> <a class="twitter" data-via="MyNickname"></a> + <a class="mastodon" data-text="Check this out!" data-via="@MyNickname@myserver.social"></a> <a class="whatsapp">Send</a> </div>

@@ -263,6 +267,7 @@ shareon(); Pin + Send
diff --git a/src/networks.js b/src/networks.js index a403183..1142cf2 100644 --- a/src/networks.js +++ b/src/networks.js @@ -38,6 +38,11 @@ const NETWORKS = { iconWhenText: 'data:image/svg+xml,%3Csvg fill="%23fff" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433a2.062 2.062 0 01-2.063-2.065 2.064 2.064 0 112.063 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"/%3E%3C/svg%3E', url: (d) => `https://www.linkedin.com/shareArticle?mini=true&url=${d.url}&title=${d.title}`, }, + mastodon: { + color: '#1f232b', + icon: 'data:image/svg+xml,%3Csvg fill="%23fff" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M23.193 7.879c0-5.206-3.411-6.732-3.411-6.732C18.062.357 15.108.025 12.041 0h-.076c-3.068.025-6.02.357-7.74 1.147 0 0-3.411 1.526-3.411 6.732 0 1.192-.023 2.618.015 4.129.124 5.092.934 10.109 5.641 11.355 2.17.574 4.034.695 5.535.612 2.722-.15 4.25-.972 4.25-.972l-.09-1.975s-1.945.613-4.129.539c-2.165-.074-4.449-.233-4.799-2.891a5.499 5.499 0 01-.048-.745s2.125.52 4.817.643c1.646.075 3.19-.097 4.758-.283 3.007-.359 5.625-2.212 5.954-3.905.517-2.665.475-6.507.475-6.507zm-4.024 6.709h-2.497V8.469c0-1.29-.543-1.944-1.628-1.944-1.2 0-1.802.776-1.802 2.312v3.349h-2.483v-3.35c0-1.536-.602-2.312-1.802-2.312-1.085 0-1.628.655-1.628 1.944v6.119H4.832V8.284c0-1.289.328-2.313.987-3.07.68-.758 1.569-1.146 2.674-1.146 1.278 0 2.246.491 2.886 1.474L12 6.585l.622-1.043c.64-.983 1.608-1.474 2.886-1.474 1.104 0 1.994.388 2.674 1.146.658.757.986 1.781.986 3.07v6.304z"/%3E%3C/svg%3E', + url: (d) => `https://toot.karamoff.dev/?text=${d.title}%0D%0A${d.url}${d.text ? `%0D%0A%0D%0A${d.text}` : ''}${d.via ? `%0D%0A%0D%0A${d.via}` : ''}`, + }, messenger: { color: '#0099FF', icon: 'data:image/svg+xml,%3Csvg fill="%23fff" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M0 11.64C0 4.95 5.24 0 12 0s12 4.95 12 11.64-5.24 11.64-12 11.64c-1.21 0-2.38-.16-3.47-.46a.96.96 0 00-.64.05L5.5 23.92a.96.96 0 01-1.35-.85l-.07-2.14a.97.97 0 00-.32-.68A11.39 11.39 0 010 11.64zm8.32-2.19l-3.52 5.6c-.35.53.32 1.14.82.75l3.79-2.87c.26-.2.6-.2.87 0l2.8 2.1c.84.63 2.04.4 2.6-.48l3.52-5.6c.35-.53-.32-1.13-.82-.75l-3.79 2.87c-.25.2-.6.2-.86 0l-2.8-2.1a1.8 1.8 0 00-2.61.48z"/%3E%3C/svg%3E', From 72dcc913210031a6e0d9189f820cf99b35264916 Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Thu, 24 Sep 2020 00:57:55 +0100 Subject: [PATCH 2/3] Note that the Mastodon logo was modified --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7861dca..4e53ee4 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ Here are all the custom parameters in their glory: ## Copyright -Includes the +Includes a modified version of the [Mastodon logo](https://commons.wikimedia.org/wiki/File:Mastodon_Logotype_%28Simple%29.svg), which is licensed under the [APGLv3 license](https://www.gnu.org/licenses/agpl.html) or later. From ad3e7627824bf43df0a27ec616a53d3e9fdbaabe Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Thu, 24 Sep 2020 16:13:31 +0100 Subject: [PATCH 3/3] Update Mastodon colour to the correct one for a white logo. Co-authored-by: Nikita Karamov --- src/networks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/networks.js b/src/networks.js index 1142cf2..1d65ca7 100644 --- a/src/networks.js +++ b/src/networks.js @@ -39,7 +39,7 @@ const NETWORKS = { url: (d) => `https://www.linkedin.com/shareArticle?mini=true&url=${d.url}&title=${d.title}`, }, mastodon: { - color: '#1f232b', + color: '#3088D4', icon: 'data:image/svg+xml,%3Csvg fill="%23fff" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M23.193 7.879c0-5.206-3.411-6.732-3.411-6.732C18.062.357 15.108.025 12.041 0h-.076c-3.068.025-6.02.357-7.74 1.147 0 0-3.411 1.526-3.411 6.732 0 1.192-.023 2.618.015 4.129.124 5.092.934 10.109 5.641 11.355 2.17.574 4.034.695 5.535.612 2.722-.15 4.25-.972 4.25-.972l-.09-1.975s-1.945.613-4.129.539c-2.165-.074-4.449-.233-4.799-2.891a5.499 5.499 0 01-.048-.745s2.125.52 4.817.643c1.646.075 3.19-.097 4.758-.283 3.007-.359 5.625-2.212 5.954-3.905.517-2.665.475-6.507.475-6.507zm-4.024 6.709h-2.497V8.469c0-1.29-.543-1.944-1.628-1.944-1.2 0-1.802.776-1.802 2.312v3.349h-2.483v-3.35c0-1.536-.602-2.312-1.802-2.312-1.085 0-1.628.655-1.628 1.944v6.119H4.832V8.284c0-1.289.328-2.313.987-3.07.68-.758 1.569-1.146 2.674-1.146 1.278 0 2.246.491 2.886 1.474L12 6.585l.622-1.043c.64-.983 1.608-1.474 2.886-1.474 1.104 0 1.994.388 2.674 1.146.658.757.986 1.781.986 3.07v6.304z"/%3E%3C/svg%3E', url: (d) => `https://toot.karamoff.dev/?text=${d.title}%0D%0A${d.url}${d.text ? `%0D%0A%0D%0A${d.text}` : ''}${d.via ? `%0D%0A%0D%0A${d.via}` : ''}`, },