_data/navigation.yml

@@ -11,15 +11,15 @@
   name: Video
   external_site: true
 - icon: 📰
-  url: https://txt.basspistol.org
+  url: /highlights/
   name: Hi-lights
-  external_site: true
+  external_site: false
 - icon: 🧑🏾‍🤝‍🧑🏼
-  url: https://liberapay.com/Basspistol/
+  url: /artists/
   name: Artists
-  external_site: true
+  external_site: false
 - icon: ☔
-  url: /#read
+  url: /about/
   name: About
   external_site: false
 - icon: 🔗

_data/radio.yml

@@ -99,6 +99,4 @@
 - name: Bombgad
   url: 'https://soundcloud.com/bombgad'
 - name: Lasermoon
-  url: 'https://drtikov.bandcamp.com/album/planet-2-planet'
+  url: 'https://drtikov.bandcamp.com/album/planet-2-planet'
-- name: Kruzh'em
-  url: 'https://www.discogs.com/artist/140742-Kruzh''em'

_includes/analytics.js

@@ -38,3 +38,11 @@ _paq.push(['enableLinkTracking']);
 
 {% endif %}
 
+// mautic
+
+(function(w,d,t,u,n,a,m){w['MauticTrackingObject']=n;
+w[n]=w[n]||function(){(w[n].q=w[n].q||[]).push(arguments)},a=d.createElement(t),
+m=d.getElementsByTagName(t)[0];a.async=1;a.src=u;m.parentNode.insertBefore(a,m)
+})(window,document,'script','https://pr.basspistol.com/mtc.js','mt');
+
+mt('send', 'pageview');

_includes/cookie-consent.html

@@ -1,18 +1,13 @@
+
 <div id="cookie-notice">
 
   <p>
-    We only use cookies if you consent to it, or if you fill out one of our forms so we can remember you next time you come by. 
+    We only use cookies if you consent to it. They don't contain any identifiable info: they just let us know if you enjoyed this enough to come back.
-    <br />These cookies are all placed by us. No big tech involved.
+    <br /><a href="#" id="cookie-notice-decline">Click here</a> if you want this to go away without cookies.
-  
     <br />Read more about <a href="/cookies/"> how {{ site.title }} use cookies</a>
   </p>
-
+  <button class="button yes"
-    <button class="button no" id="cookie-notice-decline">
+    id="cookie-notice-accept">Ok</button>
-      Nah     
-    </button>
-    <button class="button yes" id="cookie-notice-accept">
-    Ok
-  </button>
 
 </div>
 
