From 91e3b90179ca4b75dbbb1c06c8188dca0bdecf67 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com>
Date: Sat, 16 Dec 2023 11:49:48 +0000
Subject: Eiks 31 fixes (#43)

* Eiks 31 fixes

* Improves list styling
---
 scss/base/typography.scss                      |  2 +-
 scss/modules/committee.scss                    |  3 +-
 scss/modules/link-gallery.scss                 |  1 +
 scss/modules/nav.scss                          |  9 ++---
 scss/modules/product.scss                      | 11 ++++++
 scss/normalize.scss                            |  4 ---
 src/components/LallansIssueContributions.astro |  8 +++--
 src/components/LallansIssueContributors.astro  |  4 +--
 src/components/Scotsoun.astro                  |  2 +-
 src/content/news/en-GB/2023-12-10-eiks-31.mdx  | 48 ++++++++++++++++++--------
 src/content/news/sco/2023-12-10-eiks-31.mdx    | 45 ++++++++++++++++--------
 11 files changed, 91 insertions(+), 46 deletions(-)

diff --git a/scss/base/typography.scss b/scss/base/typography.scss
index b9936ec..9f40bcc 100644
--- a/scss/base/typography.scss
+++ b/scss/base/typography.scss
@@ -62,7 +62,7 @@ h4 {
   margin-block-start: 0;
 }
 
-p:not(:first-child) {
+:is(p, ol, ul):not(:first-child) {
   margin-block-start: var(--margin-block-sm);
 }
 
diff --git a/scss/modules/committee.scss b/scss/modules/committee.scss
index 8817fc1..2badf57 100644
--- a/scss/modules/committee.scss
+++ b/scss/modules/committee.scss
@@ -1,4 +1,5 @@
 .committee__member {
+  list-style-type: none;
   margin-block-start: var(--margin-block-sm);
 }
 
@@ -6,4 +7,4 @@
   margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width));
   width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width));
   border-radius: 50%;
-}
\ No newline at end of file
+}
diff --git a/scss/modules/link-gallery.scss b/scss/modules/link-gallery.scss
index c3788dc..56949e2 100644
--- a/scss/modules/link-gallery.scss
+++ b/scss/modules/link-gallery.scss
@@ -9,6 +9,7 @@
   text-align: center;
 
   li {
+    list-style-type: none;
     grid-column: span var(--gallery-item-column-span);
   }
 
diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss
index 44ec5c6..aebcbcf 100644
--- a/scss/modules/nav.scss
+++ b/scss/modules/nav.scss
@@ -1,5 +1,5 @@
 .nav > :not(:last-child) {
-  margin-block-end: var(--margin-block-sm);
+  margin-block: 0 var(--margin-block-sm);
 }
 
 .nav__bottom-row {
@@ -11,10 +11,11 @@
   display: grid;
   grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width));
   column-gap: var(--grid-gutter-width);
-}
 
-.nav__nav-links li {
-  margin: 0;
+  li {
+    list-style-type: none;
+    margin: 0;
+  }
 }
 
 .nav__logo {
diff --git a/scss/modules/product.scss b/scss/modules/product.scss
index 32fa37f..bc05dfd 100644
--- a/scss/modules/product.scss
+++ b/scss/modules/product.scss
@@ -18,3 +18,14 @@
   width: 100%;
   height: auto;
 }
+
+:is(.product__contributors, .product__contributions) {
+  list-style-type: none;
+}
+
+.product__contribution__title {
+  font-style: italic;
+  &:has(+ .product__contribution__author) {
+    margin-inline-end: 0.3em;
+  }
+}
diff --git a/scss/normalize.scss b/scss/normalize.scss
index 0130a0b..9d59ef8 100644
--- a/scss/normalize.scss
+++ b/scss/normalize.scss
@@ -110,7 +110,3 @@ a, :link, :visited {
   color: currentColor;
   text-decoration: none;
 }
