Styling of Composition page and div refactoring.

pages/resources/com/jessebrault/site/CompositionsPageTemplate.wvc

@@ -4,6 +4,7 @@ package com.jessebrault.site
 import com.jessebrault.site.composition.CompositionCategory
 ---
 <StandardPage title={title}>
+    <div class="article-container">
         <article class="compositions">
             <h1>Compositions</h1>
             <div class="composition-categories">
@@ -16,4 +17,5 @@ import com.jessebrault.site.composition.CompositionCategory
                 />
             </div>
         </article>
+    </div>
 </StandardPage>

pages/resources/com/jessebrault/site/biography/BiographyPageTemplate.wvc

@@ -4,7 +4,9 @@ package com.jessebrault.site.biography
 import com.jessebrault.site.StandardPage
 ---
 <StandardPage title={title} banner={<BiographyBanner />}>
+    <div class="article-container">
         <article>
             <%= renderBiography() %>
         </article>
+    </div>
 </StandardPage>

pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc

@@ -4,23 +4,31 @@ package com.jessebrault.site.composition
 import com.jessebrault.site.StandardPage
 ---
 <StandardPage title={title}>
+    <div class="article-container">
+        <a id="back-to-compositions" href="/compositions">Back to compositions</a>
         <article>
             <section class="composition-info">
-            <h1>$composition.title</h1>
+                <div class="composition-titles-year-container">
-            <WhenNotNull item={composition.subTitle} render={<h2>$it</h2>} />
+                    <div class="composition-titles">
-            <WhenNotNull item={composition.version} render={<p class="version">$it</p>} />
+                        <h1 class="title">$composition.title</h1>
+                        <WhenNotNull item={composition.subTitle} render={<h2 class="sub-title">$it</h2>} />
+                    </div>
                     <p class="year">$compositionYear</p>
+                </div>
+                <WhenNotNull item={composition.version} render={<p class="version">$it</p>} />
                 <p class="instrumentation">$composition.instrumentation</p>
                 <WhenNotEmpty items={alternateVersions}>
-                <p>Alternate versions:
+                    <div class="alternate-versions">
+                        <p>Alternate versions:</p>
                         <ul>
                             <Each items={alternateVersions} transform={<li><a href={it.path}>${it.versionName}</a></li>} />
                         </ul>
-                </p>
+                    </div>
                 </WhenNotEmpty>
             </section>
             <section class="composition-text">
                 ${composition.text.render()}
             </section>
         </article>
+    </div>
 </StandardPage>

pages/resources/com/jessebrault/site/contact/ContactPageTemplate.wvc

@@ -4,6 +4,7 @@ package com.jessebrault.site.contact
 import com.jessebrault.site.StandardPage
 ---
 <StandardPage title={title} banner={<ContactBanner />} pageScripts={['/contact.js']}>
+    <div class="article-container">
         <article class="contact">
             <h1>Contact</h1>
             <p>Please use the following form to contact Jesse Brault directly.</p>
@@ -38,4 +39,5 @@ import com.jessebrault.site.StandardPage
                 </div>
             </form>
         </article>
+    </div>
 </StandardPage>

static/main.css

@@ -91,11 +91,18 @@ main {
     align-items: center;
 }
 
+.article-container {
+    display: flex;
+    flex-direction: column;
+    row-gap: 25px;
+    padding: 50px 25px;
+    max-width: 70ch;
+    min-width: min(100%, 70ch);
+}
+
 article {
     font-family: var(--garamond);
     letter-spacing: 0.05em;
-    padding: 50px 25px;
-    max-width: 70ch;
     text-align: justify;
 }
 
@@ -183,10 +190,6 @@ button {
     cursor: pointer;
 }
 
-.compositions {
-    min-width: min(100%, 700px);
-}
-
 .composition-categories {
     display: flex;
     flex-direction: column;
@@ -251,6 +254,37 @@ button {
     font-size: 1.25em;
 }
 
+.composition-info {
+    display: flex;
+    flex-direction: column;
+    row-gap: 10px;
+}
+
+.composition-info .composition-titles-year-container {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+}
+
+.composition-info p,
+.composition-info .title {
+    margin-block: 0;
+}
+
+.composition-info .year {
+    font-size: 1.5em;
+}
+
+.composition-info .alternate-versions {
+    display: flex;
+    flex-direction: column;
+    row-gap: 5px;
+}
+
+.composition-info .alternate-versions ul {
+    margin: 0;
+}
+
 .contact-banner article.social-media-links {
     font-family: var(--gothic);
 }