content, css: coverColumnContent -> artworkColumnContent, etc

5 files changed, 20 insertions, 22 deletions

diff --git a/src/content/dependencies/generateAlbumInfoPage.js b/src/content/dependencies/generateAlbumInfoPage.js
index 51329450..51632c99 100644
--- a/src/content/dependencies/generateAlbumInfoPage.js
+++ b/src/content/dependencies/generateAlbumInfoPage.js
@@ -116,7 +116,7 @@ export default {
 
         additionalNames: relations.additionalNamesBox,
 
-        coverColumnContent: [
+        artworkColumnContent: [
           (relations.cover
             ? relations.cover.slots({
                 showOriginDetails: true,
diff --git a/src/content/dependencies/generatePageLayout.js b/src/content/dependencies/generatePageLayout.js
index 9348acd8..070c7c82 100644
--- a/src/content/dependencies/generatePageLayout.js
+++ b/src/content/dependencies/generatePageLayout.js
@@ -93,7 +93,7 @@ export default {
       mutable: false,
     },
 
-    coverColumnContent: {
+    artworkColumnContent: {
       type: 'html',
       mutable: false,
     },
@@ -262,15 +262,15 @@ export default {
         ? data.canonicalBase + pagePathStringFromRoot
         : null);
 
-    const firstItemInCoverColumn =
-      html.smooth(slots.coverColumnContent)
+    const firstItemInArtworkColumn =
+      html.smooth(slots.artworkColumnContent)
         .content[0];
 
     const primaryCover =
-      (firstItemInCoverColumn &&
-       html.resolve(firstItemInCoverColumn, {normalize: 'tag'})
+      (firstItemInArtworkColumn &&
+       html.resolve(firstItemInArtworkColumn, {normalize: 'tag'})
          .attributes.has('class', 'cover-artwork')
-        ? firstItemInCoverColumn
+        ? firstItemInArtworkColumn
         : null);
 
     const titleContentsHTML =
@@ -327,11 +327,11 @@ export default {
         [
           titleHTML,
 
-          html.tag('div', {id: 'cover-art-column'},
+          html.tag('div', {id: 'artwork-column'},
             {[html.onlyIfContent]: true},
             {class: 'isolate-tooltip-z-indexing'},
 
-            slots.coverColumnContent),
+            slots.artworkColumnContent),
 
           subtitleHTML,
 
diff --git a/src/content/dependencies/generateTrackCoverArtworks.js b/src/content/dependencies/generateTrackArtworkColumn.js
index 1cd5bff0..1cd5bff0 100644
--- a/src/content/dependencies/generateTrackCoverArtworks.js
+++ b/src/content/dependencies/generateTrackArtworkColumn.js
diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js
index d2cdf416..7d531124 100644
--- a/src/content/dependencies/generateTrackInfoPage.js
+++ b/src/content/dependencies/generateTrackInfoPage.js
@@ -11,7 +11,7 @@ export default {
     'generateContributionList',
     'generatePageLayout',
     'generateTrackArtistCommentarySection',
-    'generateTrackCoverArtworks',
+    'generateTrackArtworkColumn',
     'generateTrackInfoPageFeaturedByFlashesList',
     'generateTrackInfoPageOtherReleasesList',
     'generateTrackList',
@@ -58,10 +58,8 @@ export default {
     additionalNamesBox:
       relation('generateAdditionalNamesBox', track.additionalNames),
 
-    covers:
-      (track.hasUniqueCoverArt || track.album.hasCoverArt
-        ? relation('generateTrackCoverArtworks', track)
-        : null),
+    artworkColumn:
+      relation('generateTrackArtworkColumn', track),
 
     contentHeading:
       relation('generateContentHeading'),
@@ -141,8 +139,8 @@ export default {
         color: data.color,
         styleRules: [relations.albumStyleRules],
 
-        coverColumnContent:
-          relations.covers,
+        artworkColumnContent:
+          relations.artworkColumn,
 
         mainContent: [
           relations.releaseInfo,
diff --git a/src/static/css/site.css b/src/static/css/site.css
index 26696e93..e4057620 100644
--- a/src/static/css/site.css
+++ b/src/static/css/site.css
@@ -1436,19 +1436,19 @@ hr.cute,
   overflow: hidden;
 }
 
-#cover-art-column .cover-artwork {
+#artwork-column .cover-artwork {
   box-shadow:
     0 2px 14px -6px var(--primary-color),
     0 0 12px 12px #00000080;
 }
 
-#cover-art-column .cover-artwork:not(:first-child) {
+#artwork-column .cover-artwork:not(:first-child) {
   margin-top: 20px;
   margin-left: 30px;
   margin-right: 5px;
 }
 
-#cover-art-column .cover-artwork:last-child:not(:first-child) {
+#artwork-column .cover-artwork:last-child:not(:first-child) {
   margin-bottom: 25px;
 }
 
@@ -3458,7 +3458,7 @@ main.long-content .content-sticky-heading-container .content-sticky-subheading-r
   /* Cover art floats to the right. It's positioned in HTML beneath the
    * heading, so pull it up a little to "float" on top.
    */
-  #cover-art-column {
+  #artwork-column {
     float: right;
     width: 40%;
     max-width: 400px;
@@ -3471,7 +3471,7 @@ main.long-content .content-sticky-heading-container .content-sticky-subheading-r
   /* ...Except on top-indexes, where cover art is displayed prominently
    * between the heading and subheading.
    */
-  #content.top-index #cover-art-column {
+  #content.top-index #artwork-column {
     float: none;
     margin: 2em auto 2.5em auto;
     max-width: 375px;
@@ -3578,7 +3578,7 @@ main.long-content .content-sticky-heading-container .content-sticky-subheading-r
     --responsive-padding-ratio: 0.02;
   }
 
-  #cover-art-column {
+  #artwork-column {
     margin: 25px 0 5px 0;
     width: 100%;
     max-width: unset;