Merge commit '28eb9d5827ebe9ec9ca6475ca929a5138afed828' into staging

4 files changed, 19 insertions, 12 deletions

diff --git a/album/unreleased-tracks.txt b/album/unreleased-tracks.txt
index 62664424..a561ecb6 100644
--- a/album/unreleased-tracks.txt
+++ b/album/unreleased-tracks.txt
@@ -4,7 +4,6 @@ Has Track Art: no
 Date: November 11, 1111
 Date Added: March 16, 2020
 Color: #ff7bf7
-Canon: Fanon
 -------------------------------------------------------------------------------
 Group: Tracks featured in Homestuck
 Color: #ff5599
@@ -1042,7 +1041,7 @@ Artist: Toby Fox
 Duration: 1:05
 URLs:
 - https://www.youtube.com/watch?v=pTk4m0S63Sg
-- /media/misc/archive/Hawkeye.mp3
+- https://hsmusic.wiki/media/misc/archive/Hawkeye.mp3
 -------------------------------------------------------------------------------
 Track: Heart Beat
 Artist: Pascal van den Bos
@@ -1269,7 +1268,8 @@ URLs: https://actomega.bandcamp.com/track/sburban-resolution
 Track: Sea of Derse
 Artist: Erik Scheele
 Duration: 2:48
-URLs: /media/misc/archive/Sea%20of%20Derse.mp3
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Sea%20of%20Derse.mp3
 -------------------------------------------------------------------------------
 Track: Seer of Same-Color Scalemate Combos
 Artist: Alex Rosetti
@@ -1281,7 +1281,8 @@ URLs:
 Track: Shooting Star
 Artist: Hilary Troiano
 Duration: 1:23
-URLs: /media/misc/archive/Shooting%20Star.mp3
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Shooting%20Star.mp3
 -------------------------------------------------------------------------------
 Track: Shut Me Down
 Artist: Tamara Fritz
@@ -1298,13 +1299,15 @@ References:
 - track:sburban-jungle
 - track:showtime-piano-refrain
 - track:skies-of-skaia
-URLs: /media/misc/archive/Skaia%20Voyages.mp3
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Skaia%20Voyages.mp3
 -------------------------------------------------------------------------------
 Track: Skaian Shuffle
 Artist: Clark Powell
 Duration: 4:16
 References: Skaian Skuffle
-URLs: /media/misc/archive/Skaian%20Shuffle.mp3
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Skaian%20Shuffle.mp3
 -------------------------------------------------------------------------------
 Track: Slamdown
 Artist: Noisemaker
@@ -1382,7 +1385,8 @@ URLs: https://soundcloud.com/aradia-jones/the-engineer-a-dirk-strider-1
 Track: The Paradox Paradigm
 Artist: Jack McMenamin
 Duration: 3:14
-URLs: /media/misc/archive/The%20Paradox%20Paradigm.mp3
+URLs:
+- https://hsmusic.wiki/media/misc/archive/The%20Paradox%20Paradigm.mp3
 -------------------------------------------------------------------------------
 Track: The Undying
 Artist: James Dever
@@ -1410,7 +1414,7 @@ Track: Vexation
 Artist: Chris Hafling
 Duration: 3:40
 URLs:
-- https://Pascal van den Bos.bandcamp.com/track/vexation
+- https://potatoboss.bandcamp.com/track/vexation
 -------------------------------------------------------------------------------
 Track: Violet Sea Breeze
 Artist: Willow Ascenzo
@@ -1433,7 +1437,8 @@ URLs: https://www.youtube.com/watch?v=kdfgB3Gc_pw
 Track: Where making this hapen
 Artist: David Ko
 Duration: 0:28
-URLs: /media/misc/archive/Where%20making%20this%20hapen.mp3
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Where%20making%20this%20hapen.mp3
 -------------------------------------------------------------------------------
 Track: White King
 Artist: Demographerist
diff --git a/artists.txt b/artists.txt
index e371a566..b19d655e 100644
--- a/artists.txt
+++ b/artists.txt
@@ -1115,7 +1115,7 @@ Artist: Drowning Pool
 -------------------------------------------------------------------------------
 Artist: DSNAKE
 URLs:
- -https://www.instagram.com/disorderly.snake/
+- https://www.instagram.com/disorderly.snake/
 -------------------------------------------------------------------------------
 Artist: Dragonnova
 Alias: Melissa Peebles
diff --git a/static-pages.txt b/static-pages.txt
index d9b6d424..0b771e0d 100644
--- a/static-pages.txt
+++ b/static-pages.txt
@@ -116,9 +116,11 @@ Content:
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
     - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
-        - fixed transcribed artist commentary not showing up for [[track:frogsong]] and [[track:schrodingers-harbinger]]
+        - fixed artist commentary not showing up for [[track:frogsong]] and [[track:schrodingers-harbinger]]
+        - fixed Instagram link not showing up for artist [[artist:DSNAKE]]
         - fixed YouTube and tumblr links not showing up for artist [[artist:first-turn-fold]]
         - fixed tumblr link not showing up for artist [[artist:thiefofstars]]
+        - fixed art tag [[tag:carapacians]] having a broken tag color (which messed up the layout of the tag's gallery page and styled links to it as default white instead of the intended light gray)
     - fixed [[La Espero]] not being listed in reference list for [[Malblanka Rozo Verda Stelo]] (thanks, Sgeo!)
         - added [[La Espero]] and artists [[artist:l-l-zamenhof]] and [[artist:flicien-menu-de-mnil]]
     - fixed incorrect capitalization for [[album:sburb-ost]]
diff --git a/tags.txt b/tags.txt
index 00303214..bb5cf19e 100644
--- a/tags.txt
+++ b/tags.txt
@@ -215,7 +215,7 @@ Tag: Frogs
 Color: #06ffc9
 -------------------------------------------------------------------------------
 Tag: Carapacians
-Color: #c6c6c
+Color: #c6c6c6
 -------------------------------------------------------------------------------
 Tag: Underlings
 Color: #ff2106