From d1747ed54b0b1926de9c32609578cf6d9834a077 Mon Sep 17 00:00:00 2001
From: Set Hallstrom <set@hallstrom.ch>
Date: Tue, 8 Sep 2020 22:45:08 +0200
Subject: [PATCH] finish

---
 _config.yml         |   4 ++
 _includes/seo.html  | 138 +++++++++++++++++++++++++++++++++++++++++++-
 _layouts/post.html  |  62 +++++++++++++-------
 _layouts/track.html |   8 +--
 _sass/_layout.scss  |  16 ++---
 5 files changed, 195 insertions(+), 33 deletions(-)

diff --git a/_config.yml b/_config.yml
index 793b5ed..eb07596 100644
--- a/_config.yml
+++ b/_config.yml
@@ -42,6 +42,10 @@ social:
 
 shop_url: https://shop.basspistol.com/?ref=basspistol.com
 
+## Matomo
+matomo_site_id: '3'
+matomo_container: 'fHO88MfH'
+
 categories:
   - releases
   - highlights
diff --git a/_includes/seo.html b/_includes/seo.html
index a6f5cbf..d4bdce1 100644
--- a/_includes/seo.html
+++ b/_includes/seo.html
@@ -1,7 +1,141 @@
 <meta charset="utf-8" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!-- 
