« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/page/album.js14
-rw-r--r--src/static/site.css4
-rwxr-xr-xsrc/upd8.js2
3 files changed, 12 insertions, 8 deletions
diff --git a/src/page/album.js b/src/page/album.js
index 76c9c5f0..ec994ebb 100644
--- a/src/page/album.js
+++ b/src/page/album.js
@@ -220,13 +220,6 @@ export function write(album, {wikiData}) {
                                 ${album.tracks.map(trackToListItem).join('\n')}
                             </${listTag}>
                         `}
-                        ${hasAdditionalFiles && generateAdditionalFilesList(album.additionalFiles, {
-                            // TODO: Kinda near the metal here...
-                            getFileSize: file => getSizeOfAdditionalFile(urls
-                                .from('media.root')
-                                .to('media.albumAdditionalFile', album.directory, file)),
-                            linkFile: file => link.albumAdditionalFile({album, file}),
-                        })}
                         ${album.dateAddedToWiki && fixWS`
                             <p>
                                 ${[
@@ -236,6 +229,13 @@ export function write(album, {wikiData}) {
                                 ].filter(Boolean).join('<br>\n')}
                             </p>
                         `}
+                        ${hasAdditionalFiles && generateAdditionalFilesList(album.additionalFiles, {
+                            // TODO: Kinda near the metal here...
+                            getFileSize: file => getSizeOfAdditionalFile(urls
+                                .from('media.root')
+                                .to('media.albumAdditionalFile', album.directory, file)),
+                            linkFile: file => link.albumAdditionalFile({album, file}),
+                        })}
                         ${album.commentary && fixWS`
                             <p>${language.$('releaseInfo.artistCommentary')}</p>
                             <blockquote>
diff --git a/src/static/site.css b/src/static/site.css
index d7b5fe12..70bc4945 100644
--- a/src/static/site.css
+++ b/src/static/site.css
@@ -722,6 +722,7 @@ p code {
 }
 
 blockquote {
+    margin-left: 40px;
     max-width: 600px;
     margin-right: 0;
 }
@@ -737,7 +738,8 @@ p img {
 }
 
 dl dt {
-    padding-left: 2em;
+    padding-left: 40px;
+    max-width: 600px;
 }
 
 dl dt {
diff --git a/src/upd8.js b/src/upd8.js
index b999ef7f..406e0b3d 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -1133,6 +1133,8 @@ writePage.oEmbedJSON = (pageInfo, {
     const { wikiInfo } = wikiData;
     const { canonicalBase, nameShort } = wikiInfo;
 
+    if (!socialEmbed) return '';
+
     const entries = [
         socialEmbed.heading && ['author_name',
             language.$('misc.socialEmbed.heading', {