From 2afa6893e9ed1fc7bb3e52a921300ae908aeff39 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Fri, 11 Sep 2020 11:22:50 +0200 Subject: [PATCH] fixing broken stuff --- _layouts/album.html | 305 +------------------------------------------- _layouts/post.html | 85 +++++------- _layouts/track.html | 40 ++---- _sass/_layout.scss | 104 +++++++-------- backupindex.html | 251 ------------------------------------ discography.html | 2 +- highlights.html | 2 +- links.html | 4 +- log.html | 27 ---- 9 files changed, 100 insertions(+), 720 deletions(-) delete mode 100644 backupindex.html delete mode 100644 log.html diff --git a/_layouts/album.html b/_layouts/album.html index d79c767..b5024df 100644 --- a/_layouts/album.html +++ b/_layouts/album.html @@ -1,306 +1,3 @@ --- -layout: default +layout: nil --- - -{% include header.html %} - -
-
- -{% for album in site.albums %} -{% if page.album == album.slug %} -{% assign onetracker = album.tracks | size %} -
- -
-

Track list

-
    - {% for track in album.tracks %} -
  • -
    -
    {{ track.common.track.no }}.
    -
    {{ track.common.title }}
    -
    - {% assign round_seconds = track.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 }} -
    -
    -
    • - {% endfor %} -
-
-
-
-
-
-
- {% for track in album.tracks %} - -
-
{{ track.common.track.no }}.
-
{{ track.common.title }}
-
- {% assign round_seconds = track.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 }} -
-
- - {% endfor %} - -
- - -
-
-
-
- - {% assign author_id = page.author | prepend: "/authors/" | append: "/" %} - {% assign author = site.authors | where: "url", author_id | first %} -
-
-

{{ author.name }}

-

{{ author.position }}{% if author.gpg != nil %} | GPG{% endif %}

-

- Published the - - {% include dates.html %} -

- - -
- - Share this page: -
- - - -
-
-
-
-
-
-
- {{ content }} -
-
-
-
- -
- -
- -
-
- - {% if onetracker > 1 %} -
- - -
- {% endif %} -

-

Paused...

-
- -
-{% include streamer.html %} - -{% if onetracker > 1 %} - -{% for track in album.tracks %} - -
-
- -
-
-

{{ track.common.title }}

-

- {% assign round_seconds = track.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 }} - | {{ track.common.genre }}

-

{{ track.common.year }}

-

Play

- - - -
- -
- -{% endfor %} - - -{% endif %} - - {% break %} {% endif %} {% endfor %} - - - -
- - - {% if page.previous.url or page.next.url %} - -

Check out more

-
- {% if page.previous.url %} -

 {{page.previous.title}}

-

{{ page.previous.description }}

- - {% endif %} -
-
- {% if page.next.url%} - -

{{page.next.title}} 

-

{{ page.next.description }}

- - {% endif %} -
- - - -{% endif %} - - - -
- - - - diff --git a/_layouts/post.html b/_layouts/post.html index c153f9e..1047860 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -130,7 +130,6 @@ layout: default
-

{{ track.common.title }}

@@ -139,11 +138,7 @@ layout: default | {{ track.common.genre }}

{{ track.common.year }}

Play

- - -
-
{% endfor %} @@ -156,17 +151,13 @@ layout: default
- - {% if page.previous.url or page.next.url %} - - - -
- +
+
{% if page.previous.url %} -

+

{{ page.previous.title }}

{{ page.previous.description }}

{% endif %} @@ -178,13 +169,8 @@ layout: default

{{ page.next.description }}

{% endif %}
- - - -{% endif %} - - - +
+ {% endif %}
@@ -315,41 +301,34 @@ layout: default

{{ page.title }}

{{ content }} + {% if page.link %} +

πŸ‘€ Check it out!

+ {% endif %}
- -
- - - {% if page.previous.url or page.next.url %} - - - -
- - {% if page.previous.url %} -

-

{{ page.previous.title }}

-

{{ page.previous.description }}

- {% endif %} -
-
- {% if page.next.url%} -

-

{{ page.next.title }}

-

{{ page.next.description }}