+..............................................  
+.............................................. 
+...........'';,...............................
+.........'',,;:o:,............................ 
+.......',;;::::::;;;,.........................
+.....,;:ooooooooooo;,,''''....................
+....,;ooooooooooooooo;,'..'''''...............             
+...,:ooooooooooooooooo;''......'''............          
+..,;:ooooooooooooooooo',,.........,'..........   _______                         _         _         __
+..,,;:,ooooo;;:ooo;o,:;,',.........;,''.......   \____  \____  _____ __________ |_| ______/ |_  ___ |  |   
+..,'..,,;:o,''.,;;'''..'';,,,,,,''',;'''......    |  | _/\__ \/  __//  __/\___ \| |/  __/\   _\/   \|  |  
+..,'......':ooo:.......'';,'''''''',;,,,......    |  | _/\__ \/  __//  __/\___ \| |/  __/\   _\/   \|  | 
+..,,.......,:o:'.......,'oooo:::::;:,.',;,....    |  | _/\__ \/  __//  __/\___ \| |/  __/\   _\/   \|  | 
+..','.................',,..'',,,;;;;;;,.,:....    |  |  \ / _ \__ \ \__ \ | |_> > |\__ \  | | (  <> )  |__              
+...,,'...............',;oooooooooo:;;:,;oo,...    |____ /(___ /___ >___  >|  __/|_/____ > |_|  \___/|____/ 
+....,,'.............,,;ooooooooo;,..'',oooo,..        \/    \/   \/    \/ |_|         \/     
+.....',,'........',,;ooo::;;,'........'oooo;..  
+.......'',,'''',,;;;,,'...............';;;'...                 All you saw was sound!    
+...........'''''.............................. 
+..............................................  
+..............................................                                                   
+..............................................                             
+..............................................                                               
+-->
+{% if page.collection == 'tracks' %}
+<!-- BEGIN seo.html -->
 
-{% if page.collection == 'posts' %}
+<title>Play {{ page.common.title | xml_escape }} by {{ page.common.artist | xml_escape }} | {{ site.title | xml_escape }}</title>
+<meta name="title" content="Play &quot;{{ page.common.title | xml_escape }}&quot; by {{ page.common.artist | xml_escape }}" />
+<meta name="description" content="A track by {{ page.common.artist | xml_escape }} named &quot;{{ page.common.title | xml_escape }}&quot; published on {{ site.title | xml_escape }}" />
+<meta name="dc.date.modified" scheme="ISO8601" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta name="robots" content="index" />
+
+<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
+<link rel="alternate" hreflang="x-default" href="{{ site.url }}{{ page.url }}" />
+<meta name="geo.region" content="{{ site.geo.region }}" />
+<meta name="geo.placename" content="{{ site.geo.town }}" />
+<meta name="geo.position" content="{{ site.geo.lat }};{{ site.geo.long }}" />
+<meta name="ICBM" content="{{ site.geo.lat }}, {{ site.geo.long }}" />
+<meta name="author" content="{{ site.title | xml_escape }}" />
+<meta name="generator" content="Jekyll v4.0.0" />
+
+<!-- Dublin Core basic info -->
+
+<meta name="dcterms.Identifier" content="{{ site.url }}" />
+<meta name="dcterms.Format" content="text/html" />
+<meta name="dcterms.Relation" content="{{ site.title | xml_escape }}" />
+<meta name="dcterms.Publisher" content="{{ site.publisher.name | xml_escape }}" />
+<meta name="dcterms.Type" content="text/html" />
+<meta name="dcterms.Coverage" content="{{ site.url }}/" />
+<meta name="dcterms.Rights" content="Copyright &copy;{{ site.time | date: '%Y' }} {{ site.title }}." />
+<meta name="dcterms.Subject" content="A track by {{ page.common.artist | xml_escape }} named &quot;{{ page.common.title | xml_escape }}&quot; published on {{ site.title | xml_escape }}" />
+<meta name="dcterms.Title" content="Play &quot;{{ page.common.title | xml_escape }}&quot; by {{ page.common.artist | xml_escape }}" />
+<meta name="dcterms.Contributor" content="{{ site.title | xml_escape }}" />
+<meta name="dcterms.Date" content="{{ page.last_modified_at | date: '%Y-%m-%d' }}" />
+<meta name="dcterms.Description" content="Listen and to a track by {{ page.common.artist | xml_escape }} from the release &quot;{{ page.common.album | xml_escape }}&quot; and support your remote artist!" />
+
+<!-- Facebook -->
+
+<meta property="og:title" content="{{ page.common.title | xml_escape }}" />
+<meta property="og:locale" content="en" />
+<meta property="og:description" content="Listen and to a track by {{ page.common.artist | xml_escape }} from the release &quot;{{ page.common.album | xml_escape }}&quot; and support your remote artist!" />
+<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
+<meta property="og:site_name" content="{{ site.title | xml_escape }}" />
+<meta property="og:type" content="music:album:track" />
+<meta property="og:audio" content="{{ site.mediaurl }}/{{ page.slug }}.mp3" />
+<meta property="article:published_time" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta property="og:image" content="{{ site.mediaurl }}/{{ page.slug }}.jpeg" />
+<!-- Twitter Card -->
+
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ page.common.title | xml_escape }} | {{ site.title | xml_escape }}" />
+<meta name="twitter:description" content="Listen and to a track by {{ page.common.artist | xml_escape }} from the release &quot;{{ page.common.album | xml_escape }}&quot; and support your remote artist!" />
+<meta name="twitter:image" content="{{ site.mediaurl }}/{{ page.slug }}.jpeg" />
+
+
+{% elsif page.collection == 'posts' %}
+{% if page.category == 'releases' %}
+
+{% for album in site.albums %}
+{% if album.slug == page.album %}
+<!-- BEGIN seo.html -->
+{% capture namelist %}{% for art in album.artists %}{{ art }}{% unless forloop.last %}, {% endunless %}{% endfor %}{% endcapture %}
+{% capture artist %}{{ namelist }}{% endcapture %}
+
+<title>Play &quot;{{ album.name | xml_escape }}&quot; by {{ artist | xml_escape | uniq }} | {{ site.title | xml_escape }}</title>
+<meta name="title" content="Play &quot;{{ album.name | xml_escape }}&quot; by {{ artist | xml_escape | uniq }}" />
+<meta name="description" content="A release by {{ artist | xml_escape | uniq }} named &quot;{{ album.name | xml_escape }}&quot; published on {{ site.title | xml_escape }}" />
+<meta name="dc.date.modified" scheme="ISO8601" content="{{ page.last_modified_at | date_to_xmlschema }}" />
+<meta name="robots" content="index" />
+
+<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
+<link rel="alternate" hreflang="x-default" href="{{ site.url }}{{ page.url }}" />
+<meta name="geo.region" content="{{ site.geo.region }}" />
+<meta name="geo.placename" content="{{ site.geo.town }}" />
+<meta name="geo.position" content="{{ site.geo.lat }};{{ site.geo.long }}" />
+<meta name="ICBM" content="{{ site.geo.lat }}, {{ site.geo.long }}" />
+<meta name="author" content="{{ site.title | xml_escape }}" />
+<meta name="generator" content="Jekyll v4.0.0" />
+
+<!-- Dublin Core basic info -->
+
+<meta name="dcterms.Identifier" content="{{ site.url }}" />
+<meta name="dcterms.Format" content="text/html" />
+<meta name="dcterms.Relation" content="{{ site.title | xml_escape }}" />
+<meta name="dcterms.Publisher" content="{{ site.publisher.name | xml_escape }}" />
+<meta name="dcterms.Type" content="text/html" />
+<meta name="dcterms.Coverage" content="{{ site.url }}/" />
+<meta name="dcterms.Rights" content="Copyright &copy;{{ site.time | date: '%Y' }} {{ site.title }}." />
+<meta name="dcterms.Subject" content="A release by {{ artist | xml_escape | uniq }} named &quot;{{ album.name | xml_escape }}&quot; published on {{ site.title | xml_escape }}" />
+<meta name="dcterms.Title" content="Play &quot;{{ album.name | xml_escape }}&quot; by {{ artist | xml_escape | uniq }}" />
+<meta name="dcterms.Contributor" content="{{ site.title | xml_escape }}" />
+<meta name="dcterms.Date" content="{{ page.date | date: '%Y-%m-%d' }}" />
+<meta name="dcterms.Description" content="Listen and to a release by {{ artist | xml_escape | uniq }} named &quot;{{ album.name | xml_escape }}&quot; and support your remote artist!" />
+
+<!-- Facebook -->
+
+<meta property="og:title" content="{{ album.name | xml_escape }} by {{ artist | xml_escape | uniq }}" />
+<meta property="og:locale" content="en" />
+<meta property="og:description" content="Listen and to a release by {{ artist | xml_escape | uniq }} named &quot;{{ album.name | xml_escape }}&quot; and support your remote artist!" />
+<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
+<meta property="og:site_name" content="{{ site.title | xml_escape }}" />
+<meta property="og:type" content="music:album" />
+{% for track in album.tracks %}<meta property="og:audio" content="{{ site.mediaurl }}/{{ track.albumSlug }}/{{ track.trackSlug }}.mp3" />{% endfor %}
+<meta property="article:published_time" content="{{ page.date | date_to_xmlschema }}" />
+<meta property="og:image" content="{{ site.mediaurl }}/{{ album.tracks[0].slug }}.jpeg" />
+
+<!-- Twitter Card -->
+
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:title" content="{{ album.name | xml_escape }} | {{ site.title | xml_escape }}" />
+<meta name="twitter:description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ album.name | xml_escape }}&quot; and support your remote artist!" />
+<meta name="twitter:image" content="{{ site.mediaurl }}/{{ album.tracks[0].slug }}.jpeg" />
+{% endif %}{% endfor %}
+{% elsif page.category == 'highlights' %}
 <!-- BEGIN seo.html -->
 
 <title>{{ page.title }} | {{ site.title }}</title>
