From 6ddb0a99bf41957f305b4f3c7efd6f83b8d45e2e Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 27 Jul 2021 21:20:57 +0200 Subject: [PATCH 01/10] update node.terminalb.tc address --- _includes/streamer.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/streamer.html b/_includes/streamer.html index 7bb41f6..c7282dc 100644 --- a/_includes/streamer.html +++ b/_includes/streamer.html @@ -104,10 +104,10 @@

We take bitcoin donations!

- + -
+
@@ -124,7 +124,7 @@
- +
\ No newline at end of file From bf3bb054f2aab4e62f9e9d3d7e30d52d0136db00 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 3 Aug 2021 14:04:29 +0200 Subject: [PATCH 02/10] bump css version and fix cookie thingie --- _includes/cookie-consent.html | 17 +++++++---- _includes/mautic-tracker.js | 7 +++++ _includes/scripts.html | 2 +- _layouts/404page.html | 6 ++-- _layouts/default.html | 6 ++-- _sass/_cookies.scss | 30 +++++++++---------- ...olors-20210720.css => colors-20210803.css} | 0 ...{main-20210720.scss => main-20210803.scss} | 0 ...-20210720.scss => noscripts-20210803.scss} | 0 .../js/{set-20210720.js => set-20210803.js} | 0 index.html | 3 +- 11 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 _includes/mautic-tracker.js rename assets/css/{colors-20210720.css => colors-20210803.css} (100%) rename assets/css/{main-20210720.scss => main-20210803.scss} (100%) rename assets/css/{noscripts-20210720.scss => noscripts-20210803.scss} (100%) rename assets/js/{set-20210720.js => set-20210803.js} (100%) diff --git a/_includes/cookie-consent.html b/_includes/cookie-consent.html index 8556842..0509ed1 100644 --- a/_includes/cookie-consent.html +++ b/_includes/cookie-consent.html @@ -1,13 +1,18 @@ - @@ -37,7 +42,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 new file mode 100644 index 0000000..447fc52 --- /dev/null +++ b/_includes/mautic-tracker.js @@ -0,0 +1,7 @@ + +(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 8dd0cb0..9505c46 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,3 +1,3 @@ {% include relBase.html %} - + diff --git a/_layouts/404page.html b/_layouts/404page.html index 0cd342b..b393f6a 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 c84609e..7db1d00 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 87a9ef2..d8457d0 100644 --- a/_sass/_cookies.scss +++ b/_sass/_cookies.scss @@ -28,9 +28,10 @@ text-align: center; margin: 40px 40px 20px 40px; } - .yes { - margin: 20px 40px 40px 40px; + .yes, .no { + margin: 20px 40px 0px 40px; } + } button { border: none; @@ -39,25 +40,22 @@ } } -.yes { - flex: 0 0 250px; +.yes, .no { + flex: 0 0 100px; -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; - 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; + margin: 40px 40px 40px 10px; +} +.yes { + background-image: unset; + background-color: #95df63 !important; +} +.no { + background-image: unset; + background-color: rgb(255, 215, 85) !important; } .yes:hover { // color: #000 !important; diff --git a/assets/css/colors-20210720.css b/assets/css/colors-20210803.css similarity index 100% rename from assets/css/colors-20210720.css rename to assets/css/colors-20210803.css diff --git a/assets/css/main-20210720.scss b/assets/css/main-20210803.scss similarity index 100% rename from assets/css/main-20210720.scss rename to assets/css/main-20210803.scss diff --git a/assets/css/noscripts-20210720.scss b/assets/css/noscripts-20210803.scss similarity index 100% rename from assets/css/noscripts-20210720.scss rename to assets/css/noscripts-20210803.scss diff --git a/assets/js/set-20210720.js b/assets/js/set-20210803.js similarity index 100% rename from assets/js/set-20210720.js rename to assets/js/set-20210803.js diff --git a/index.html b/index.html index 27c3b21..d6f9845 100644 --- a/index.html +++ b/index.html @@ -84,7 +84,8 @@ layout: default Join the crew -

What you can get from us

+

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.

{% for service in site.data.services %} From 120a7f98c0d8f33c9e71812cec4c723dc46a2db3 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 24 Aug 2021 16:18:45 +0200 Subject: [PATCH 03/10] fix navigation --- _data/navigation.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index f8ebb36..0eb3f37 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -11,15 +11,15 @@ name: Video external_site: true - icon: 📰 - url: /highlights/ + url: https://txt.basspistol.org name: Hi-lights - external_site: false + external_site: true - icon: 🧑🏾‍🤝‍🧑🏼 - url: /artists/ + url: https://liberapay.com/Basspistol/ name: Artists - external_site: false + external_site: true - icon: ☔ - url: /about/ + url: /#read name: About external_site: false - icon: 🔗 From 32a31b327f3c25e372b94c384503a53e3437aad5 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 24 Aug 2021 16:25:26 +0200 Subject: [PATCH 04/10] broken cookie mechanism --- _includes/analytics.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/_includes/analytics.js b/_includes/analytics.js index c4e6d82..3194c76 100644 --- a/_includes/analytics.js +++ b/_includes/analytics.js @@ -38,11 +38,3 @@ _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 From 3e0beab36c93ad67458125b17e99b31972956bc5 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 24 Aug 2021 16:36:16 +0200 Subject: [PATCH 05/10] hide BTC pay add liberapay --- _includes/streamer.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/_includes/streamer.html b/_includes/streamer.html index c7282dc..a4e4fe7 100644 --- a/_includes/streamer.html +++ b/_includes/streamer.html @@ -101,12 +101,15 @@ {% endif %}
-

We take bitcoin donations!

+ +

+ + + - +
@@ -126,5 +129,6 @@
- + --> + \ No newline at end of file From 451fff31303a96ab3344487b1b20a53fb3d07572 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Thu, 2 Sep 2021 14:57:04 +0200 Subject: [PATCH 06/10] kruzhem to radio list --- _data/radio.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_data/radio.yml b/_data/radio.yml index 9e47af9..97b7d63 100644 --- a/_data/radio.yml +++ b/_data/radio.yml @@ -99,4 +99,6 @@ - name: Bombgad url: 'https://soundcloud.com/bombgad' - name: Lasermoon - url: 'https://drtikov.bandcamp.com/album/planet-2-planet' \ No newline at end of file + url: 'https://drtikov.bandcamp.com/album/planet-2-planet' +- name: Kruzh'em + url: 'https://www.discogs.com/artist/140742-Kruzh'em' From 8065f796d19dd141fce2160cd8a590814f8f882a Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Mon, 20 Sep 2021 10:59:52 +0200 Subject: [PATCH 07/10] typo --- _data/radio.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/radio.yml b/_data/radio.yml index 97b7d63..a7e192e 100644 --- a/_data/radio.yml +++ b/_data/radio.yml @@ -101,4 +101,4 @@ - 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://www.discogs.com/artist/140742-Kruzh''em' From de38d9418dc10b68c7f778c71d6e3df3e63537b0 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Mon, 20 Sep 2021 10:59:58 +0200 Subject: [PATCH 08/10] thank you page --- thanks.html | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 thanks.html diff --git a/thanks.html b/thanks.html new file mode 100644 index 0000000..cb45247 --- /dev/null +++ b/thanks.html @@ -0,0 +1,36 @@ +--- +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

+ +
+
+ + + + +
From b5a4005af8edff48df527601b64c6451bc7295c3 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Thu, 30 Sep 2021 14:28:02 +0200 Subject: [PATCH 09/10] libera.chat it is! --- chat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat.html b/chat.html index a038d92..df655e0 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 freenode. Read the privacy policy of Kiwi and Freenode
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 Libera.Chat. Read the privacy policy of Kiwi and Libera.Chat
Matrix user? Click here

From 79e451a72f12acc609c42eab51bd563fb1c053c9 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Thu, 30 Sep 2021 14:28:41 +0200 Subject: [PATCH 10/10] wrong link on thank you page --- thanks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thanks.html b/thanks.html index cb45247..c670888 100644 --- a/thanks.html +++ b/thanks.html @@ -25,7 +25,7 @@ sitemap: false

{{ page.title }}

{{ page.description }}

-

✍️ Back to form

+

✍️ Back to form