summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com>2023-12-21 21:21:30 +0000
committerJoe Carstairs <65492573+Sycamost@users.noreply.github.com>2024-01-12 08:29:08 +0000
commit5d5e2f8aa5c4030c33bf06f2cb817b9d770cc884 (patch)
tree1ef67a95bec53331eeba34787e6edc03a2fd9bb1
parent9102fe8bcd13c01bf7bae462e013c920cae9f52f (diff)
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
-rw-r--r--scss/modules/btn.scss9
-rw-r--r--scss/modules/link.scss33
-rw-r--r--scss/modules/nav.scss46
-rw-r--r--scss/modules/news-index.scss7
-rw-r--r--scss/normalize.scss107
-rw-r--r--scss/utils.scss4
-rw-r--r--src/components/LallansIssuesGallery.astro2
-rw-r--r--src/components/Link.astro9
-rw-r--r--src/components/Navbar/Breadcrumbs.astro4
-rw-r--r--src/components/ScotsounCdGallery.astro2
-rw-r--r--src/components/SwitchLanguageLink.astro2
-rw-r--r--src/content/news/en-GB/2023-03-17-eiks-30.mdx9
-rw-r--r--src/content/news/en-GB/2023-12-10-eiks-31.mdx11
-rw-r--r--src/content/news/sco/2023-03-17-eiks-30.mdx9
-rw-r--r--src/content/news/sco/2023-12-10-eiks-31.mdx13
-rw-r--r--src/data/committee.ts12
-rw-r--r--src/i18n/translations/pages/404.ts4
-rw-r--r--src/i18n/translations/pages/home.ts20
-rw-r--r--src/pages/[locale]/furthsettins/index.astro4
-rw-r--r--src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro2
-rw-r--r--src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro2
-rw-r--r--src/pages/[locale]/index.astro2
22 files changed, 178 insertions, 135 deletions
diff --git a/scss/modules/btn.scss b/scss/modules/btn.scss
index 1d52b9c..e9db392 100644
--- a/scss/modules/btn.scss
+++ b/scss/modules/btn.scss
@@ -1,7 +1,5 @@
.btn {
display: block;
- box-sizing: border-box;
- color: var(--text-color);
border: solid var(--relative-eighth-rem) var(--text-color);
font-weight: 600;
text-align: center;
@@ -33,3 +31,10 @@
.btn:active {
transform: scale(1.1, 1.1);
}
+
+/* Override anchor styling. */
+a.btn {
+ color: var(--text-color);
+ text-decoration: none;
+}
+
diff --git a/scss/modules/link.scss b/scss/modules/link.scss
index dfcabcf..83206d4 100644
--- a/scss/modules/link.scss
+++ b/scss/modules/link.scss
@@ -1,32 +1,31 @@
-.link {
+a, .link {
color: var(--special-text-color);
text-decoration-line: underline;
text-decoration-color: var(--special-text-color);
text-decoration-thickness: var(--relative-eighth-rem);
text-underline-offset: var(--relative-eighth-rem);
border: dotted transparent var(--relative-eighth-rem);
- border-radius: calc(3 * var(--relative-eighth-rem));
transition:
color 100ms,
text-decoration-color 100ms,
text-decoration-thickness 100ms,
border-color 100ms;
-}
-.link:is(:hover, :focus, :focus-visible, :focus-within),
-.group-hover:is(:hover, :focus, :focus-visible, :focus-within) .link {
- text-decoration-color: currentColor;
- text-decoration-thickness: calc(3 * var(--relative-eighth-rem));
- transition:
- color 300ms,
- text-decoration-color 300ms,
- text-decoration-thickness 300ms,
- border-color 300ms;
-}
+ &:is(:hover, :focus, :focus-visible, :focus-within),
+ .group-hover:is(:hover, :focus, :focus-visible, :focus-within) & {
+ text-decoration-color: currentColor;
+ text-decoration-thickness: calc(3 * var(--relative-eighth-rem));
+ transition:
+ color 300ms,
+ text-decoration-color 300ms,
+ text-decoration-thickness 300ms,
+ border-color 300ms;
+ }
-.link:focus, .link:focus-visible {
- box-shadow: none;
- outline: none;
- border-color: var(--special-text-color);
+ &:is(:focus, :focus-visible, :focus-within) {
+ box-shadow: none;
+ outline: none;
+ border-color: var(--special-text-color);
+ }
}
diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss
index aebcbcf..765c44f 100644
--- a/scss/modules/nav.scss
+++ b/scss/modules/nav.scss
@@ -1,5 +1,11 @@
-.nav > :not(:last-child) {
- margin-block: 0 var(--margin-block-sm);
+.nav {
+ & > :not(:last-child) {
+ margin-block: 0 var(--margin-block-sm);
+ }
+
+ li {
+ list-style-type: none;
+ }
}
.nav__bottom-row {
@@ -44,33 +50,31 @@
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
-}
-.nav__logo a {
- text-decoration: none;
- border: var(--relative-eighth-rem) dotted transparent;
- transition: border-color 100ms;
-}
+ a {
+ text-decoration: none;
+ border: var(--relative-eighth-rem) dotted transparent;
+ transition: border-color 100ms;
-.nav__logo a:is(:focus, :focus-visible, :focus-within) {
- box-shadow: none;
- outline: none;
- border-color: var(--special-text-color);
- transition: border-color 300ms;
+ &:is(:focus, :focus-visible, :focus-within) {
+ box-shadow: none;
+ outline: none;
+ border-color: var(--special-text-color);
+ transition: border-color 300ms;
+ }
+ }
}
.nav__breadcrumbs {
display: flex;
flex-wrap: wrap;
-}
-
-.nav__breadcrumbs li {
- list-style-type: none;
- min-width: max-content;
-}
-.nav__breadcrumbs li::before {
- content: '/'
+ li {
+ min-width: max-content;
+ &::before {
+ content: '/'
+ }
+ }
}
.nav__switch-language-link {
diff --git a/scss/modules/news-index.scss b/scss/modules/news-index.scss
index 0050f70..5d9bab2 100644
--- a/scss/modules/news-index.scss
+++ b/scss/modules/news-index.scss
@@ -8,6 +8,11 @@
width: var(--width-prose);
}
+a.news-index__item {
+ text-decoration: none;
+ color: var(--text-color);
+}
+
.news-index__item:not(:first-child) {
border-top-width: 0;
}
@@ -28,4 +33,4 @@
.news-index__item:is(:focus, :focus-visible, :focus-within) {
border-color: var(--special-text-highlight-color);
border-style: dotted;
-} \ No newline at end of file
+}
diff --git a/scss/normalize.scss b/scss/normalize.scss
index 9d59ef8..0f7e02f 100644
--- a/scss/normalize.scss
+++ b/scss/normalize.scss
@@ -1,3 +1,9 @@
+*,
+*::before,
+*::after {
+ box-sizing: border-box;
+}
+
:root,
html,
body,
@@ -22,31 +28,48 @@ h4 {
padding: 0;
}
+/*
+ * Prevent font size inflation
+ * https://kilianvalkhof.com/2022/css-html/your-css-reset-needs-text-size-adjust-probably/
+ */
html {
- -webkit-text-size-adjust: 100%;
-}
-
-main {
- display: block;
+ -moz-text-size-adjust: none;
+ -webkit-text-size-adjust: none;
+ text-size-adjust: none;
}
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
hr {
box-sizing: content-box;
height: 0;
overflow: visible;
}
-pre {
- font-family: monospace, monospace;
- font-size: 1em;
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+code, kbd, pre, samp {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
}
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
b,
strong {
font-weight: bolder;
@@ -56,8 +79,12 @@ small {
font-size: 80%;
}
-sub,
-sup {
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+@mixin baseline-adjustment {
font-size: 75%;
line-height: 0;
position: relative;
@@ -65,48 +92,66 @@ sup {
}
sub {
+ @include baseline-adjustment;
bottom: -0.25em;
}
sup {
+ @include baseline-adjustment;
top: -0.5em;
}
-img {
- border-style: none;
-}
-
-button, [type='button'], [type='reset'], [type='submit'] {
+@mixin form-control-reset {
font-family: inherit;
font-size: 100%;
line-height: 1.15;
- text-transform: none;
- overflow: visible;
+ margin: 0;
+ text-transform: none; /* For buttons (Firefox, Edge) and selects (Firefox) */
}
-:is(button, [type='button'], [type='reset'], [type='submit'])::-moz-focus-inner {
- border-style: none;
- padding: 0;
+:is(
+ button,
+ [type='button'],
+ [type='reset'],
+ [type='submit']
+) {
+ @include form-control-reset;
+ text-transform: none;
+
+ /**
+ * Remove the inner border and padding in Firefox.
+ */
+ &::-moz-focus-inner {
+ border-style: none;
+ padding: 0;
+ }
+
+ /**
+ * Restore the focus styles unset by the previous rule.
+ */
+ &:-moz-focusring {
+ outline: 1px dotted ButtonText;
+ }
}
-:is(button, [type='button'], [type='reset'], [type='submit']):-moz-focusring {
- outline: 1px dotted ButtonText;
+input,
+optgroup,
+select,
+textarea {
+ @include form-control-reset;
}
+/**
+ * Corrects the display in Firefox and Edge.
+ */
details {
display: block;
}
+/*
+ * Add the correct display in all browsers.
+ */
summary {
display: list-item;
}
-[hidden] {
- display: none;
-}
-
-a, :link, :visited {
- background-color: transparent;
- color: currentColor;
- text-decoration: none;
-}
diff --git a/scss/utils.scss b/scss/utils.scss
index a05a216..f8336eb 100644
--- a/scss/utils.scss
+++ b/scss/utils.scss
@@ -5,3 +5,7 @@
.font-weight-lighter {
font-weight: lighter;
}
+
+li.list-style-none, .list-style-none li {
+ list-style-type: none;
+}
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) => (
<li>
<a
- class="link link-gallery__container"
+ class="link-gallery__container"
href={`/${locale}/furthsettins/lallans/${issue.issueNumber}`}
>
<Image src={issue.img.width192} alt="" />
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;
----
-
-<a class="link" href={href}><slot /></a>
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 (
<li>
- <a class="link" href={`/${locale}${route}`}>
- {t(tBreadcrumbs, { key: route })}
- </a>
+ <a href={`/${locale}${route}`}>{t(tBreadcrumbs, { key: route })}</a>
</li>
);
})
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) => (
<li>
<a
- class="link link-gallery__container"
+ class="link-gallery__container"
href={`/${locale}/furthsettins/scotsoun/${scotsounItem.scotsounId}`}
>
<Image src={scotsounItem.img.width192} alt="" />
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);
---
-<a class="link nav__switch-language-link" href={otherLocalePath}>
+<a class="nav__switch-language-link" href={otherLocalePath}>
{
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
-<Link href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</Link>
+[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk)
or Elaine Morton on
-<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link>.
+[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 <Link href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</Link>
+at [lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk)
or Willie Hershaw at
-<Link href="mailto:w.hershaw678@btinternet.com">w.hershaw678@btinternet.com</Link>.
+[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.
</dl>
Then, send your entries to
-<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link> 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
-<Link href="https://www.youtube.com/watch?v=23YYajAFNHQ">listen to the title track on YouTube</Link>.
+[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,
-<Link href="https://thebowhillplayers.bandcamp.com">the Bowhill Players on Bandcamp</Link>.
+[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
-<Link href="https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace">about the new audio guides on the Historic Environment Scotland website</Link>.
+[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
-<Link href="mailto:georgetwatt@hotmail.com">georgetwatt@hotmail.com</Link>
+[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
-<Link href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</Link>
+[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk)
or Elaine Morton on
-<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link>.
+[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
-<Link href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</Link>
+[lallans@hotmail.co.uk](mailto:lallans@hotmail.co.uk)
or Willie Hershaw at
-<Link href="mailto:w.hershaw678@btinternet.com">w.hershaw678@btinternet.com</Link>.
+[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.
</dl>
Syne, send your entries til
-<Link href="mailto:failte@go-plus.net">failte@go-plus.net</Link> 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
-<Link href="https://www.youtube.com/watch?v=23YYajAFNHQ">lug in til the title track on YouTube</Link>.
+[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,
-<Link href="https://thebowhillplayers.bandcamp.com">the Bowhill Players on
-Bandcamp</Link>.
+<a href="https://thebowhillplayers.bandcamp.com">the Bowhill Players on
+Bandcamp</a>.
## 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
-<Link href="https://hes-newsroom.prgloo.com/news/new-scots-lug-in-guide-at-lithgae-palace">about the new lug-in guides on the Historic Environment Scotland wabsteid</Link>.
+[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
-<Link href="mailto:georgetwatt@hotmail.com"> georgetwatt@hotmail.com</Link> 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
<a
- class="link"
href="http://www.scottishpoetrylibrary.org.uk/poetry/poets/william-hershaw"
>
poet
</a> and
<a
- class="link"
href="https://en-gb.facebook.com/bowhillplayers"
>
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
- <a class="link" href="mailto:w.hershaw678@btinternet">
+ <a href="mailto:w.hershaw678@btinternet">
w.hershaw678@btinternet
</a>.
`,
'en-GB': `
William Hershaw is the current editor of Lallans. He is a well-known
<a
- class="link"
href="http://www.scottishpoetrylibrary.org.uk/poetry/poets/william-hershaw"
>
poet
</a> and
<a
- class="link"
href="https://en-gb.facebook.com/bowhillplayers"
>
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
- <a class="link" href="mailto:w.hershaw678@btinternet">
+ <a href="mailto:w.hershaw678@btinternet">
w.hershaw678@btinternet
</a>.
`,
@@ -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
- <a class="link" href="/en-GB/furthsettins/scotsoun">Scotsoun</a> anaa.
+ <a href="/en-GB/furthsettins/scotsoun">Scotsoun</a> 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
- <a class="link" href="/en-GB/furthsettins/scotsoun">Scotsoun</a>.
+ <a href="/en-GB/furthsettins/scotsoun">Scotsoun</a>.
`,
},
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
- <a href="/sco" class="link">hame page</a>?
+ <a href="/sco">hame page</a>?
`,
'en-GB': () => `
That page doesn’t exist. Try going to our
- <a href="/en-GB" class="link">home page</a>?
+ <a href="/en-GB">home page</a>?
`,
},
};
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
- <a class="link" href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</a>.
+ <a href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</a>.
`,
'en-GB': () => `
We accept poetry, short stories, reviews, essays and drama, both
original and translated. Send your submissions to
- <a class="link" href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</a>.
+ <a href="mailto:lallans@hotmail.co.uk">lallans@hotmail.co.uk</a>.
`,
},
news: {
@@ -91,14 +91,14 @@ const tPage = {
sco: () => `
We ar ane o the foremaist furthsetters o new Scots leitratur.
Oor maist important furthsettins ar
- <a href="/sco/furthsettins/lallans" class="link">Lallans</a> an
- <a href="/sco/furthsettins/scotsoun" class="link">Scotsoun</a>.
+ <a href="/sco/furthsettins/lallans">Lallans</a> an
+ <a href="/sco/furthsettins/scotsoun">Scotsoun</a>.
`,
'en-GB': () => `
We are one of the leading publishers of new Scots literature.
Our most important publications are
- <a href="/en-GB/furthsettins/lallans" class="link">Lallans</a> and
- <a href="/en-GB/furthsettins/scotsoun" class="link">Scotsoun</a>.
+ <a href="/en-GB/furthsettins/lallans">Lallans</a> and
+ <a href="/en-GB/furthsettins/scotsoun">Scotsoun</a>.
`,
},
'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
- <a class="link" href="mailto:${membershipEmail}">${membershipEmail}</a>
+ <a href="mailto:${membershipEmail}">${membershipEmail}</a>
an we’ll provide ye wi our bank details; or ye can jyne bi sendin us a cheque
made peyable til <b>The Scots Language Society</b>. See
- <a class="link" href="#contact">Contact us</a>
+ <a href="#contact">Contact us</a>
fur our address.
`,
'en-GB': ({ membershipEmail }: { membershipEmail: string }) => `
To become a member, simply get in touch with us at
- <a class="link" href="mailto:${membershipEmail}">${membershipEmail}</a>
+ <a href="mailto:${membershipEmail}">${membershipEmail}</a>
and we’ll provide you with our bank details; or you can join by sending us
a cheque made payable to <b>The Scots Language Society</b>. See
- <a class="link" href="#contact">Contact us</a> for our address.
+ <a href="#contact">Contact us</a> 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);
<ul class="link-gallery link-gallery--furthsettins">
<li>
- <a href={relativePath(Astro.url.pathname, 'lallans')} class="link link-gallery__container">
+ <a href={relativePath(Astro.url.pathname, 'lallans')} class="link-gallery__container">
<Image src={lallansImg} alt="" />
<p class="link-gallery__title">{t(tSite, { key: 'lallans' })}</p>
</a>
</li>
<li>
- <a href={relativePath(Astro.url.pathname, 'scotsoun')} class="link link-gallery__container">
+ <a href={relativePath(Astro.url.pathname, 'scotsoun')} class="link-gallery__container">
<Image src={scotsounImg} alt="" />
<p class="link-gallery__title">{t(tSite, { key: 'scotsoun' })}</p>
</a>
diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
index 2f0a9d4..f0b9512 100644
--- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
+++ b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
@@ -23,7 +23,7 @@ const issueNumber = new Number(Astro.params.issueNumber).valueOf() as LallansIss
<section>
<h1>{t(tPage, { key: 'title' })}</h1>
<p>{t(tPage, { key: 'payment-confirmation-message', issueNumber: `${issueNumber}` })}</p>
- <a class="link" href={`/${locale}/furthsettins/lallans/${issueNumber}`}>
+ <a href={`/${locale}/furthsettins/lallans/${issueNumber}`}>
{t(tPage, { key: 'back-button-text', issueNumber: `${issueNumber}` })}
</a>
</section>
diff --git a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
index 16bbdd8..9e152ee 100644
--- a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
+++ b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
@@ -23,7 +23,7 @@ const t = translate(locale);
<section>
<h1>{t(tPage, { key: 'title' })}</h1>
<p>{t(tPage, { key: 'payment-confirmation-message', scotsounId })}</p>
- <a class="link" href={`/${locale}/furthsettins/scotsoun/${scotsounId}`}>
+ <a href={`/${locale}/furthsettins/scotsoun/${scotsounId}`}>
{t(tPage, { key: 'back-button-text', scotsounId })}
</a>
</section>
diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro
index c67ded0..efccd22 100644
--- a/src/pages/[locale]/index.astro
+++ b/src/pages/[locale]/index.astro
@@ -75,7 +75,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);
<section id="contact">
<h2 set:html={t(tPage, { key: 'contact' })} />
- <a class="link" href={`${locale}/mailto:${contactDetails.generalEnquiries.emailAddress}`}>
+ <a href={`${locale}/mailto:${contactDetails.generalEnquiries.emailAddress}`}>
{contactDetails.generalEnquiries.emailAddress}
</a>
<address>