diff --git a/_data/navigation.yml b/_data/navigation.yml index 0eb3f37..f8ebb36 100644 --- a/_data/navigation.yml +++ b/_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: 🔗 diff --git a/_data/radio.yml b/_data/radio.yml index a7e192e..9e47af9 100644 --- a/_data/radio.yml +++ b/_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' -- name: Kruzh'em - url: 'https://www.discogs.com/artist/140742-Kruzh''em' + url: 'https://drtikov.bandcamp.com/album/planet-2-planet' \ No newline at end of file diff --git a/_includes/analytics.js b/_includes/analytics.js index 3194c76..c4e6d82 100644 --- a/_includes/analytics.js +++ b/_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'); \ No newline at end of file diff --git a/_includes/cookie-consent.html b/_includes/cookie-consent.html index 0509ed1..8556842 100644 --- a/_includes/cookie-consent.html +++ b/_includes/cookie-consent.html @@ -1,18 +1,13 @@ + @@ -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'; diff --git a/_includes/mautic-tracker.js b/_includes/mautic-tracker.js deleted file mode 100644 index 447fc52..0000000 --- a/_includes/mautic-tracker.js +++ /dev/null @@ -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'); diff --git a/_includes/scripts.html b/_includes/scripts.html index 9505c46..8dd0cb0 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,3 +1,3 @@ {% include relBase.html %} - + diff --git a/_includes/streamer.html b/_includes/streamer.html index a4e4fe7..7bb41f6 100644 --- a/_includes/streamer.html +++ b/_includes/streamer.html @@ -101,16 +101,13 @@ {% endif %}
- -

- - + - -
+ +
@@ -127,8 +124,7 @@
- +
- --> - +
\ No newline at end of file diff --git a/_layouts/404page.html b/_layouts/404page.html index b393f6a..0cd342b 100644 --- a/_layouts/404page.html +++ b/_layouts/404page.html @@ -12,12 +12,12 @@ layout: nil - - + + - + diff --git a/_layouts/default.html b/_layouts/default.html index 7db1d00..c84609e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -11,12 +11,12 @@ {% include relBase.html %} - - + + - + diff --git a/_sass/_cookies.scss b/_sass/_cookies.scss index d8457d0..87a9ef2 100644 --- a/_sass/_cookies.scss +++ b/_sass/_cookies.scss @@ -28,10 +28,9 @@ text-align: center; margin: 40px 40px 20px 40px; } - .yes, .no { - margin: 20px 40px 0px 40px; + .yes { + margin: 20px 40px 40px 40px; } - } button { border: none; @@ -40,22 +39,25 @@ } } -.yes, .no { - flex: 0 0 100px; +.yes { + 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; -} -.yes { - background-image: unset; - background-color: #95df63 !important; -} -.no { - background-image: unset; - background-color: rgb(255, 215, 85) !important; + background-position-x: 0%; + background-position-y: 0%; + background-repeat: repeat; + background-attachment: scroll; + background-image: linear-gradient(228deg, var(--accent1-alt), var(--accent2-alt)); + background-origin: padding-box; + background-clip: border-box; + background-size: 400% 400%; + -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; diff --git a/assets/css/colors-20210803.css b/assets/css/colors-20210720.css similarity index 100% rename from assets/css/colors-20210803.css rename to assets/css/colors-20210720.css diff --git a/assets/css/main-20210803.scss b/assets/css/main-20210720.scss similarity index 100% rename from assets/css/main-20210803.scss rename to assets/css/main-20210720.scss diff --git a/assets/css/noscripts-20210803.scss b/assets/css/noscripts-20210720.scss similarity index 100% rename from assets/css/noscripts-20210803.scss rename to assets/css/noscripts-20210720.scss diff --git a/assets/js/set-20210803.js b/assets/js/set-20210720.js similarity index 100% rename from assets/js/set-20210803.js rename to assets/js/set-20210720.js diff --git a/chat.html b/chat.html index df655e0..a038d92 100644 --- a/chat.html +++ b/chat.html @@ -5,5 +5,5 @@ description: >- image: /images/kaur-kristjan-cppf4w5pb1c-unsplash.jpg layout: page --- -

You do not need to register to participate. This chat is public. We never ask you to submit credit-card (any other payment information) nor personal information. It is provided by kiwi via Libera.Chat. Read the privacy policy of Kiwi and Libera.Chat
Matrix user? Click here

+

You do not need to register to participate. This chat is public. We never ask you to submit credit-card (any other payment information) nor personal information. It is provided by kiwi via freenode. Read the privacy policy of Kiwi and Freenode
Matrix user? Click here

diff --git a/index.html b/index.html index d6f9845..27c3b21 100644 --- a/index.html +++ b/index.html @@ -84,8 +84,7 @@ layout: default Join the crew -

Exit cyber-homlessness.
Enter data-sovereignty.

-

We're empowered by an armory of open-source tools enabling us to seaze our means of outreach and distribution.

+

What you can get from us

{% for service in site.data.services %} diff --git a/thanks.html b/thanks.html deleted file mode 100644 index c670888..0000000 --- a/thanks.html +++ /dev/null @@ -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 %} -
-
-

{{ page.title }}

-
-
- -
- -

{{ page.title }}

-

{{ page.description }}

- -

✍️ Back to form

- -
-
- - - - -