diff --git a/.gitignore b/.gitignore index 26b9763..03450c9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ _data/.~lock.*.csv ## No cover artwork or Mp3 *.mp3 -assets/albums/ \ No newline at end of file +assets/albums/ +# No Media Symbolic links +media diff --git a/_config.yml b/_config.yml index ba0f9f7..2309803 100644 --- a/_config.yml +++ b/_config.yml @@ -29,9 +29,9 @@ banner: /images/setto-logo.svg banner-vert: /images/setto_logo.svg icon: /images/setto-logoicon.svg logo: /images/setto-logo.svg -logo-footer: /images/setto-logo-dark.svg -mediaurl: https://media.basspistol.com/setto.basspistol.com -# mediaurl: /assets/albums +logo-footer: /images/setto-logoicon-footer.svg +# mediaurl: https://media.basspistol.com/setto.basspistol.com +mediaurl: /media publisher: name: Basspistol diff --git a/_data/navigation.yml b/_data/navigation.yml index d043b5f..a50a0f1 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,16 +1,20 @@ +- name: Support + url: '#support' + icon: ๐ŸŒฎ + external: false - icon: "\U0001F4BD" - url: /discography/ + url: '/#read' name: Discog external_site: false - icon: "\U0001F4F0" - url: /log/ + url: https://t.basspistol.org/setto name: Log - external_site: false -- icon: "\U0001F4FA" + external_site: true +- icon: ๐Ÿ“น url: 'https://v.basspistol.org/accounts/setto/video-channels' name: Video external_site: true -- icon: "\U0001F43F" +- icon: ใŠ™๏ธ url: /about/ name: About external_site: false @@ -18,7 +22,7 @@ url: /links/ name: Links external_site: false -- icon: "\U0001F4E2" +- icon: ๐Ÿ‘‹ url: '/chat/#read' name: Chat external_site: false \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 7bf318a..1f4e840 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -16,7 +16,7 @@ -
{{ site.title }} Logo
+
{{ site.title }} Logo
diff --git a/_layouts/post.html b/_layouts/post.html index 53a8e46..c10bdd3 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -3,129 +3,133 @@ layout: default --- {% if page.category == 'releases' %} -{% include header.html %} + +{% include relBase.html %} + +
+
+

{{ page.title }}

+
+
+ +
+ +

{{ page.title }}

+

{{ page.description }}

+ + {% 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 %} +
+ {% endif %}{% endfor %} +
+
+
+ + + -
-
{% 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 %} -
-
-

๐Ÿ™ Support

-
-
-
-
-
- {% 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 %} -
-
-

- Published the - -

