Merge pull request mixxxdj#287 from ywwg/masto-backlink

Holzhaus · web-flow · commit 7b20c707f6bf · 2023-01-06T17:40:25.000+01:00
add links to mastodon including verification
diff --git a/pelicanconf.py b/pelicanconf.py
@@ -170,6 +170,7 @@ def __init__(self, url, title, context, css="", children=()):
 AUTHOR_METADATA = {
     "Mixxx Team": {
         "github": "mixxxdj",
+        "mastodon": "@mixxx@floss.social",
         "twitter": "mixxxdj",
         "facebook": "mixxxdj",
         "email": "core-team@mixxx.org",
diff --git a/theme/static/images/social_icons/LICENSE b/theme/static/images/social_icons/LICENSE
@@ -5,3 +5,7 @@ Copyright (c) 2015-present Ionic (http://ionic.io/)
 Zulip logo from https://github.com/zulip/zulip with changed fill values.
 Apache 2.0 License
 Copyright 2011-2018 Dropbox, Inc., Kandra Labs, Inc., and contributors
+
+Mastodon logo from https://commons.wikimedia.org/wiki/File:Mastodon_Logotype_(Simple).svg
+with edits to change the fill properties.
+Used under the posted guidelines: https://joinmastodon.org/trademark
diff --git a/theme/static/images/social_icons/mastodon.svg b/theme/static/images/social_icons/mastodon.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="61.076954mm"
+   height="65.47831mm"
+   viewBox="0 0 216.4144 232.00976"
+   version="1.1"
+   id="svg6"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <path
+     id="path2"
+     style="fill:#fff;fill-opacity:1;stroke-width:1.06667"
+     d="M 115.05664 0 C 83.417974 0.25866667 52.984047 3.6847447 35.248047 11.830078 C 35.248047 11.830078 0.072265625 27.564666 0.072265625 81.25 C 0.072265625 93.543333 -0.16667709 108.24208 0.22265625 123.83008 C 1.4999896 176.33141 9.8473382 228.07387 58.388672 240.92188 C 80.770005 246.84588 99.986891 248.08699 115.46289 247.23633 C 143.52822 245.68033 159.2832 237.2207 159.2832 237.2207 L 158.35742 216.85742 C 158.35742 216.85742 138.30134 223.18082 115.77734 222.41016 C 93.461344 221.64482 69.902302 220.00414 66.292969 192.60547 C 65.959635 190.1988 65.792969 187.62454 65.792969 184.92188 C 65.792969 184.92187 87.700224 190.27683 115.46289 191.54883 C 132.43889 192.32749 148.35801 190.55433 164.52734 188.625 C 195.53534 184.92233 222.5344 165.81671 225.92773 148.35938 C 231.2744 120.85937 230.83398 81.25 230.83398 81.25 C 230.83398 27.564666 195.66016 11.830078 195.66016 11.830078 C 177.92549 3.6847447 147.47265 0.25866667 115.83398 0 L 115.05664 0 z M 79.25 41.947266 C 92.428667 41.947266 102.40719 47.012531 109.00586 57.144531 L 115.42188 67.898438 L 121.83789 57.144531 C 128.43522 47.012531 138.41375 41.947266 151.59375 41.947266 C 162.98308 41.947266 172.15997 45.951052 179.16797 53.761719 C 185.9613 61.572385 189.34375 72.130682 189.34375 85.416016 L 189.34375 150.41992 L 163.58984 150.41992 L 163.58984 87.326172 C 163.58984 74.026172 157.99411 67.275391 146.80078 67.275391 C 134.42478 67.275391 128.22266 75.282521 128.22266 91.117188 L 128.22266 125.65234 L 102.62109 125.65234 L 102.62109 91.117188 C 102.62109 75.282521 96.417016 67.275391 84.041016 67.275391 C 72.847682 67.275391 67.251953 74.026172 67.251953 87.326172 L 67.251953 150.41992 L 41.498047 150.41992 L 41.498047 85.416016 C 41.498047 72.130682 44.881115 61.572385 51.675781 53.761719 C 58.682448 45.951052 67.859333 41.947266 79.25 41.947266 z "
+     transform="scale(0.93749999)" />
+</svg>
diff --git a/theme/templates/footer.html b/theme/templates/footer.html
@@ -14,6 +14,12 @@ <h2 class="docs-header">Pages</h2>
         <h2 class="docs-header">Community</h2>
         <ul>
           <li><a href="https://mixxx.discourse.group/">Forums</a></li>
+          <li>
+            <a rel="me" class="mastodon social_icon" href="https://floss.social/@mixxx" target="_blank">
+              <img src="{{ SITEURL }}/theme/images/social_icons/mastodon.svg" alt="Mastodon">
+              <span>Mastodon</span>
+            </a>
+          </li>
           <li>
             <a class="twitter social_icon" href="https://twitter.com/mixxxdj" target="_blank">
               <img src="{{ SITEURL }}/theme/images/social_icons/twitter.svg" alt="Twitter">
diff --git a/theme/templates/pages/index.html b/theme/templates/pages/index.html
@@ -14,6 +14,11 @@
       <h2>{% trans %}DJ Your Way{% endtrans %}</h2>
       <p>Free and open source DJ software for Windows, macOS, and Linux</p>
       <ul class="splash-social">
+        <li>
+          <a rel="me" class="mastodon social_icon" href="https://floss.social/@mixxx" target="_blank">
+            <img src="{{ SITEURL }}/theme/images/social_icons/mastodon.svg" alt="Mastodon" title="Follow Mixxx on Mastodon">
+          </a>
+        </li>
         <li>
           <a class="twitter social_icon" href="https://twitter.com/mixxxdj" target="_blank">
             <img class="drop-shadow" src="{{ SITEURL }}/theme/images/social_icons/twitter.svg" alt="Twitter" title="Follow Mixxx on Twitter">
diff --git a/theme/templates/social_links.html b/theme/templates/social_links.html
@@ -1,4 +1,10 @@
 <ul class="social_links">
+  <li>
+    <a rel="me" class="mastodon social_icon" href="https://floss.social/@mixxx" target="_blank">
+      <img src="{{ SITEURL }}/theme/images/social_icons/mastodon.svg">
+      <span>Mastodon</span>
+    </a>
+  </li>
   <li>
     <a class="twitter social_icon" href="https://twitter.com/mixxxdj" target="_blank">
       <img src="{{ SITEURL }}/theme/images/social_icons/twitter.svg">