@@ -76,7 +210,7 @@
     }
   }
 </script>
-
+{% endif %}
 {% else %}
 <!-- BEGIN seo.html -->
 
diff --git a/_layouts/post.html b/_layouts/post.html
index 6b308b0..c153f9e 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -155,25 +155,36 @@ layout: default
   <!-- HERE ENDS MADNESS -->
 
 <!-- post Naviation -->
-<section >
-  <div class="post-navigation">
-    {% if page.previous.url or page.next.url %}
-    <h2>Check out more</h2>
-    <div class="post-nav">
+<section class="post-navigation">
+
+
+  {% if page.previous.url or page.next.url %}
+
+
+
+  <div class="post-nav">
+
       {% if page.previous.url %}
-      <h3><a href="{{page.previous.url}}" alt="Read {{page.previous.title}}" title="Read {{page.previous.title}}"><span
-            class="fas fa-arrow-left"></span>&nbsp;{{page.previous.title}}</a></h3>
+      <h4><a href="{{ relBase }}{{ page.previous.url }}" alt="Read {{ page.previous.title }}" title="Read {{ page.previous.title }}"><span
+            class="fas fa-arrow-left" style="font-size:3em;text-decoration: none;"></span></a></h4>
+      <h3>{{ page.previous.title }}</h3>
       <p>{{ page.previous.description }}</p>
       {% endif %}
     </div>
     <div class="post-nav-next">
       {% if page.next.url%}
-      <h3><a href="{{page.next.url}}">{{page.next.title}}&nbsp;<span class="fas fa-arrow-right"></span></a></h3>
+      <h4><a href="{{ page.next.url }}"><span class="fas fa-arrow-right" style="font-size:3em;"></span></a></h4>
+      <h3>{{ page.next.title }}</h3>
       <p>{{ page.next.description }}</p>
       {% endif %}
     </div>
-    {% endif %}
-  </div>
+
+
+
+{% endif %}
+
+
+
 </section>
 <!-- End Post Navigation -->
 
@@ -310,24 +321,35 @@ layout: default
 
 
   <!-- post Naviation -->