- {% endif %} -
- - - - {% endif %} - - - -
+ +
+ {% if page.previous.url or page.next.url %} +
+
+ {% if page.previous.url %} +

+

{{ page.previous.title }}

+

{{ page.previous.description }}

+ {% endif %} +
+
+ {% if page.next.url%} +

+

{{ page.next.title }}

+

{{ page.next.description }}

+ {% endif %} +
+
+{% endif %} +
{% endif %} \ No newline at end of file diff --git a/_layouts/track.html b/_layouts/track.html index 77e231c..ca474ab 100644 --- a/_layouts/track.html +++ b/_layouts/track.html @@ -85,35 +85,23 @@ layout: default {% endfor %}
- - {% if page.previous.url or page.next.url %} - - -
- - {% if page.previous.url %} -

-

{{ page.previous.common.title }}

-

{{ page.previous.description }}

- {% endif %} -
-
- {% if page.next.url%} -

-

{{ page.next.common.title }}

-

{{ page.next.description }}

- {% endif %} -
- - - + {% if page.previous.url %} +

+

{{ page.previous.common.title }}

+

{{ page.previous.description }}

+ {% endif %} + +
+ {% if page.next.url%} +

+

{{ page.next.common.title }}

+

{{ page.next.description }}

+ {% endif %} +
{% endif %} - - -
{% include footer.html %} diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 2b62e91..a54ce41 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -1,7 +1,7 @@ html, body { - margin:0; - padding:0; + margin: 0; + padding: 0; background-color: var(--bg); } body { @@ -12,7 +12,6 @@ body { color: var(--fg); letter-spacing: _font(kerning); background-color: var(--bg); - } #main-wrapper { display: flex; @@ -23,7 +22,6 @@ body { -ms-transition: filter var(--anim-speed) ease-in-out; transition: filter var(--anim-speed) ease-in; z-index: 1; - } .content-wrapper { max-width: var(--max-width); @@ -44,7 +42,7 @@ body { background-repeat: no-repeat; padding: 40px; position: relative; - min-height: 80vh; + min-height: 80vh; width: 100vw; .textcontainer { @@ -56,7 +54,8 @@ body { div { z-index: 10; - h1, p { + h1, + p { flex: 1 0 100%; width: 100%; z-index: 10; @@ -75,19 +74,19 @@ body { left: 0; width: 100%; height: 100%; - background-image: url('../img/vignette.svg'); + background-image: url("../img/vignette.svg"); background-size: 240px; background-repeat: repeat-x; background-position: bottom; z-index: 1; h4 { width: 90vw; - height: auto; - min-height: 100px; - line-height: .85em; + height: auto; + min-height: 100px; + line-height: 0.85em; letter-spacing: -0.08em; color: var(--bg); - font-size: 15vw; + font-size: 15vw; display: inline; opacity: 1; border-radius: var(--border-radius); @@ -119,19 +118,18 @@ section:first-of-type { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - margin-top:0; + margin-top: 0; padding-top: 40px; } .section-title { padding: 80px; } footer { - width: 100%; padding: 160px 20px 200px 20px; background-color: var(--fg); color: var(--bg); - background-image: url('../img/vignette-footer.svg'); + background-image: url("../img/vignette-footer.svg"); background-size: 400px; background-repeat: repeat-x; background-position: top; @@ -142,7 +140,6 @@ footer { } .icon { border: 1px solid var(--bg); - } .footframe { display: flex; @@ -151,7 +148,7 @@ footer { max-width: var(--max-width); margin: auto; padding: 20px; - + div { flex: 0 1 300px; margin-bottom: 80px; @@ -167,11 +164,11 @@ footer { a { font-weight: 700; text-decoration: none; - color: var(--bg) + color: var(--bg); } } } - + small { flex: 0 0 100%; box-sizing: border-box; @@ -194,48 +191,48 @@ footer { } .post-navigation { - 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; - text-align: center; - } - .post-nav, .post-nav-next { + margin: 0; + .container { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + padding: 40px; + align-items: flex-start; + max-width: var(--max-width); + margin: 0 auto; + h2 { + flex: 0 0 100%; + margin-top: 40px; + text-align: center; + } + .post-nav, + .post-nav-next { + flex: 1 0 200px; - flex: 1 0 200px; - - h4 { - font-size: 2em; - justify-self: right; + h4 { + font-size: 2em; + justify-self: right; + } + } + .post-nav { + margin: 0 40px 0 0; + text-align: left; + } + .post-nav-next { + margin: 0 0 0 40px; + text-align: right; } } - .post-nav { - margin: 0 40px 0 0; - text-align: left; - } - .post-nav-next { - margin: 0 0 0 40px; - text-align: right; - } - } // album index .releases { - padding: 80px 0; - - .container { + .container { max-width: var(--max-width); margin: 0 auto; padding: 40px; - display:flex; + display: flex; flex-wrap: wrap; justify-content: space-between; h2 { @@ -248,20 +245,18 @@ footer { margin: 20px 0; } img { - width:100%; - height: 100%; + width: 100%; + height: 100%; object-fit: cover; border-radius: 5px; } } - } // Streambox .streambox { text-align: center; line-height: 2em; - } .streamer { max-width: var(--max-width); @@ -279,5 +274,4 @@ footer { margin: 0; justify-self: center; } - -} \ No newline at end of file +} diff --git a/backupindex.html b/backupindex.html deleted file mode 100644 index 7e01163..0000000 --- a/backupindex.html +++ /dev/null @@ -1,251 +0,0 @@ ---- -title: Music Syndicate -subtitle: Basspistol -description: >- - Homepage of Basspistol, The Outernational Music Syndicate established in 2010. - The underground is dead, Long Live the Underground! -tags: - - basspistol - - uuternational - - music - - syndicate - - homepage - - collective - - free - - culture -video_path: /assets/vid/intro_loop_.mp4 -image: /assets/vid/intro_loop_.jpg -logo_image: /siteicon.png ---- -{% include relBase.html %} - - - - - - - - - - - - - - - -{% include streamer.html %} - - -{% for post in site.posts limit: '2' %} - - - -{% endfor %} - - - - - - - - - - -
-
-

Releases

-

Collection of releases through time

-
-
- - - - - - -{% assign sorted = site.albums | sort: 'date' | reverse %} -{% for album in sorted %} - -
- - -
-

{{ album.title }}

-

{{ album.date | date: "%Y" }}

- - - -
-
- {{ album.title | smartify }} -
- -
- -{% endfor %} - - - -{% include footer.html %} \ No newline at end of file diff --git a/discography.html b/discography.html index 48ae39c..13b5f50 100644 --- a/discography.html +++ b/discography.html @@ -50,7 +50,7 @@ layout: default
-

Read Highlight

+

πŸ”Š play this release

diff --git a/highlights.html b/highlights.html index c96e032..deb0de7 100644 --- a/highlights.html +++ b/highlights.html @@ -35,7 +35,7 @@ layout: default
-

Read Highlight

+

πŸ“° Read Highlight

diff --git a/links.html b/links.html index 51fa69e..d1846c9 100644 --- a/links.html +++ b/links.html @@ -22,7 +22,7 @@ image: /assets/vid/links.jpg

✎ Edit Posy

+ class="btn">✎ Edit Post

@@ -33,7 +33,7 @@ image: /assets/vid/links.jpg
-

{{ post.title }}

+

πŸ”— {{ post.title }}

diff --git a/log.html b/log.html deleted file mode 100644 index 0be011c..0000000 --- a/log.html +++ /dev/null @@ -1,27 +0,0 @@ ---- -title: Web-Log -description: 'highlights, announcenments and thoughts going on in the εΎ’ setto γ‚»γƒƒγƒˆ Cypher. In written form intertwined with audio' -image: /images/pages/4-darkweb-instrumental-.jpeg ---- - -{% include relBase.html %} -{% include header.html %} -
-

Latest News

-
-{% for post in site.posts %} -{% if post.category == 'highlights' %} -
- -
-
-

{{ post.title }}

-

{% include forloop-dates.html %}

-

{{ post.description }}

-

Read post

-
- - -
-{% endif %} -{% endfor %} \ No newline at end of file