diff --git a/package-lock.json b/package-lock.json index e296ed24..c8d31e26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "19.6.2", + "version": "19.6.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "19.6.2", + "version": "19.6.3", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -1149,9 +1149,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.811", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.811.tgz", - "integrity": "sha512-CDyzcJ5XW78SHzsIOdn27z8J4ist8eaFLhdto2hSMSJQgsiwvbv2fbizcKUICryw1Wii1TI/FEkvzvJsR3awrA==", + "version": "1.4.812", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.812.tgz", + "integrity": "sha512-7L8fC2Ey/b6SePDFKR2zHAy4mbdp1/38Yk5TsARO66W3hC5KEaeKMMHoxwtuH+jcu2AYLSn9QX04i95t6Fl1Hg==", "dev": true, "license": "ISC" }, diff --git a/package.json b/package.json index 14e41dd7..ceacf04b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "19.6.2", + "version": "19.6.3", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_includes/partials/media/music/chart.liquid b/src/_includes/partials/media/music/chart.liquid index 09f8779f..e6d8f45f 100644 --- a/src/_includes/partials/media/music/chart.liquid +++ b/src/_includes/partials/media/music/chart.liquid @@ -1,29 +1,32 @@
{% assign items = data.items | default: data %} - {% for item in items limit: count | default: items.size %} - {%- assign playTotal = playTotal | default: mostPlayed -%} - {%- assign percentage = item.plays | calculatePlayPercentage: playTotal -%} -
-
-
{{ item.rank | formatNumber }}.
-
-
- {{ item.title }} +
    + {% for item in items limit: count | default: items.size %} + {%- assign playTotal = playTotal | default: mostPlayed -%} + {%- assign percentage = item.plays | calculatePlayPercentage: playTotal -%} +
  1. +
    +
    +
    + + {% capture playsLabel %} + {% if item.plays > 1 %} + plays + {% else %} + play + {% endif %} + {% endcapture %} +
    {{ item.artist }}
    +
    {{ item.plays }} {{ playsLabel }}
    +
    - {% capture playsLabel %} - {% if item.plays > 1 %} - plays - {% else %} - play - {% endif %} - {% endcapture %} -
    {{ item.artist }}
    -
    {{ item.plays }} {{ playsLabel }}
    + {% render "partials/media/progress-bar.liquid", percentage:percentage %}
    -
- {% render "partials/media/progress-bar.liquid", percentage:percentage %} -
- {% endfor %} + + {% endfor %} +
{% unless count %} {% render "partials/widgets/paginator.liquid", pagination:data %} diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index 41240c47..641137a3 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -139,7 +139,8 @@ a { flex-direction: row; align-items: center; - & + .page-header { + & + .page-header, + & + .music-chart { margin-top: var(--sizing-base); } } diff --git a/src/assets/styles/components/menu.css b/src/assets/styles/components/menu.css index 96d3df7d..8c413cf9 100644 --- a/src/assets/styles/components/menu.css +++ b/src/assets/styles/components/menu.css @@ -1,7 +1,7 @@ .menu-primary { display: flex; flex-direction: row; - list-style-type: none; + list-style: none; margin: 0; padding: 0; gap: var(--sizing-md); diff --git a/src/assets/styles/components/music-chart.css b/src/assets/styles/components/music-chart.css index aedfdaad..3cb2bd0e 100644 --- a/src/assets/styles/components/music-chart.css +++ b/src/assets/styles/components/music-chart.css @@ -1,6 +1,15 @@ .music-chart { margin-bottom: var(--sizing-base); + & ol { + padding-left: 0; + margin-top: 0; + + & li:first-of-type { + margin-top: 0; + } + } + & .item { display: flex; flex-direction: row; @@ -76,10 +85,6 @@ white-space: nowrap; } - & .count { - margin-right: var(--sizing-sm); - } - & .info { max-width: calc(75% - var(--sizing-lg)); } @@ -110,6 +115,10 @@ @media screen and (min-width: 768px) { .music-chart { + & ol { + list-style-position: outside; + } + & .meta, & .presentation { width: calc(80% - var(--sizing-lg));