-  <section >
-    <div class="post-navigation">
-      {% if page.previous.url or page.next.url %}
-      <h2>Check out more</h2>
-      <div class="post-nav">
+  <section class="post-navigation">
+
+
+    {% if page.previous.url or page.next.url %}
+  
+  
+  
+    <div class="post-nav">
+  
         {% if page.previous.url %}
-        <h3><a href="{{page.previous.url}}" alt="Read {{page.previous.title}}" title="Read {{page.previous.title}}"><span
-              class="fas fa-arrow-left"></span>&nbsp;{{page.previous.title}}</a></h3>
+        <h4><a href="{{ relBase }}{{ page.previous.url }}" alt="Read {{ page.previous.title }}" title="Read {{ page.previous.title }}"><span
+              class="fas fa-arrow-left" style="font-size:3em;text-decoration: none;"></span></a></h4>
+        <h3>{{ page.previous.title }}</h3>
         <p>{{ page.previous.description }}</p>
         {% endif %}
       </div>
       <div class="post-nav-next">
         {% if page.next.url%}
-        <h3><a href="{{page.next.url}}">{{page.next.title}}&nbsp;<span class="fas fa-arrow-right"></span></a></h3>
+        <h4><a href="{{ page.next.url }}"><span class="fas fa-arrow-right" style="font-size:3em;"></span></a></h4>
+        <h3>{{ page.next.title }}</h3>
         <p>{{ page.next.description }}</p>
         {% endif %}
       </div>
-      {% endif %}
-    </div>
+  
+  
+  
+  {% endif %}
+  
+  
+  
   </section>
 {% endif %}
\ No newline at end of file
diff --git a/_layouts/track.html b/_layouts/track.html
index ee3c62f..3cab43b 100644
--- a/_layouts/track.html
+++ b/_layouts/track.html
@@ -38,7 +38,7 @@ layout: default
 
   <p><strong>{% assign round_seconds = page.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}</strong></p> 
    
-
+  {% include streamer.html %}
   {% include author.html %}
 
 
@@ -89,20 +89,20 @@ layout: default
 
   {% if page.previous.url or page.next.url %}
 
-  <h2>Track Navigation</h2>
+
 
   <div class="post-nav">
 
       {% if page.previous.url %}
       <h4><a href="{{ relBase }}{{ page.previous.url }}" alt="Read {{ page.previous.title }}" title="Read {{ page.previous.title }}"><span
-            class="fas fa-arrow-left"></span>&nbsp;Previous</a></h4>
+            class="fas fa-arrow-left" style="font-size:3em;text-decoration: none;"></span></a></h4>
       <h3>{{ page.previous.common.title }}</h3>
       <p>{{ page.previous.description }}</p>
       {% endif %}
     </div>
     <div class="post-nav-next">
       {% if page.next.url%}
-      <h4><a href="{{ page.next.url }}">Next&nbsp;<span class="fas fa-arrow-right"></span></a></h4>
+      <h4><a href="{{ page.next.url }}"><span class="fas fa-arrow-right" style="font-size:3em;"></span></a></h4>
       <h3>{{ page.next.common.title }}</h3>
       <p>{{ page.next.description }}</p>
       {% endif %}
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
index 097c031..2f5b65f 100644
--- a/_sass/_layout.scss
+++ b/_sass/_layout.scss
@@ -81,20 +81,19 @@ body {
     background-position: bottom;
     z-index: 1;
     h4 {
-      width: 100%;
+      width: 95%;
       height: auto; 
       min-height: 100px; 
       line-height: .85em;
       letter-spacing: -0.08em;
-      color: var(--bg-alt);
+      color: var(--bg);
       font-size: 12vw; 
       display: inline;
       opacity: 1;
       border-radius: var(--border-radius);
       position: absolute;
-      top: 0;
-      left: 0;
-
+      bottom: 0;
+      transform: rotate(-3deg);
     }
   }
 }
@@ -187,12 +186,13 @@ footer {
 }
 
 .post-navigation {
-  padding: 80px 0 160px 0;
+  padding: 80px 40px 80px 40px;
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
   max-width: var(--max-width);
   margin: 0 auto;
+  
   h2 {
     flex: 0 0 100%;
     margin-top: 40px;
@@ -200,7 +200,7 @@ footer {
   }
   .post-nav, .post-nav-next {
 
-    flex: 1 0 250px;
+    flex: 1 0 200px;
     
     h4 {
       font-size: 2em;
@@ -209,9 +209,11 @@ footer {
   }
   .post-nav {
     margin: 0 40px 0 0;
+    text-align: left;
   }
   .post-nav-next {
     margin: 0 0 0 40px;
+    text-align: right;
   }
 
 }