Merge branch 'preview' of https://github.com/recordcrash/hsmusic-data into canmt-makin

4 files changed, 8 insertions, 7 deletions

diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index 7e609186..72da12ea 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -59,7 +59,7 @@ Referenced Tracks:
 - dESPERADO ROCKET CHAIRS,
 - Spider's Claw
 ---
-Track: Unfriendly RIvalry
+Track: Unfriendly Rivalry
 Duration: '1:05'
 Artists:
 - Sonnivate
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index 24f678a9..8c5cbfa0 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -473,9 +473,9 @@ Commentary: |-
 
     Um, and then, then it moves into another part which is... kind of hard to hear but there's a little bit of [[track:upward-movement-dave-owns|Dave Rocks- Rocks at this Game]]? Is that what it's called? <i>(Note: Referring to the original title of Upward Movement, 'Dave Fucking Owns at this Game')</i> Wow I don't even know the songs of the MS Paint Adventures music team, I'm the worst member! [laughter] But anyway, anyway, but you can hear like the [singing] underneath the violin melody and then after that it goes into what was the ending to Shooting Star which is this, um... it-it's um, I think it's one of the strongest parts of the song because it's a... It's basically like, it's supposed to sound like kind of like just like breaking free you know like, like it rises and then at the very end it just, goes off into it's own place um...
 
-    One of the other interesting things about Homefree- waitwaitwait, I need to address something about Homefree [laughter] okay so, I know the MS Paint Adventures music team, we get a lot of people say 'Ohh this sounds like this this sounds like [[artist:touhou-project|Touhou]] this sounds like' I don't know um [laughter] I didn't mean to make this sound like a Pokemon song, I realized after it was already out there that, yeah, that ther-there's a part to it that really does sound like a [[artist:pokemon|]]Pokemon battle theme [laughter] oh god! That wasn't intentional, that really wasn't intentional but um [laughter] I guess that's what happens when you're part of the Pokemon fandom for so long like I mean I w— I was actually a really really obssessed fan for a while like-like I don't know if any of you, if you've been to Bulbagarden, if you've ever used the Bulbapedia or listened to the Bulbacast, yeah I used to be part of all that I used to be like the top editor of Bulbapedia and I used to like just rant about how Brock was the greatest character ever on the Bulbacast [laughter] I don't really do that anymore now and so that's part of the reasons why it's so embarassing that [laughter] my music sounds like Pokemon music [laughter] oh god! Okay okay anyway, um... yeah anyway, so.
+    One of the other interesting things about Homefree- waitwaitwait, I need to address something about Homefree [laughter] okay so, I know the MS Paint Adventures music team, we get a lot of people say 'Ohh this sounds like this this sounds like [[artist:touhou-project|Touhou]] this sounds like' I don't know um [laughter] I didn't mean to make this sound like a Pokemon song, I realized after it was already out there that, yeah, that ther-there's a part to it that really does sound like a [[artist:pokemon|Pokemon]] battle theme [laughter] oh god! That wasn't intentional, that really wasn't intentional but um [laughter] I guess that's what happens when you're part of the Pokemon fandom for so long like I mean I w— I was actually a really really obssessed fan for a while like-like I don't know if any of you, if you've been to Bulbagarden, if you've ever used the Bulbapedia or listened to the Bulbacast, yeah I used to be part of all that I used to be like the top editor of Bulbapedia and I used to like just rant about how Brock was the greatest character ever on the Bulbacast [laughter] I don't really do that anymore now and so that's part of the reasons why it's so embarassing that [laughter] my music sounds like Pokemon music [laughter] oh god! Okay okay anyway, um... yeah anyway, so.
 