-
- Share this page: -
- -
-
-
-
-
{{ content }} diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 9be3e12..41396bf 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -134,7 +134,7 @@ body { width: 100px; height: 100px; line-height: 100px; - margin: 0 0 20px 0; + margin: 0 0 10px 0; padding:0; font-size: 65px; } @@ -218,10 +218,10 @@ section:first-of-type { footer { width: 100%; padding: 160px 20px 200px 20px; - background-color: var(--fg); + background-color: var(--border-alt); color: var(--bg); background-image: url("../img/vignette-footer.svg"); - background-size: 200px; + background-size: 500px; background-repeat: repeat-x; background-position: top; box-sizing: border-box; @@ -229,12 +229,14 @@ footer { a { color: var(--bg); } + .icon { color: var(--bg); border: 1px solid var(--bg); } .icon:hover { border: 1px solid var(--accent2); + color: var(--accent2); } .footframe { display: flex; @@ -253,7 +255,7 @@ footer { width: 100%; } li { - border-bottom: 1px solid var(--bg-alt); + line-height: 2; font-size: 1.5em; a { @@ -261,6 +263,9 @@ footer { text-decoration: none; color: var(--bg); } + a:hover { + color: var(--accent2); + } } } @@ -353,6 +358,9 @@ footer { text-align: center; line-height: 2em; padding: 0; + h2 { + margin-top: 80px; + } } .streamer { max-width: var(--max-width); diff --git a/_sass/libs/_vars.scss b/_sass/libs/_vars.scss index ab97381..032508b 100644 --- a/_sass/libs/_vars.scss +++ b/_sass/libs/_vars.scss @@ -130,9 +130,8 @@ font-family: 'Collects'; font-style: normal; font-weight: 500; - src: local('Collects'), local('Collects'), url(/assets/fonts/collects.ttf) format('truetype'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} + src: local('Collects'), local('Collects'), url(/assets/fonts/fz.otf) format('opentype'); + } $font: ( diff --git a/assets/fonts/GN_KillGothic_U_KanaO.ttf b/assets/fonts/GN_KillGothic_U_KanaO.ttf new file mode 100644 index 0000000..7e69cdd Binary files /dev/null and b/assets/fonts/GN_KillGothic_U_KanaO.ttf differ diff --git a/assets/fonts/Kaiso_Next_B.otf b/assets/fonts/Kaiso_Next_B.otf new file mode 100644 index 0000000..d280087 Binary files /dev/null and b/assets/fonts/Kaiso_Next_B.otf differ diff --git a/assets/fonts/NikkyouSans_B6aV.ttf b/assets/fonts/NikkyouSans_B6aV.ttf new file mode 100644 index 0000000..c255443 Binary files /dev/null and b/assets/fonts/NikkyouSans_B6aV.ttf differ diff --git a/assets/fonts/fz.otf b/assets/fonts/fz.otf new file mode 100644 index 0000000..6eb0649 Binary files /dev/null and b/assets/fonts/fz.otf differ diff --git a/assets/fonts/togalite_black.otf b/assets/fonts/togalite_black.otf new file mode 100644 index 0000000..c1c786f Binary files /dev/null and b/assets/fonts/togalite_black.otf differ diff --git a/images/setto-logoicon-footer.svg b/images/setto-logoicon-footer.svg new file mode 100644 index 0000000..c920b8e --- /dev/null +++ b/images/setto-logoicon-footer.svg @@ -0,0 +1,2 @@ + + diff --git a/index.html b/index.html index 399c29f..9866e84 100644 --- a/index.html +++ b/index.html @@ -12,19 +12,27 @@ apps: external: false - name: Video link: https://v.basspistol.org/video-channels/tosettosetto/ - icon: ๐Ÿ“บ + icon: ๐Ÿ“น external: true - - name: Read - link: '/log/' - icon: ๐Ÿ“ฐ - external: false - - name: Support + - name: Support๐ŸŽถ link: https://t.basspistol.org/setto/ - icon: ๐Ÿ“ข + icon: ๐Ÿ“ฐ external: true - - name: chat + - name: Chat link: '/chat/#read' - icon: ๐Ÿ—จ๏ธ + icon: ๐Ÿ“ก + external: false + - name: Matrix + link: https://matrix.to/#/@sakrecoer:basspistol.org + icon: ๐Ÿ•ธ + external: true + - name: Links + link: /links/ + icon: ๐Ÿ”— + external: false + - name: Music + link: '#read' + icon: ๐ŸŽถ external: false --- @@ -91,8 +99,8 @@ apps:

{{ site.title }}

{{ page.description }}

-
    {% for app in page.apps %} -
  • {{ app.icon }}
    • + @@ -101,67 +109,26 @@ apps: +
    -{% for post in site.posts limit: 3 %} -{% if post.category == 'ramblings' %} -
    +
    +{% assign sorted = site.posts | sort: 'date' | reverse %} +{% for post in sorted %} +{% if post.category == 'releases' %} +
    -
    -

    ✎ Edit Post

    +
    +
    +
    +

    {{ post.title }}

    +

    {% include forloop-dates.html %}

    +

    {{ post.description }}

    +

    ๐Ÿ”Š Listen

    -
    -
    -
    -

    {{ post.title }}

    - {{ post.description }} -
    - - +
    + -
    -
    -
    {% endif %} {% endfor %} - -
    -

    Releases

    -
    - {% assign sorted = site.albums | sort: 'date' | reverse %} - {% for album in sorted %} - {% for post in site.posts %} - {% if album.slug == post.album %} - -
    -
    - - Cover art for {{ post.title }} -
    - {{ album.name }}
    - - {% assign total = 0 %} - {% for track in album.tracks %} - {% assign total = total | plus: track.format.duration %} - {% endfor %} - - - {% assign round_seconds = total | 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 }} - -
    - - - {{ album.date | date: '%Y' }} -
    -
    -
    - - {% endif %} - {% endfor %} - {% endfor %} -
    -