From 5d5e2f8aa5c4030c33bf06f2cb817b9d770cc884 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> Date: Thu, 21 Dec 2023 21:21:30 +0000 Subject: Improve CSS reset (#51) * Font size inflation * Removes main adjustment for IE * Documents hr corrections * Documents pre corrections * Documents abbr[title] corrections * Documents b, strong corrections * Squishes pre rule with code,kbd,samp * Documents sub,sub line-height fix * Removes IE fix for img borders * Documents form control resets * Documents details display:block * Documents summary correction * Removes [hidden] fix for IE * Adds border-box sizing rules * Refactors links --- src/components/LallansIssuesGallery.astro | 2 +- src/components/Link.astro | 9 --------- src/components/Navbar/Breadcrumbs.astro | 4 +--- src/components/ScotsounCdGallery.astro | 2 +- src/components/SwitchLanguageLink.astro | 2 +- src/content/news/en-GB/2023-03-17-eiks-30.mdx | 9 ++++----- src/content/news/en-GB/2023-12-10-eiks-31.mdx | 11 +++++------ src/content/news/sco/2023-03-17-eiks-30.mdx | 9 ++++----- src/content/news/sco/2023-12-10-eiks-31.mdx | 13 ++++++------- src/data/committee.ts | 12 ++++-------- src/i18n/translations/pages/404.ts | 4 ++-- src/i18n/translations/pages/home.ts | 20 ++++++++++---------- src/pages/[locale]/furthsettins/index.astro | 4 ++-- .../[issueNumber]/payment-success-confirmation.astro | 2 +- .../[scotsounId]/payment-success-confirmation.astro | 2 +- src/pages/[locale]/index.astro | 2 +- 16 files changed, 44 insertions(+), 63 deletions(-) delete mode 100644 src/components/Link.astro (limited to 'src') diff --git a/src/components/LallansIssuesGallery.astro b/src/components/LallansIssuesGallery.astro index fd0ad0a..3e79de9 100644 --- a/src/components/LallansIssuesGallery.astro +++ b/src/components/LallansIssuesGallery.astro @@ -17,7 +17,7 @@ function issueNumberDescending(issue1: LallansIssue, issue2: LallansIssue) { issues.map(async (issue) => (
  • diff --git a/src/components/Link.astro b/src/components/Link.astro deleted file mode 100644 index 365441e..0000000 --- a/src/components/Link.astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -interface Props { - href: string; -} - -const { href } = Astro.props; ---- - - diff --git a/src/components/Navbar/Breadcrumbs.astro b/src/components/Navbar/Breadcrumbs.astro index 1e82fd9..f949873 100644 --- a/src/components/Navbar/Breadcrumbs.astro +++ b/src/components/Navbar/Breadcrumbs.astro @@ -23,9 +23,7 @@ const t = translate(locale); parentRoutes.map((route) => { return (
  • - - {t(tBreadcrumbs, { key: route })} - + {t(tBreadcrumbs, { key: route })}
    • ); }) diff --git a/src/components/ScotsounCdGallery.astro b/src/components/ScotsounCdGallery.astro index d2c7e0b..3908f4d 100644 --- a/src/components/ScotsounCdGallery.astro +++ b/src/components/ScotsounCdGallery.astro @@ -17,7 +17,7 @@ function scotsounIdDescending(scotsoun1: Scotsoun, scotsoun2: Scotsoun) { scotsoun.map((scotsounItem) => (
  • diff --git a/src/components/SwitchLanguageLink.astro b/src/components/SwitchLanguageLink.astro index fce633f..abbf0cb 100644 --- a/src/components/SwitchLanguageLink.astro +++ b/src/components/SwitchLanguageLink.astro @@ -20,7 +20,7 @@ const otherLocalePath = currentPath const t = translate(otherLocale); --- - + { t(tPage, { key: 'language-link-text', diff --git a/src/content/news/en-GB/2023-03-17-eiks-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-30.mdx index 34a83ac..20c280f 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-30.mdx @@ -5,7 +5,6 @@ summary: >- Conference in Perth and of our anthologies, which are having very positive reviews and are well worth the money. --- -import Link from '$components/Link.astro'; import Schedule from '$components/Schedule.astro'; ## Annual Conference @@ -30,9 +29,9 @@ The Annual Conference of the Scots Language Society will be held on Saturday the /> The cost of attending the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Elaine Morton on -failte@go-plus.net. +[failte@go-plus.net](mailto:failte@go-plus.net). ## Sangschaw 2023 Winners @@ -163,9 +162,9 @@ The Scots Language Society is a registered charity run by volunteers. By being a member of the Society, you are already giving the Scots language a boost. You can help us further by purchasing one or both of our first-rate 50th-anniversary anthologies: contact our membership Secretary, George T Watt -at lallans@hotmail.co.uk +at [lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Willie Hershaw at -w.hershaw678@btinternet.com. +[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). Every book costs £12.99 including postage. Overseas orders incur an additional £5 for postage. Included is a selection of the best Scots poetry and prose from across 50 years and hundred issues of Lallans. 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 aff0d2a..39075bf 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 @@ -5,7 +5,6 @@ summary: >- Scots-language audio guide at Linlithgow Palace and an upcoming album release from our very own Wullie Hershaw. --- -import Link from '$components/Link.astro'; ## Sangschaw open for submissions! @@ -47,7 +46,7 @@ following account. Remember, it’s £5 for one submission or £12 for three. Then, send your entries to -failte@go-plus.net along with +[failte@go-plus.net](mailto:failte@go-plus.net) along with proof of payment. For example, you could send a picture of you bank statement, or a copy of the transaction reference. @@ -74,9 +73,9 @@ Scots songs titled _Leid_. It will be coming early in the new year, so stay tuned in! To whet your appetite, you can -listen to the title track on YouTube. +[listen to the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). You can also have a listen to the musical work of his group, -the Bowhill Players on Bandcamp. +[the Bowhill Players on Bandcamp](https://thebowhillplayers.bandcamp.com). ## New audio guide at Linlithgow Palace @@ -87,7 +86,7 @@ opportunity to hear the voices of the court in something approaching their own language. You can read more -about the new audio guides on the Historic Environment Scotland website. +[about the new audio guides on the Historic Environment Scotland website](https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace). As far as we know, this is the first such venture, not only by Historic Environment Scotland, but at any major tourist attraction. Can anybody think of @@ -101,7 +100,7 @@ subscribers entitled to issue 103, failed to receive their copies. If you haven’t yet received your copy of _Lallans_ 103, which he posted out on Wednesday the 7th of November, please email George at -georgetwatt@hotmail.com +[georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) and make us aware of it. A copy of _Lallans_ 103 will be posted out to you straight away! diff --git a/src/content/news/sco/2023-03-17-eiks-30.mdx b/src/content/news/sco/2023-03-17-eiks-30.mdx index 201642c..caee203 100644 --- a/src/content/news/sco/2023-03-17-eiks-30.mdx +++ b/src/content/news/sco/2023-03-17-eiks-30.mdx @@ -4,7 +4,6 @@ summary: >- Includit i this issue o Eiks an Ens is details o oor neist Collogue in Perth an o oor anthologies, that is haein fell positive reviews an weel wurth the siller. --- -import Link from '$components/Link.astro'; import Schedule from '$components/Schedule.astro'; ## Annual Collogue @@ -30,9 +29,9 @@ This year’s theme will be _The Art o Flyting in Scottish Leiterature_. /> The cost o attendin the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Elaine Morton on -failte@go-plus.net. +[failte@go-plus.net](mailto:failte@go-plus.net). ## Sangschaw 2023 Winners @@ -164,9 +163,9 @@ The Scots Leid Associe is a registered charity rin bi volunteers. Bi bein a memmer o the Associe ye are aaready giein the Scots leid a heize. Ye can help us faurther gin ye coff ane or baith o our braw 50th anniversairy anthologies: contack our memmership secretar George T Watt at -lallans@hotmail.co.uk +[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk) or Willie Hershaw at -w.hershaw678@btinternet.com. +[w.hershaw678@btinternet.com](mailto:w.hershaw678@btinternet.com). Ilka buik costs £12.99 includin postage. Owerseas orders £5 postage. Includit is a walin o the best Scots poesie and prose fae 50 year and a hunner nummers o Lallans. 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 3569788..d9402cb 100644 --- a/src/content/news/sco/2023-12-10-eiks-31.mdx +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -5,7 +5,6 @@ summary: >- guide at Lithgae Pailace and an upcomin album release bi our ain Wullie Hershaw. --- -import Link from '$components/Link.astro'; ## Sangschaw open for submeissions! @@ -46,7 +45,7 @@ account. Mind it’s £5 per submeission or £12 for three. Syne, send your entries til -failte@go-plus.net alang wi pruif +[failte@go-plus.net](mailto:failte@go-plus.net) alang wi pruif o peyment. For ensaumple, you could send a photae o your bank statement, or a copy o the transaction reference. @@ -71,10 +70,10 @@ Our ain Wullie Hershaw will shuin be releasin a new album o contemporar Scots sangs titled _Leid_. It will be comin early in the new year, sae haud tuned in! For tae whet your appetite, you can -lug in til the title track on YouTube. +[lug in til the title track on YouTube](https://www.youtube.com/watch?v=23YYajAFNHQ). Ye can forby pree the muisical wark o his group, -the Bowhill Players on -Bandcamp. +the Bowhill Players on +Bandcamp. ## New lug-in guide at Lithgae Pailace @@ -84,7 +83,7 @@ promuive the status o the Scots leid as weill as tae gie veisitors the opportunitie tae hear the vyces o the court in somethin like their ain leid. Ye can read mair -about the new lug-in guides on the Historic Environment Scotland wabsteid. +[about the new lug-in guides on the Historic Environment Scotland wabsteid](https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace). As faur as we ken, this is first sic ventur, no juist bi Historic Environment Scotland, but frae ony major tourist attraction. Can onybody mind o ocht @@ -98,7 +97,7 @@ awed _Lallans_ 103, didnae receive thair copies. Gin ye haenae yet received yer copy o _Lallans_ 103, that he postit out on Wadnesday 7th o November, pleise email George at - georgetwatt@hotmail.com an +[georgetwatt@hotmail.com](mailto:georgetwatt@hotmail.com) an mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! ## New format for Eiks an Ens diff --git a/src/data/committee.ts b/src/data/committee.ts index 606268a..9f40691 100644 --- a/src/data/committee.ts +++ b/src/data/committee.ts @@ -135,13 +135,11 @@ const committee: CommitteeMember[] = [ sco: ` William Hershaw is the praisent eiditor o Lallans. He is a weill-kent poet and singer @@ -149,20 +147,18 @@ const committee: CommitteeMember[] = [ mining community he trowes that ‘the Scots leid is for aabody’ and “gin ye tint your leid ye tint your sel’. Aa Scots leid has a feir in Lallans. William can be contacted at - + w.hershaw678@btinternet . `, 'en-GB': ` William Hershaw is the current editor of Lallans. He is a well-known poet and singer @@ -170,7 +166,7 @@ const committee: CommitteeMember[] = [ community, he believes that ‘the Scots language is for everyone’ and “if you lose your language you lose your self.’ All Scots language can give it a shot in Lallans. William can be contacted at - + w.hershaw678@btinternet . `, @@ -220,13 +216,13 @@ const committee: CommitteeMember[] = [ George T Watt is a writer in Scots poesie, cutty tales and airticles. This cheil haes been published in mony anthologies an magazines as weel as Lallans. He haes produced seiveral recordings fur - Scotsoun anaa. + Scotsoun anaa. `, 'en-GB': ` George T Watt is a writer in Scots poetry, short stories and articles. He has been published in many anthologies and magazines as well as Lallans. He has also produced several recordings for - Scotsoun. + Scotsoun. `, }, img: { diff --git a/src/i18n/translations/pages/404.ts b/src/i18n/translations/pages/404.ts index d28d297..c77b9b0 100644 --- a/src/i18n/translations/pages/404.ts +++ b/src/i18n/translations/pages/404.ts @@ -8,11 +8,11 @@ const tPage = { message: { sco: () => ` Yon page disna exeist. Try gaein til oor - hame page? + hame page? `, 'en-GB': () => ` That page doesn’t exist. Try going to our - home page? + home page? `, }, }; diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index a112cc1..2166eaa 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -17,12 +17,12 @@ const tPage = { sco: () => ` We accep poesie, cuttie tales, reviews, essays an drama, baith oreiginal an owerset. Sen yer submeissions til - lallans@hotmail.co.uk. + lallans@hotmail.co.uk. `, 'en-GB': () => ` We accept poetry, short stories, reviews, essays and drama, both original and translated. Send your submissions to - lallans@hotmail.co.uk. + lallans@hotmail.co.uk. `, }, news: { @@ -91,14 +91,14 @@ const tPage = { sco: () => ` We ar ane o the foremaist furthsetters o new Scots leitratur. Oor maist important furthsettins ar - Lallans an - Scotsoun. + Lallans an + Scotsoun. `, 'en-GB': () => ` We are one of the leading publishers of new Scots literature. Our most important publications are - Lallans and - Scotsoun. + Lallans and + Scotsoun. `, }, 'aw-furthsettins': { @@ -167,18 +167,18 @@ const tPage = { 'hou-jyne-para-2': { sco: ({ membershipEmail }: { membershipEmail: string }) => ` Fur tae become a memmer, simply get in titch wi us at - ${membershipEmail} + ${membershipEmail} an we’ll provide ye wi our bank details; or ye can jyne bi sendin us a cheque made peyable til The Scots Language Society. See - Contact us + Contact us fur our address. `, 'en-GB': ({ membershipEmail }: { membershipEmail: string }) => ` To become a member, simply get in touch with us at - ${membershipEmail} + ${membershipEmail} and we’ll provide you with our bank details; or you can join by sending us a cheque made payable to The Scots Language Society. See - Contact us for our address. + Contact us for our address. `, }, contact: { diff --git a/src/pages/[locale]/furthsettins/index.astro b/src/pages/[locale]/furthsettins/index.astro index 80698bd..a053621 100644 --- a/src/pages/[locale]/furthsettins/index.astro +++ b/src/pages/[locale]/furthsettins/index.astro @@ -24,13 +24,13 @@ const t = translate(locale);