-    One-one thing that I-that I did wanna make it sound like though and I don't really remember what inspired this but, in the last section I was like 'You know what? Um, since this is- since time is such a big theme in Homestuck, I think I'm gonna try and make it sound like the [[track:westminster-quarters|Westminster bells]] playing here' and-and so you hear those [singing] which actually isn't how the Westminster bells go but y'know what, screw it! That's how I remember them because, I don't actually hear the Westminster bells that often. [laughter] No, that's a lie, I used to hear them all the time in college and I still don't remember exactly how the notes go, um. [laughter]. So, anyway, anyway. Um... but... wait no, I remember now! I remember what led to it! Because I noticed that exactly at 4 minutes and 13 seconds into the song like it-like I was like 'It would sound really good if there was just a bell chiming here and it's-and it's like [singing]' and then I was like, I was like 'You know what? Let's-let's make it sound like this is where the clock strikes twelve and it's like, so earlier there's the Westminster bells which starts, which plays right before... right when the clock strikes mid-midnight or noon or any sort of twelve, and then at 4 minutes and 13 seconds in it starts chiming, um, like that's when the... final countdown ends, whatever you wanna call it, like when the, when the timer runs out and hits zero. Um, and for a bit I actually considered since the-th-it actually only chimes four times, I was thinking of having just eight more chimes of it while nothing else was playing. I... didn't actually go with that though because I thought that would just sound weird and artsy to most people like you know, why didn't the song already end, why can't I go on listening to the next song... but I don't know, anyway. [laughter]
+    One-one thing that I-that I did wanna make it sound like though and I don't really remember what inspired this but, in the last section I was like 'You know what? Um, since this is- since time is such a big theme in Homestuck, I think I'm gonna try and make it sound like the [[track:westminister-quarters|Westminster bells]] playing here' and-and so you hear those [singing] which actually isn't how the Westminster bells go but y'know what, screw it! That's how I remember them because, I don't actually hear the Westminster bells that often. [laughter] No, that's a lie, I used to hear them all the time in college and I still don't remember exactly how the notes go, um. [laughter]. So, anyway, anyway. Um... but... wait no, I remember now! I remember what led to it! Because I noticed that exactly at 4 minutes and 13 seconds into the song like it-like I was like 'It would sound really good if there was just a bell chiming here and it's-and it's like [singing]' and then I was like, I was like 'You know what? Let's-let's make it sound like this is where the clock strikes twelve and it's like, so earlier there's the Westminster bells which starts, which plays right before... right when the clock strikes mid-midnight or noon or any sort of twelve, and then at 4 minutes and 13 seconds in it starts chiming, um, like that's when the... final countdown ends, whatever you wanna call it, like when the, when the timer runs out and hits zero. Um, and for a bit I actually considered since the-th-it actually only chimes four times, I was thinking of having just eight more chimes of it while nothing else was playing. I... didn't actually go with that though because I thought that would just sound weird and artsy to most people like you know, why didn't the song already end, why can't I go on listening to the next song... but I don't know, anyway. [laughter]
 
     Long story short, um... actually I don't know what is the long story short. Well i-it's basically, um, it's not quite the Homestuck theme. I-i-it's, I do-I don't think it's gonna be used, I don't think Hussie's ever gonna use any of my stuff but, you know I'm, I'm really happy whenever I get anybody saying that they like my work, like, that's really one of the best things about writing music I'm not even gonna lie. I mean, I love doing all kinds of art, I love, I love writing, I love drawing, I'm not really that great at anything except programming [laughter] but, um, one of the things I love most about music um, is, when you're a musician, there's... uhh how do I even explain this... um it's like... a lot of people really love it, but there's so few people who really know-know how to get into it like, they think that you know, you have to be a really blessed singer or, or um... like you need to have just been born playing the saxophone or something and, you need like uh, an agent recognize you- I don't think any of that's really necessary to really, just start writing music and start enjoying it like, I-I-I think people would— it's kind of like any art, it takes, it takes some practice and theb all of a sudden you'll start surprising yourself like 'Wow, did I really make that? Is it really possible for someone to make something that sounds like this? Is it possible for me to make something that sounds like this? I don't need help, I can do this on my own?' Um, or maybe that's just how it was for me I mean... I, I... sometimes I still think it's kind of amazing that I can make anything never mind something that, gets-that's part of such a really amazingly talented team such as the MSPA music team... [laughter]
 ---
diff --git a/news.yaml b/news.yaml
index 3bbdc1bb..a2ae0148 100644
--- a/news.yaml
+++ b/news.yaml
@@ -345,7 +345,7 @@ Content: |-
     Still, delving back into nearly all build code presented us with a prime opportunity to polish and refine the existing pages. Here's a summary of what's new:
     - Thumbnails have replaced full-size images embedded on nearly every page! This was actually a very long-standing issue, and made accessing the wiki with slower internet connections or limited bandwidth much more difficult than necessary. So we've finally implemented thumbnails across the site, making media sizes around 20% the original across the whole site!
     - Artist pages have been refined a significant deal; particularly, we've done our best to reduce visual noise across the whole layout. So, [[artist:michael-guy-bowman|"featured in" links]] have been removed (and placed instead in [[listing:tracks/in-flashes/by-album|this listing]]), and [[artist:aysha-u-farah|flash/game contribution dates]] have been combined into an easier-to-read range. Plus, the total duration of tracks an artist has contributed to an album is now shown next to that album's name and date! Pretty nifty.
-    - We adjusted various strings across the site; a particularly notable example is at the [[commentary-index:_|Commentary index]]! Album lines used to read, for example, "19/20 entries; 8.4k words". That's been simplified to "8.4k words across 19 entries".
+    - We adjusted various strings across the site; a particularly notable example is at the [[commentary-index:-|Commentary index]]! Album lines used to read, for example, "19/20 entries; 8.4k words". That's been simplified to "8.4k words across 19 entries".
     - We also tweaked strings for [[listing-index:listings|listings]], and added a few new convenience features too:
         - Before, [[listing:groups/by-name|Groups - by Name]] and [[listing:groups/by-category|Groups - by Category]] would each open a group's Info section and a group's Gallery section, respectively. This was because <em>in general</em> we default to linking to info pages rather than galleries, but <i>Groups - by Category</i> was being linked from gallery pages themselves - via the "choose another group to filter by" button. With this update, group names in both listings link to the info page by default, but we've added adjacent gallery links for that original easy access as well!
         - As mentioned in the artist page summary, we've moved "featured in" links over to [[listing:tracks/in-flashes/by-album|Tracks - in Flashes & Games (by Album)]]. We feel they fit better here!