@@ -42,7 +37,7 @@
 
   if (readCookie('cookie-notice-dismissed') == 'wantCookies') {
     {% include analytics.js %}
-    {% include mautic-tracker.js %}
+    
   } else {
     document.getElementById('cookie-notice').style.display = 'flex';
 

_includes/mautic-tracker.js

@@ -1,7 +0,0 @@
-
-(function(w,d,t,u,n,a,m){w['MauticTrackingObject']=n;
-  w[n]=w[n]||function(){(w[n].q=w[n].q||[]).push(arguments)},a=d.createElement(t),
-  m=d.getElementsByTagName(t)[0];a.async=1;a.src=u;m.parentNode.insertBefore(a,m)
-})(window,document,'script','https://pr.basspistol.com/mtc.js','mt');
-
-mt('send', 'pageview');

_includes/scripts.html

@@ -1,3 +1,3 @@
 <!-- Scripts -->
 {% include relBase.html %}
-<script src="{{ relBase }}/assets/js/set-20210803.js"></script>
+<script src="{{ relBase }}/assets/js/set-20210720.js"></script>

_includes/streamer.html

@@ -101,16 +101,13 @@
   </section>
 {% endif %}
 <section class="streambox" id="support">
-  <script src="https://liberapay.com/Basspistol/widgets/receiving.js"></script>
+  <h2>We take bitcoin donations!</h2>
-  <br /><br />
-    <!-- BTC Pay -->
-  <!-- <h2>We take bitcoin donations!</h2>
     <div class="streamer" style="margin-top:0;">
-
+  <!-- BTC Pay -->
-      <script>if(!window.btcpay){    var head = document.getElementsByTagName('head')[0];   var script = document.createElement('script');   script.src='https://node1.terminalb.tc/modal/btcpay.js';   script.type = 'text/javascript';   head.append(script);}function onBTCPayFormSubmit(event){    var xhttp = new XMLHttpRequest();    xhttp.onreadystatechange = function() {        if (this.readyState == 4 && this.status == 200) {            if(this.status == 200 && this.responseText){                var response = JSON.parse(this.responseText);                window.btcpay.showInvoice(response.invoiceId);            }        }    };    xhttp.open("POST", event.target.getAttribute('action'), true);    xhttp.send(new FormData( event.target ));}</script>
+      <script>if(!window.btcpay){    var head = document.getElementsByTagName('head')[0];   var script = document.createElement('script');   script.src='https://node1.terminalb.tc:49393/modal/btcpay.js';   script.type = 'text/javascript';   head.append(script);}function onBTCPayFormSubmit(event){    var xhttp = new XMLHttpRequest();    xhttp.onreadystatechange = function() {        if (this.readyState == 4 && this.status == 200) {            if(this.status == 200 && this.responseText){                var response = JSON.parse(this.responseText);                window.btcpay.showInvoice(response.invoiceId);            }        }    };    xhttp.open("POST", event.target.getAttribute('action'), true);    xhttp.send(new FormData( event.target ));}</script>
       <style type="text/css"> .btcpay-form { display: inline-flex; align-items: center; justify-content: center; } .btcpay-form--inline { flex-direction: row; } .btcpay-form--block { flex-direction: column; background-color: var(--fg); padding-top: 20px; border-radius: var(--border-radius); } .btcpay-form--inline .submit { margin-left: 15px; } .btcpay-form--block select { margin-bottom: 10px; } .btcpay-form .btcpay-custom-container{ text-align: center; }.btcpay-custom { display: flex; align-items: center; justify-content: center; } .btcpay-form .plus-minus { cursor:pointer; font-size:25px; line-height: 25px; background: var(--bg);color:var(--fg); height: 30px; width: 45px; border:none; border-radius: 60px; margin: auto 5px; display: inline-flex; justify-content: center; } .btcpay-form select { -moz-appearance: none; -webkit-appearance: none; appearance: none; color: var(--bg); background: transparent; border:1px solid transparent; display: block; padding: 1px; margin-left: auto; margin-right: auto; font-size: 1em; cursor: pointer; } .btcpay-form select:hover { border-color: #ccc; } #btcpay-input-price { -moz-appearance: none; -webkit-appearance: none; border: none; box-shadow: none; text-align: center; font-size: 25px; margin: auto; border-radius: 5px; line-height: 35px; background: #fff; } </style>
-
+      <!-- End BTC pay -->
-      <form method="POST"  onsubmit="onBTCPayFormSubmit(event);return false"  action="https://node1.terminalb.tc/api/v1/invoices" class="btcpay-form btcpay-form--block">
+      <form method="POST"  onsubmit="onBTCPayFormSubmit(event);return false"  action="https://node1.terminalb.tc:49393/api/v1/invoices" class="btcpay-form btcpay-form--block">
         <input type="hidden" name="storeId" value="FeM9np3QKxAB2PvLj3VeUcm6gV49hDyz8xz4DFceE41k" />
         <input type="hidden" name="jsonResponse" value="true" />
         <div class="btcpay-custom-container">
@@ -127,8 +124,7 @@
             <option value="BTC">BTC 🦄</option>
           </select>
         </div>
-        <input type="image" class="submit" name="submit" src="https://node1.terminalb.tc/img/paybutton/pay.svg" style="width:209px;border:none;" alt="Pay with BtcPay, Self-Hosted Bitcoin Payment Processor">
+        <input type="image" class="submit" name="submit" src="https://node1.terminalb.tc:49393/img/paybutton/pay.svg" style="width:209px;border:none;" alt="Pay with BtcPay, Self-Hosted Bitcoin Payment Processor">
       </form>
-    </div> -->
+    </div>
-          <!-- End BTC pay -->
   </section>

_layouts/404page.html

@@ -12,12 +12,12 @@ layout: nil
 
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes" />
 <link rel="stylesheet" href="/assets/css/all.min.css" />
-<link rel="stylesheet" href="/assets/css/colors-20210803.css" />
+<link rel="stylesheet" href="/assets/css/colors-20210720.css" />
-<link rel="stylesheet" href="/assets/css/main-20210803.css" />
+<link rel="stylesheet" href="/assets/css/main-20210720.css" />
 <link rel="apple-touch-icon" href="{{ site.url }}/apple-touch-icon.png">
 <link rel="icon" type="image/png" href="{{ site.url }}/touch-icon.png" sizes="192x192">
 <link rel="shortcut icon" href="{{ site.url }}{{ site.icon }}" type="image/png" />
-<noscript><link rel="stylesheet" href="/assets/css/noscripts-20210803.css" /></noscript>
+<noscript><link rel="stylesheet" href="/assets/css/noscripts-20210720.css" /></noscript>
 
 <meta name="theme-color" content="{{ site.data.colors.bg }}"/>
 

_layouts/default.html

@@ -11,12 +11,12 @@
 {% include relBase.html %}
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes" />
 <link rel="stylesheet" href="{{ relBase }}/assets/css/all.min.css" />
-<link rel="stylesheet" href="{{ relBase }}/assets/css/colors-20210803.css" />
+<link rel="stylesheet" href="{{ relBase }}/assets/css/colors-20210720.css" />
-<link rel="stylesheet" href="{{ relBase }}/assets/css/main-20210803.css" />
+<link rel="stylesheet" href="{{ relBase }}/assets/css/main-20210720.css" />
 <link rel="apple-touch-icon" href="{{ site.url }}/apple-touch-icon.png">
 <link rel="icon" type="image/png" href="{{ site.url }}/touch-icon.png" sizes="192x192">
 <link rel="shortcut icon" href="{{ site.url }}{{ site.icon }}" type="image/png" />
-<noscript><link rel="stylesheet" href="{{ relBase }}/assets/css/noscripts-20210803.css" /></noscript>
+<noscript><link rel="stylesheet" href="{{ relBase }}/assets/css/noscripts-20210720.css" /></noscript>
 
 <meta name="theme-color" content="{{ site.data.colors.bg }}"/>
 

_sass/_cookies.scss

@@ -28,10 +28,9 @@
       text-align: center;
       margin: 40px 40px 20px 40px;
     }
-    .yes, .no {
+    .yes {
-      margin: 20px 40px 0px 40px;
+      margin: 20px 40px 40px 40px;
     }
-
   }
   button {
     border: none;
@@ -40,22 +39,25 @@
   }
 }
 