-
-li {
-  list-style: none;
-}
diff --git a/src/components/LallansIssueContributions.astro b/src/components/LallansIssueContributions.astro
index 5d3084d..165829d 100644
--- a/src/components/LallansIssueContributions.astro
+++ b/src/components/LallansIssueContributions.astro
@@ -15,13 +15,15 @@ const t = translate(locale);
 
 <section>
   <h2>Contributions</h2>
-  <ul class="lallans-issue__contributions">
+  <ul class="product__contributions">
     {
       contributions.map((contribution) => (
         <li>
-          <span class="italic">{contribution.title}</span>
+          <span class="product__contribution__title">{contribution.title}</span>
           {'author' in contribution && (
-            <span> {t(tSite, { key: 'by' }) + ' ' + contribution.author}</span>
+            <span class="product__contribution__author">
+              {t(tSite, { key: 'by' }) + ' ' + contribution.author}
+            </span>
           )}
         </li>
       ))
diff --git a/src/components/LallansIssueContributors.astro b/src/components/LallansIssueContributors.astro
index 5ac5d42..4a5683c 100644
--- a/src/components/LallansIssueContributors.astro
+++ b/src/components/LallansIssueContributors.astro
@@ -8,9 +8,9 @@ interface Props {
 const { contributors } = Astro.props;
 ---
 
-<section class="lallans-contributors">
+<section>
   <h2>Contributors</h2>
-  <ul>
+  <ul class="product__contributors">
     {contributors.map((contributor) => <li>{contributor}</li>)}
   </ul>
 </section>
diff --git a/src/components/Scotsoun.astro b/src/components/Scotsoun.astro
index bbf9730..cca330d 100644
--- a/src/components/Scotsoun.astro
+++ b/src/components/Scotsoun.astro
@@ -56,7 +56,7 @@ const t = translate(locale);
     scotsoun?.trackList && scotsoun.trackList.length > 1 && (
       <>
         <h2>Track list</h2>
-        <ol>
+        <ol class="product__track-list">
           {scotsoun.trackList.map((track) => (
             <li>{track}</li>
           ))}
diff --git a/src/content/news/en-GB/2023-12-10-eiks-31.mdx b/src/content/news/en-GB/2023-12-10-eiks-31.mdx
index 1158dde..260eb1b 100644
--- a/src/content/news/en-GB/2023-12-10-eiks-31.mdx
+++ b/src/content/news/en-GB/2023-12-10-eiks-31.mdx
@@ -9,11 +9,11 @@ import Link from '$components/Link.astro';
 
 ## Sangschaw open for submissions!
 
-Our annual writing competition, the _Sangschaw_, is open for submissions!
-As ever, we will provide feedback for every entry regardless of whether or not
-you win an award. It’s unusual for competitions like us to provide feedback on
-entries, but we think it’s important to help writers develop. We have three
-prizes:
+Our annual writing competition, the _Sangschaw_, is open for submissions until
+the 31st of January! As ever, we will provide feedback for every entry
+regardless of whether or not you win an award. It’s unusual for competitions
+like us to provide feedback on entries, but we think it’s important to help
+writers develop. We have three prizes:
 
 - The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original
   Scots prose.
@@ -25,18 +25,15 @@ prizes:
 
 Writers new and old are all welcome, so don’t hold back! We look forward to
 having your entries!
-<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link>
-along with proof of payment, or with a cheque or cash to the following address:
 
-<address>
-  Sangschaw  
-  6 Dryden Place  
-  Edinburgh  
-  EH9 1RP  
-</address>
+You can enter for £5 for one category, £10 for two or £12 for all three. You
+can submit either by email or by post.
+
+### Submitting by email
 
-Address any cheque to the Scots Language Society. You can pay by bank transfer
-to the following account:
+If you would like to submit by email, first pay by bank transfer to the
+following account. Remember, it’s £5 for one, £10 for two or £12 for all
+three prizes.
 
 <dl>
   <dt>Account name</dt>
@@ -49,6 +46,27 @@ to the following account:
   <dd>83 47 00</dd>
 </dl>
 
+Then, send your entries to
+<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link> along with
+proof of payment. For example, you could send a picture of you bank statement,
+or a copy of the transaction reference.
+
+### Submitting by post
+
+If you would rather submit by post, send your entries with cash or cheque,
+as well as your name and address on a separate sheet of paper, to the following
+address:
+
+<address>
+  Sangschaw  
+  c/o 6 Dryden Place  
+  Edinburgh  
+  EH9 1RP  
+</address>
+
+Remember it’s £5 for one, £10 for two or £12 for all three prizes. Address any
+cheque to the Scots Language Society.
+
 ## Upcoming album release: _Leid_
 
 Our very own Wullie Hershaw will soon be releasing a new album of contemporary
diff --git a/src/content/news/sco/2023-12-10-eiks-31.mdx b/src/content/news/sco/2023-12-10-eiks-31.mdx
index 8aa6604..1b6dbbf 100644
--- a/src/content/news/sco/2023-12-10-eiks-31.mdx
+++ b/src/content/news/sco/2023-12-10-eiks-31.mdx
@@ -9,10 +9,11 @@ import Link from '$components/Link.astro';
 
 ## Sangschaw open for submeissions!
 
-Our annual scrievin competeition, the _Sangschaw_, is open for submeissions!
-As ey, we will provide feedback for ilka entry nae maiter whither ye win a
-tassie or no. There’s no mony competeitions provide feedback on entries, but
-we think it’s important tae help writers develop. We hae three tassies:
+Our annual scrievin competeition, the _Sangschaw_, is open for submeissions
+until the 31st o Januar! As ey, we will provide feedback for ilka entry nae
+maiter whither ye win a tassie or no. There’s no mony competeitions provide
+feedback on entries, but we think it’s important tae help writers develop. We
+hae three tassies:
 
 - The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal
   Scots prose.
@@ -25,19 +26,13 @@ we think it’s important tae help writers develop. We hae three tassies:
 New writers and auld haunds ar aa walcome, sae dinnae be blate! We luik forrit
 tae haein your entries!
 
-Ye can enter for £5 for ae categorie, £10 for twa or £12 for aw three. Send
-entries til <Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link>
-alang wi pruif o peyment or wi a cheque or cash til:
+Ye can enter for £5 for ae categorie, £10 for twa or £12 for aw three. Ye can
+either submit by email or by post.
 
-<address>
-  Sangschaw  
-  6 Dryden Place  
-  Edinburgh  
-  EH9 1RP  
-</address>
+### Submittin by email
 
-Address ony cheque til the Scots Language Society. Ye can pey bi bank transfer
-til the follaein account:
+Gin ye want tae submit by email, first pey by bank transfer til the follaein
+account. Mind it’s £5 for ane, £10 for twa or £12 for aw three tassies.
 
 <dl>
   <dt>Account nem</dt>
@@ -50,6 +45,26 @@ til the follaein account:
   <dd>83 47 00</dd>
 </dl>
 
+Syne, send your entries til
+<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link> alang wi pruif
+o peyment. For ensaumple, you could send a photae o your bank
+statement, or a copy o the transaction reference.
+
+### Submittin by post
+
+Gin ye want tae submit by post, send them wi cash or cheque as weill as your nem
+and your return address on a separate sheet o paper til the follaein address:
+
+<address>
+  Sangschaw  
+  c/o 6 Dryden Place  
+  Edinburgh  
+  EH9 1RP  
+</address>
+
+Mind it’s £5 for ane, £10 for twa or £12 for aw three tassies. Address ony
+cheque til the Scots Language Society.
+
 ## Upcomin album release: _Leid_
 
 Our ain Wullie Hershaw will shuin be releasin a new album o contemporar Scots
-- 
cgit v1.2.3