@@ -391,7 +391,7 @@ Content: |-
     The biggest feature addition this release, as you might've already spotted, is wallpapers for albums! These are easiest to explain by showing them off - some of my favorites are [[album:homestuck-vol-5]], [[album:coloUrs-and-mayhem-universe-a]], and [[album:cosmic-caretakers]]. Album wallpapers are a way to revive the original themes of albums released on Bandcamp and give album and track pages their own personal flare, while still leaving the main design of the site untouched, aiming for a cohesively creative look! Much thanks go to Niklink for suggesting this back in December, and helping with research as well as editing throughout the whole process.
     Besides album wallpapers, there are a few other smaller additions too:
     - As evident in where you're reading this now, news entries now have their own pages!
-    - Building on the code for above, we've replaced the old, gargantuan "All Commentary" page with individual commentary pages for each album. (Check out the [[commentary-index:_|Commentary]] index to explore!) These are a distraction-free way to browse the commentary for an album; it's great if you're listening to a whole release and want to follow its commentary alongside playback. Plus it shows off the new album wallpapers. :)
+    - Building on the code for above, we've replaced the old, gargantuan "All Commentary" page with individual commentary pages for each album. (Check out the [[commentary-index:-|Commentary]] index to explore!) These are a distraction-free way to browse the commentary for an album; it's great if you're listening to a whole release and want to follow its commentary alongside playback. Plus it shows off the new album wallpapers. :)
     - There's a footer on all pages now too, thanking supporters and contributors and linking people back to the support and feedback pages. It'll hopefully help show that the wiki really is a group project, and encourage interested folks to get involved!
     Finally, there have been a bunch of internal changes. I won't bore you with the technical details - those are in the [[static:changelog#12-feb-2021|changelog]]! :)
     But here, I do want to share a little about the goals we're working towards (and that this code is a big part of). Together - both the dev and the community of contributors! - we've created a really fantastic and powerful music wiki I know I'm proud of, seeing how it's grown and improved since it started! As that development continues, we've been facing a few big questions about the grander context of the wiki.
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 434b920c..653f2283 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -18,6 +18,7 @@ Style: |-
     }
 
     h3 {
+        margin-top: 1em;
         margin: 0;
         font-size: 1em;
     }
@@ -806,7 +807,7 @@ Content: |-
     - removed "Featured in" links, since these were taking up a lot of visual space
         - this has been added to [[listing:tracks/in-flashes/by-album|Tracks - in Flashes &amp; Games (by Album)]] instead
     <h3>commentary pages</h3>
-    - cleaned [[commentary-index:_|commentary index]] layout and strings (e.g. before: "19/20 entries; 8.4k words", after: "8.4k words across 19 entries")
+    - cleaned [[commentary-index:-|commentary index]] layout and strings (e.g. before: "19/20 entries; 8.4k words", after: "8.4k words across 19 entries")
     <h3>track pages</h3>
     - reference list is only divided into "fandom" and "official" if a group with directory "official" is present in the first place
         - this is essentially hard-coded, but is a quick and simple fix for all references on wikis without the concept displaying as "fandom" references
@@ -880,7 +881,7 @@ Content: |-
         - almost all content across the wiki is now totally dynamic; e.g, wiki name and color scheme are stored in a data file
         - static pages like Changelog and Donate are no longer hard-coded and can be added or removed without editing the wiki code
         - homepage rows can also be customized; while there's only one type of row available currently (albums from list or group and optionally action links), the foundations are there to add more in the future
-        - most site features, e.g. [[site:flash/|Flashes &amp; Games]], [[listing-index:_|Listings]], and [[news-index:_|News]], can now be selectively enabled and disabled
+        - most site features, e.g. [[site:flash/|Flashes &amp; Games]], [[listing-index:-|Listings]], and [[news-index:-|News]], can now be selectively enabled and disabled
         - a variety of changes to the internal text transformer, making longform text in data files (e.g. commentary, lyrics, static pages) much easier to read and write
         - <a href="https://git.ed1.club/nebula/hsmusic-wiki/">code</a> and <a href="https://git.ed1.club/nebula/hsmusic-data/">data</a> repositories have been separated (media as well, but it's not pushed online anywhere yet); CLI tool for actually building the site has been updated accordingly
         - all these changes are in service of making running your own wiki off the same codebase accessible and powerful; there's still much to be done before it's totally ready, though