-.yes, .no {
+.yes {
-  flex: 0 0 100px;
+  flex: 0 0 250px;
   -moz-transition: all var(--anim-speed) ease-in-out;
   -webkit-transition: all var(--anim-speed) ease-in-out;
   -ms-transition: all var(--anim-speed) ease-in-out;
   transition: all var(--anim-speed) ease-in-out;
   text-align: center;
-  margin: 40px 40px 40px 10px;
+  background-position-x: 0%;
-}
+  background-position-y: 0%;
-.yes {
+  background-repeat: repeat;
-  background-image: unset;
+  background-attachment: scroll;
-  background-color: #95df63 !important;
+  background-image: linear-gradient(228deg, var(--accent1-alt), var(--accent2-alt));
-}
+  background-origin: padding-box;
-.no {
+  background-clip: border-box;
-  background-image: unset;
+  background-size: 400% 400%;
-  background-color: rgb(255, 215, 85) !important;
+  -webkit-animation: backgroundBlink 2s ease infinite;
+  -moz-animation: backgroundBlink 2s ease infinite;
+  animation: backgroundBlink 2s ease infinite;
+  margin: 40px 40px 40px 20px;
 }
 .yes:hover {
   // color: #000 !important;

chat.html

@@ -5,5 +5,5 @@ description: >-
 image: /images/kaur-kristjan-cppf4w5pb1c-unsplash.jpg
 layout: page
 ---
-<p>You do not need to register to participate. This chat is public. <strong>We never ask you to submit credit-card (any other payment information) nor personal information.</strong> It is provided by kiwi via Libera.Chat. Read the privacy policy of <a target="_blank" rel="noopener" href="https://kiwiirc.com/privacy">Kiwi</a> and <a target="_blank" rel="noopener" href="https://libera.chat/policies/">Libera.Chat</a><br />Matrix user? <a href="{{ site.social.irc.matrix }}" target="_blank" rel="noopener">Click here</a></p>
+<p>You do not need to register to participate. This chat is public. <strong>We never ask you to submit credit-card (any other payment information) nor personal information.</strong> It is provided by kiwi via freenode. Read the privacy policy of <a target="_blank" rel="noopener" href="https://kiwiirc.com/privacy">Kiwi</a> and <a target="_blank" rel="noopener" href="https://freenode.net/policies">Freenode</a><br />Matrix user? <a href="{{ site.social.irc.matrix }}" target="_blank" rel="noopener">Click here</a></p>
 <iframe src="https://kiwiirc.com/client/irc.libera.chat:+6667/?nick={{ site.social.irc.guest-nick }}|?&theme=cli{{ site.social.irc.channel }}" style="border:0; width:100%; height:540px;"></iframe>

index.html

@@ -84,8 +84,7 @@ layout: default
     <a href="https://pr.basspistol.com/join-the-crew" target="_blank" class="button">Join the crew</a>
   </div>
   </div>
-  <h2 style="text-align: center; margin:40px;">Exit cyber-homlessness. <br />Enter data-sovereignty.</h2>
+  <h2>What you can get from us</h2>
-  <p style="text-align: center; margin:40px;">We're empowered by an armory of open-source tools enabling us to seaze our means of outreach and distribution.</p>
   <div class="container">
 
   {% for service in site.data.services %}

thanks.html

@@ -1,36 +0,0 @@
----
-title: Thank you!
-description: >-
-  So good to have you on board! Made a mistake?
-image: /images/frankyfresco-video.jpg
-layout: default
-sitemap: false
----
-{% include relBase.html %}
-<header class="hero" style="background-image: url({{ relBase }}{{ page.image }});">
-  <div class="imagecontainer">
-    <h4>{{ page.title }}</h4>
-  </div>
-  <div class="splash">
-    <div class="splash-logo">
-      {% if page.category == 'releases' or page.category == 'highlights' %}
-
-      {% else %}
-      <a href="/"><img src="{{ site.icon }}" width="240px" alt="{{ site.title }} Logo" /></a>
-      {% endif %}
-      
-    </div>
-    <div class="description">
-  
-      <h1>{{ page.title }}</h1>
-      <p>{{ page.description }}</p>
-
-      <p><a href="https://pr.basspistol.com/join-the-crew" class="button">✍️ Back to form</a></p>
-
-    </div>
-  </div>
- 
-
-
-
-</header>