Merge branch 'master' into content-setto

This commit is contained in:
Set Hallstrom 2020-07-27 14:51:42 +02:00
commit b04f92d213
8 changed files with 17 additions and 20 deletions

View file

@ -1,4 +1,5 @@
<!-- Footer --> <!-- Footer -->
{% include streamer.html %}
<footer id="footer" class="wrapper style1 align-center"> <footer id="footer" class="wrapper style1 align-center">
<div class="footflex"> <div class="footflex">
<div> <div>

View file

@ -1,6 +1,6 @@
<!-- Navigation --> <!-- Navigation -->
<div id="logo" class="logo"> <div id="logo" class="logo">
<a href="/"><img width="100em" src="{{ site.icon }}" alt="{{ site.name }} Logo" /></a> <a href="/"><img width="100em" src="{{ site.icon }}" alt="{{ site.title }} Logo" /></a>
&nbsp;&nbsp;&nbsp;<a href="#navbar" onclick="blurBody()" alt="Navigation Menu" title="Navigation Menu"><span class="icon solid fa-bars navmenu"></span></a> &nbsp;&nbsp;&nbsp;<a href="#navbar" onclick="blurBody()" alt="Navigation Menu" title="Navigation Menu"><span class="icon solid fa-bars navmenu"></span></a>
</div> </div>

View file

@ -210,5 +210,5 @@
{% endif %} {% endif %}
<link rel="alternate" type="application/rss+xml" href="{{ site.url}}/feed.xml" /> <link rel="alternate" type="application/rss+xml" href="{{ site.url}}/feed.xml" title="{{ site.title }}" />
<!-- END seo.html --> <!-- END seo.html -->

View file

@ -3,7 +3,7 @@
{% if page.category == 'releases' %} {% if page.category == 'releases' %}
{% if page.check_this_if_cannot_be_bought == false %} {% if page.check_this_if_cannot_be_bought == false %}
<h3 style="text-align: center;display: block;">Get this release</h3> <h2 style="text-align: center;display: block;">Get this release</h2>
<div class="streamer"> <div class="streamer">
{% for shop in page.stores %} {% for shop in page.stores %}
{% if shop.download == true %} {% if shop.download == true %}
@ -25,7 +25,7 @@
{% else %} {% else %}
<h3 style="text-align: center;display: block;">This release can't be bought</h3> <h2 style="text-align: center;display: block;">This release can't be bought</h2>
<p>Stream, follow, like and subscribe!</p> <p>Stream, follow, like and subscribe!</p>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -34,7 +34,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<h3 style="text-align: center;display: block;">&nbsp;</h3> <h2 style="text-align: center;display: block;">&nbsp;</h2>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -53,7 +53,7 @@
{% if post.album == page.albumSlug %} {% if post.album == page.albumSlug %}
{% if post.check_this_if_cannot_be_bought == false %} {% if post.check_this_if_cannot_be_bought == false %}
<h3 style="text-align: center;display: block;">Get this track</h3> <h2 style="text-align: center;display: block;">Get this track</h2>
<div class="streamer"> <div class="streamer">
{% for shop in post.stores %} {% for shop in post.stores %}
{% if shop.download == true %} {% if shop.download == true %}
@ -74,7 +74,7 @@
</div> </div>
{% else %} {% else %}
<h3 style="text-align: center;display: block;">This track can't be bought</h3> <h2 style="text-align: center;display: block;">This track can't be bought</h2>
<p>Stream, follow, like and subscribe!</p> <p>Stream, follow, like and subscribe!</p>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -83,7 +83,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<h3 style="text-align: center;display: block;">&nbsp;</h3> <h2 style="text-align: center;display: block;">&nbsp;</h2>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -106,7 +106,7 @@
{% if post.album == page.slug %} {% if post.album == page.slug %}
{% if post.check_this_if_cannot_be_bought == false %} {% if post.check_this_if_cannot_be_bought == false %}
<h3 style="text-align: center;display: block;">Get this album</h3> <h2 style="text-align: center;display: block;">Get this album</h2>
<div class="streamer"> <div class="streamer">
{% for shop in post.stores %} {% for shop in post.stores %}
{% if shop.download == true %} {% if shop.download == true %}
@ -127,7 +127,7 @@
</div> </div>
{% else %} {% else %}
<h3 style="text-align: center;display: block;">This album can't be bought</h3> <h2 style="text-align: center;display: block;">This album can't be bought</h2>
<p>Stream, follow, like and subscribe!</p> <p>Stream, follow, like and subscribe!</p>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -136,7 +136,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<h3 style="text-align: center;display: block;">&nbsp;</h3> <h2 style="text-align: center;display: block;">&nbsp;</h2>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -154,7 +154,7 @@
{% else %} {% else %}
<h3 style="text-align: center;display: block;">Support {{ site.name }}</h3> <h2 style="text-align: center;display: block;">Support {{ site.title }}</h2>
<p>Stream, follow, like and subscribe!</p> <p>Stream, follow, like and subscribe!</p>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}
@ -163,7 +163,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<h3 style="text-align: center;display: block;">&nbsp;</h3> <h2 style="text-align: center;display: block;">&nbsp;</h2>
<div class="streamer"> <div class="streamer">
{% for shop in site.data.stores %} {% for shop in site.data.stores %}

View file

@ -10,7 +10,7 @@ lang: en
<html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}"> <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
<head> <head>
<link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
{% include seo.html %} {% include seo.html %}
{% include relBase.html %} {% include relBase.html %}
<meta charset="utf-8" /> <meta charset="utf-8" />

View file

@ -10,7 +10,6 @@
<html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}"> <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
<head> <head>
<link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
{% include seo.html %} {% include seo.html %}
{% include relBase.html %} {% include relBase.html %}
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -300,7 +299,6 @@
<html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}"> <html lang="{% if page.lang != site.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
<head> <head>
<link type="application/atom+xml" rel="alternate" href="{{ site.url }}/feed.xml" title="{{ site.name }}" />
{% include seo.html %} {% include seo.html %}
{% include relBase.html %} {% include relBase.html %}
<meta charset="utf-8" /> <meta charset="utf-8" />

View file

@ -73,6 +73,4 @@ image: /images/pages/jack-hamilton-CMnNiQBkwBI-unsplash.jpg
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% include streamer.html %}
{% include footer.html %} {% include footer.html %}

View file

@ -49,7 +49,7 @@ logo_image: /siteicon.png
class="section-shadow banner style1 orient-{% cycle 'left', 'right' %} content-align-{% cycle 'right', 'left' %} image-position-center fullscreen onload-image-fade-in onload-content-fade-right"> class="section-shadow banner style1 orient-{% cycle 'left', 'right' %} content-align-{% cycle 'right', 'left' %} image-position-center fullscreen onload-image-fade-in onload-content-fade-right">
<div class="content"> <div class="content">
<h1>{{ post.title }}</h1> <h3>{{ post.title }}</h3>
<p>{{ post.description }}</p> <p>{{ post.description }}</p>
{% if post.category == 'releases' %} {% if post.category == 'releases' %}
{% capture album_name -%} {% capture album_name -%}
@ -128,5 +128,5 @@ logo_image: /siteicon.png
{% endfor %} {% endfor %}
<!-- END Release --> <!-- END Release -->
{% include streamer.html %}
{% include footer.html %} {% include footer.html %}