From ee528911193ab8a0ca387e267b88ef4ace5aa339 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:40:17 +0000 Subject: Edit README (#28) * Corrects Lallans instructions * Adds instructions for adding a Scotsoun release * Documents infrastructure * Better contribution guidance --- README.md | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 106 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 69c8925..24feed3 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ && npm run dev ``` -## All you need to edit the website +## Contributing + +### All you need to edit the website * Has a text editor or IDE and can use it to edit text files. * Can write Markdown. (Beginners can learn in an afternoon by following the @@ -30,31 +32,49 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ * Can use [NPM](https://nodesource.com/blog/an-absolute-beginners-guide-to-using-npm/) to install dependencies and run scripts. -## Writing a news post +### General guidance 1. If you haven't already, fork the repository, and clone your fork. -2. Copy and paste an existing news article in both English and Scots. You will +2. Make a suitably named branch on your fork. +3. Make your desired changes (see sections below for common cases). +4. Commit and push them on your branch. +5. Make a Pull Request to merge your changes into `dev`. +6. A code owner (probably the Scots Language Society Webmaster) will review + your Pull Request, ask for any necessary changes, and when satisfied, merge + it into `dev`. (This will update the [staging deployment](#cicd) on + [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org).) +7. Code owners will merge `dev` into `main` at their discretion. (This will + update the production deployment on + [scotsleidassocie.org](https://scotsleidassocie.org).) + +### Writing a news post + +Follow this guidance alongside the [general guidance](#general-guidance). + +1. Copy and paste an existing news article in both English and Scots. You will find these in `src/content/news/en-GB` and `src/content/news/scots` respectively. -3. Rename the news article following the existing pattern, which is the date of +2. Rename the news article following the existing pattern, which is the date of publication in `YYYY-MM-DD` format followed by the title in [kebab case](https://www.freecodecamp.org/news/snake-case-vs-camel-case-vs-pascal-case-vs-kebab-case-whats-the-difference/#whatiskebabcaseanamekebabcasea) and the `.mdx` file extension. For example, `2023-12-24-eiks-an-ens-3000.mdx` would be Eiks an Ens 3000, published on the 24th of December 2023. -4. Edit the news articles to contain your desired content. -5. Check it looks OK by running the website locally with `npm install && npm start`. -6. When it looks OK, stage, commit and push your new news articles. -7. Make a pull request to merge your new news articles into the `dev` branch upstream. -8. Once a code owner approves your pull request, it'll get merged into `dev`, and +3. Edit the news articles to contain your desired content. +4. Check it looks OK by running the website locally with `npm install && npm start`. +5. When it looks OK, stage, commit and push your new news articles. +6. Make a pull request to merge your new news articles into the `dev` branch upstream. +7. Once a code owner approves your pull request, it'll get merged into `dev`, and (unless you yourself are a code owner) it is from that point no longer your problem! From that point, it'll be live on [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), and it'll go live on [scotsleidassocie.org](https://scotsleidassocie.org) once a code owner merges `dev` into `main`. -## Adding an issue of Lallans +### Adding an issue of Lallans + +Follow this guidance alongside the [general guidance](#general-guidance). 1. Add the issue number to `src/types/LallansIssueNumber.d.ts`. -2. Add the original issue cover photo as `src/images/issueXYZ.jpg`, where `XYZ` +2. Add the original issue cover photo as `src/images/lallans/issueXYZ.jpg`, where `XYZ` is the issue number. Most of the examples are `.jpg`, but the file type isn't important. 3. Make copies of the cover image that are scaled to 192 and 274 pixels wide. Name them `issueXYZ-192w.jpg` and `issueXYZ-274w.jpg` respectively. @@ -67,3 +87,78 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ Lallans page, `/furthsettins/lallans`, and the issue information should appear at `/furthsettins/lallans/XYZ`. Check both the English and Scots versions. +### Adding a Scotsoun release + +Follow this guidance alongside the [general guidance](#general-guidance). + +1. Add the release ID to `src/types/ScotsounId.d.ts`. +2. Add the original cover image as `src/images/scotsoun/scotsounXYZ.jpg`, where `XYZ` + is the release ID. Most of the examples are `.jpg`, but the file type isn't important. +3. Make a copy of the cover image which is scaled to 192 pixels wide, and name it + `scotsounXYZ-192w.jpg`. +4. Copy one of the existing Scotsoun releases in `src/data/scotsoun` and name the + copy `scotsounXYZ.ts`. +5. Edit the file you just made with the new release's information, including the + location of the correctly scaled cover image that you just made. +6. Import that data file into the Scotsoun data index file, `src/data/scotsoun/index.ts`. +7. Check that everything's working: the release should appear at the top on the + Scotsoun page, `/furthsettins/scotsoun`, and the release information should appear + at `/furthsettins/scotsoun/XYZ`. Check both the English and Scots versions. + +## Infrastructure + +The deployment infrastructure for the website is in four parts: the domains, +the SSL certificates, the hosting, and the CI/CD. + +### Domains + +The website is served on two domain names: [lallans.co.uk](https://www.lallans.co.uk) +and [scotsleidassocie.org](https://scotsleidassocie.org). The lallans.co.uk +domain is legacy, but will redirect to scotsleidassocie.org until at least +September 2024. + +Firstly, lallans.co.uk is registered with [JoomlaWired](https://www.joomlawired.com), +a hosting company specialising in hosting Joomla! and WordPress websites. We used +to host a Joomla! website with them, hence the connection. We don't host +anything with them any more, but we still rent the lallans.co.uk domain from +them. The [Scots Language Society Webmaster](mailto:lallans@hotmail.co.uk) +should have access to JoomlaWired. + +Redirecting requests to lallans.co.uk to scotsleidassocie.org is handled by +[Vercel](#hosting). + +Meanwhile, scotsleidassocie.org is rented from AWS. Again, the Webmaster should +have access to the AWS Console. + +### SSL certificates + +The SSL certificate for scotsleidassocie.org is bought from AWS Certificates +Manager. Again, the Webmaster should have access to the AWS Console. + +### Hosting + +The website is hosted on [Vercel](https://vercel.com/sycamost/lallans-wabsteid-astro). +Because we have the free plan, unfortunately only the Webmaster can access the +Vercel dashboard. + +Vercel also handles redirecting from lallans.co.uk to scotsleidassocie.org. + +### CI/CD + +Our CI/CD pipeline is, thanks to the fantastic integration between GitHub and +Vercel, no-code! We just need to make commits to the repo to see them deployed +automagically. + +Ideally, we should check everything's working on deployment before everyone on +the internet starts looking at it. For that reason, we have a staging deployment +at [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org). To +update the staging deployment, simply commit to `dev` by making a Pull Request +and getting it approved by a code owner and then merged. + +To update production, you'll want to first merge your changes into `dev` by +making a Pull Request and getting it approved and merged. Once you've done that, +given it five minutes to dpeloy, and you've checked that everything looks good +on [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), +[make a Pull Request to merge dev into main](https://github.com/Sycamost/lallans-wabsteid-astro/compare/main...dev). +Once that Pull Request is approved by a code owner, merge it in and it should +update production in under five minutes. -- cgit v1.2.3 From 5258761f460eb15d8a14ef8cb5c98fa15c31976a Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:03:27 +0000 Subject: Update README (#29) * Updates references to branch names in README * ESLint ignores Markdown * Documents Coding Style --- .eslintrc.json | 2 +- README.md | 173 +++++++++++++++++++++++++++------------------------------ 2 files changed, 82 insertions(+), 93 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f0cdd75..a055dd2 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,7 +8,7 @@ "plugin:astro/recommended", "plugin:@typescript-eslint/recommended" ], - "ignorePatterns": ["api"], + "ignorePatterns": ["api", "*.md"], "overrides": [ { "files": ["*.astro"], diff --git a/README.md b/README.md index 24feed3..956f255 100644 --- a/README.md +++ b/README.md @@ -15,22 +15,19 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ ### All you need to edit the website -* Has a text editor or IDE and can use it to edit text files. -* Can write Markdown. (Beginners can learn in an afternoon by following the +- Has a text editor or IDE and can use it to edit text files. +- Can write Markdown. (Beginners can learn in an afternoon by following the [getting started guide](https://www.markdownguide.org/getting-started/)!) -* Has a [GitHub](https://github.com/join) account. -* Can use Git to clone, pull, push, stage files, commit staged files, branch and - checkout. Here's a great [beginner's tutorial to Git](https://www.atlassian.com/git) - and here's another great, interactive - [Git tutorial focusing on branching](https://learngitbranching.js.org/). -* Can use GitHub to make a fork and make a Pull Request back into the upstream - repository. Here's - [a basic GitHub tutorial](https://docs.github.com/en/get-started/quickstart/hello-world) - and here's a - [GitHub guide to forking](https://docs.github.com/en/get-started/quickstart/fork-a-repo). -* Can use a [command-line terminal](https://www.freecodecamp.org/news/command-line-for-beginners/). -* Can use [NPM](https://nodesource.com/blog/an-absolute-beginners-guide-to-using-npm/) - to install dependencies and run scripts. +- Has a [GitHub](https://github.com/join) account. +- Can use Git to clone, pull, push, stage files, commit staged files, branch and checkout. Here's a + great [beginner's tutorial to Git](https://www.atlassian.com/git) and here's another great, + interactive [Git tutorial focusing on branching](https://learngitbranching.js.org/). +- Can use GitHub to make a fork and make a Pull Request back into the upstream repository. Here's + [a basic GitHub tutorial](https://docs.github.com/en/get-started/quickstart/hello-world) and + here's a [GitHub guide to forking](https://docs.github.com/en/get-started/quickstart/fork-a-repo). +- Can use a [command-line terminal](https://www.freecodecamp.org/news/command-line-for-beginners/). +- Can use [NPM](https://nodesource.com/blog/an-absolute-beginners-guide-to-using-npm/) to install + dependencies and run scripts. ### General guidance @@ -38,127 +35,119 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ 2. Make a suitably named branch on your fork. 3. Make your desired changes (see sections below for common cases). 4. Commit and push them on your branch. -5. Make a Pull Request to merge your changes into `dev`. -6. A code owner (probably the Scots Language Society Webmaster) will review - your Pull Request, ask for any necessary changes, and when satisfied, merge - it into `dev`. (This will update the [staging deployment](#cicd) on +5. Make a Pull Request to merge your changes into `deployment-staging`. +6. A code owner (probably the Scots Language Society Webmaster) will review your Pull Request, ask + for any necessary changes, and when satisfied, merge it into `deployment-staging`. (This will + update the [staging deployment](#cicd) on [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org).) -7. Code owners will merge `dev` into `main` at their discretion. (This will - update the production deployment on +7. Code owners will merge `deployment-staging` into `deployment-production` at their discretion. + (This will update the production deployment on [scotsleidassocie.org](https://scotsleidassocie.org).) +### Coding style + +Coding style is enforced by ESLint and Prettier. These tools are run on a commit hook, and you will +not be able to commit if they fail. Please refrain from using `git commit --no-verify` except in +extraordinary cases, and make it clear in your Pull Request when you have done so. + ### Writing a news post Follow this guidance alongside the [general guidance](#general-guidance). -1. Copy and paste an existing news article in both English and Scots. You will - find these in `src/content/news/en-GB` and `src/content/news/scots` respectively. -2. Rename the news article following the existing pattern, which is the date of - publication in `YYYY-MM-DD` format followed by the title in +1. Copy and paste an existing news article in both English and Scots. You will find these in + `src/content/news/en-GB` and `src/content/news/scots` respectively. +2. Rename the news article following the existing pattern, which is the date of publication in + `YYYY-MM-DD` format followed by the title in [kebab case](https://www.freecodecamp.org/news/snake-case-vs-camel-case-vs-pascal-case-vs-kebab-case-whats-the-difference/#whatiskebabcaseanamekebabcasea) - and the `.mdx` file extension. For example, `2023-12-24-eiks-an-ens-3000.mdx` - would be Eiks an Ens 3000, published on the 24th of December 2023. + and the `.mdx` file extension. For example, `2023-12-24-eiks-an-ens-3000.mdx` would be Eiks an + Ens 3000, published on the 24th of December 2023. 3. Edit the news articles to contain your desired content. 4. Check it looks OK by running the website locally with `npm install && npm start`. -5. When it looks OK, stage, commit and push your new news articles. -6. Make a pull request to merge your new news articles into the `dev` branch upstream. -7. Once a code owner approves your pull request, it'll get merged into `dev`, and - (unless you yourself are a code owner) it is from that point no longer your - problem! From that point, it'll be live on - [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), - and it'll go live on [scotsleidassocie.org](https://scotsleidassocie.org) once - a code owner merges `dev` into `main`. ### Adding an issue of Lallans Follow this guidance alongside the [general guidance](#general-guidance). 1. Add the issue number to `src/types/LallansIssueNumber.d.ts`. -2. Add the original issue cover photo as `src/images/lallans/issueXYZ.jpg`, where `XYZ` - is the issue number. Most of the examples are `.jpg`, but the file type isn't important. -3. Make copies of the cover image that are scaled to 192 and 274 pixels wide. - Name them `issueXYZ-192w.jpg` and `issueXYZ-274w.jpg` respectively. -4. Copy one of the existing Lallans issues in `src/data/lallans` and name the - copy `issueXYZ.ts`. -5. Edit the file you just made with the new issue's information, including the - locations of the correctly scaled cover images that you just made. +2. Add the original issue cover photo as `src/images/lallans/issueXYZ.jpg`, where `XYZ` is the issue + number. Most of the examples are `.jpg`, but the file type isn't important. +3. Make copies of the cover image that are scaled to 192 and 274 pixels wide. Name them + `issueXYZ-192w.jpg` and `issueXYZ-274w.jpg` respectively. +4. Copy one of the existing Lallans issues in `src/data/lallans` and name the copy `issueXYZ.ts`. +5. Edit the file you just made with the new issue's information, including the locations of the + correctly scaled cover images that you just made. 6. Import that data file into the Lallans data index file, `src/data/lallans/index.ts`. -7. Check that everything's working: the issue should appear at the top on the - Lallans page, `/furthsettins/lallans`, and the issue information should appear - at `/furthsettins/lallans/XYZ`. Check both the English and Scots versions. +7. Check that everything's working: the issue should appear at the top on the Lallans page, + `/furthsettins/lallans`, and the issue information should appear at `/furthsettins/lallans/XYZ`. + Check both the English and Scots versions. ### Adding a Scotsoun release Follow this guidance alongside the [general guidance](#general-guidance). 1. Add the release ID to `src/types/ScotsounId.d.ts`. -2. Add the original cover image as `src/images/scotsoun/scotsounXYZ.jpg`, where `XYZ` - is the release ID. Most of the examples are `.jpg`, but the file type isn't important. +2. Add the original cover image as `src/images/scotsoun/scotsounXYZ.jpg`, where `XYZ` is the release + ID. Most of the examples are `.jpg`, but the file type isn't important. 3. Make a copy of the cover image which is scaled to 192 pixels wide, and name it `scotsounXYZ-192w.jpg`. -4. Copy one of the existing Scotsoun releases in `src/data/scotsoun` and name the - copy `scotsounXYZ.ts`. -5. Edit the file you just made with the new release's information, including the - location of the correctly scaled cover image that you just made. +4. Copy one of the existing Scotsoun releases in `src/data/scotsoun` and name the copy + `scotsounXYZ.ts`. +5. Edit the file you just made with the new release's information, including the location of the + correctly scaled cover image that you just made. 6. Import that data file into the Scotsoun data index file, `src/data/scotsoun/index.ts`. -7. Check that everything's working: the release should appear at the top on the - Scotsoun page, `/furthsettins/scotsoun`, and the release information should appear - at `/furthsettins/scotsoun/XYZ`. Check both the English and Scots versions. +7. Check that everything's working: the release should appear at the top on the Scotsoun page, + `/furthsettins/scotsoun`, and the release information should appear at + `/furthsettins/scotsoun/XYZ`. Check both the English and Scots versions. ## Infrastructure -The deployment infrastructure for the website is in four parts: the domains, -the SSL certificates, the hosting, and the CI/CD. +The deployment infrastructure for the website is in four parts: the domains, the SSL certificates, +the hosting, and the CI/CD. ### Domains -The website is served on two domain names: [lallans.co.uk](https://www.lallans.co.uk) -and [scotsleidassocie.org](https://scotsleidassocie.org). The lallans.co.uk -domain is legacy, but will redirect to scotsleidassocie.org until at least -September 2024. +The website is served on two domain names: [lallans.co.uk](https://www.lallans.co.uk) and +[scotsleidassocie.org](https://scotsleidassocie.org). The lallans.co.uk domain is legacy, but will +redirect to scotsleidassocie.org until at least September 2024. -Firstly, lallans.co.uk is registered with [JoomlaWired](https://www.joomlawired.com), -a hosting company specialising in hosting Joomla! and WordPress websites. We used -to host a Joomla! website with them, hence the connection. We don't host -anything with them any more, but we still rent the lallans.co.uk domain from -them. The [Scots Language Society Webmaster](mailto:lallans@hotmail.co.uk) +Firstly, lallans.co.uk is registered with [JoomlaWired](https://www.joomlawired.com), a hosting +company specialising in hosting Joomla! and WordPress websites. We used to host a Joomla! website +with them, hence the connection. We don't host anything with them any more, but we still rent the +lallans.co.uk domain from them. The [Scots Language Society Webmaster](mailto:lallans@hotmail.co.uk) should have access to JoomlaWired. -Redirecting requests to lallans.co.uk to scotsleidassocie.org is handled by -[Vercel](#hosting). +Redirecting requests to lallans.co.uk to scotsleidassocie.org is handled by [Vercel](#hosting). -Meanwhile, scotsleidassocie.org is rented from AWS. Again, the Webmaster should -have access to the AWS Console. +Meanwhile, scotsleidassocie.org is rented from AWS. Again, the Webmaster should have access to the +AWS Console. ### SSL certificates -The SSL certificate for scotsleidassocie.org is bought from AWS Certificates -Manager. Again, the Webmaster should have access to the AWS Console. +The SSL certificate for scotsleidassocie.org is bought from AWS Certificates Manager. Again, the +Webmaster should have access to the AWS Console. ### Hosting -The website is hosted on [Vercel](https://vercel.com/sycamost/lallans-wabsteid-astro). -Because we have the free plan, unfortunately only the Webmaster can access the -Vercel dashboard. +The website is hosted on [Vercel](https://vercel.com/sycamost/lallans-wabsteid-astro). Because we +have the free plan, unfortunately only the Webmaster can access the Vercel dashboard. Vercel also handles redirecting from lallans.co.uk to scotsleidassocie.org. ### CI/CD -Our CI/CD pipeline is, thanks to the fantastic integration between GitHub and -Vercel, no-code! We just need to make commits to the repo to see them deployed -automagically. - -Ideally, we should check everything's working on deployment before everyone on -the internet starts looking at it. For that reason, we have a staging deployment -at [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org). To -update the staging deployment, simply commit to `dev` by making a Pull Request -and getting it approved by a code owner and then merged. - -To update production, you'll want to first merge your changes into `dev` by -making a Pull Request and getting it approved and merged. Once you've done that, -given it five minutes to dpeloy, and you've checked that everything looks good -on [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), -[make a Pull Request to merge dev into main](https://github.com/Sycamost/lallans-wabsteid-astro/compare/main...dev). -Once that Pull Request is approved by a code owner, merge it in and it should -update production in under five minutes. +Our CI/CD pipeline is, thanks to the fantastic integration between GitHub and Vercel, no-code! We +just need to make commits to the repo to see them deployed automagically. + +Ideally, we should check everything's working on deployment before everyone on the internet starts +looking at it. For that reason, we have a staging deployment at +[staging.scotsleidassocie.org](https://staging.scotsleidassocie.org). To update the staging +deployment, simply commit to `deployment-staging` by making a Pull Request and getting it approved +by a code owner and then merged. + +To update production, you'll want to first merge your changes into `deployment-staging` by making a +Pull Request and getting it approved and merged. Once you've done that, given it five minutes to +deploy, and you've checked that everything looks good on +[staging.scotsleidassocie.org](https://staging.scotsleidassocie.org), +[make a Pull Request to merge deployment-staging into deployment-production](https://github.com/Sycamost/lallans-wabsteid-astro/compare/deployment-production...deployment-staging). +Once that Pull Request is approved by a code owner, merge it in and it should update production in +under five minutes. -- cgit v1.2.3 From c842fa9c4922cc439be96d7a5f4809b19af049bf Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Sat, 18 Nov 2023 18:06:02 +0000 Subject: Specifies upstream branch in README where salient --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 956f255..f24a853 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,12 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ 2. Make a suitably named branch on your fork. 3. Make your desired changes (see sections below for common cases). 4. Commit and push them on your branch. -5. Make a Pull Request to merge your changes into `deployment-staging`. +5. Make a Pull Request to merge your changes into `Sycamost/deployment-staging`. 6. A code owner (probably the Scots Language Society Webmaster) will review your Pull Request, ask - for any necessary changes, and when satisfied, merge it into `deployment-staging`. (This will + for any necessary changes, and when satisfied, merge it into `Sycamost/deployment-staging`. (This will update the [staging deployment](#cicd) on [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org).) -7. Code owners will merge `deployment-staging` into `deployment-production` at their discretion. +7. Code owners will merge `Sycamost/deployment-staging` into `Sycamost/deployment-production` at their discretion. (This will update the production deployment on [scotsleidassocie.org](https://scotsleidassocie.org).) -- cgit v1.2.3 From c6cb729292d2df0e7ce8f4a9e617c8c420389f94 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 1 Dec 2023 19:15:24 +0000 Subject: Fixes Sangschaw winners list in Eiks 30 (#35) --- .../news/en-GB/2023-03-17-eiks-an-ens-30.mdx | 28 ++++++++++++++++++++++ src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx | 28 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx index bc75660..c96c665 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx @@ -56,6 +56,34 @@ _Kafka_ by Pete Fortune #### Winner +_A Sang tae the Heir_ by Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ by Dorothy Lawrenson + +_Salome_ by Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ by Donald Adamson + +_Weddin Blessin_ by Gordon Davidson + +_A Dug wi Nae Maister_ by Tom Ellett + +_Seeven Auld Fodies_ by WS Milne + +_The Tale o Thorstein Grue_ by Colin Mackenzie + +_The Yirdin o Sorley MacLean_ by Derrick McClure + +_Propertius_ by John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + _Roond Stane_ by Finola Scott #### Jynt Rinner-up diff --git a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx index ef094d4..201642c 100644 --- a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx +++ b/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx @@ -59,6 +59,34 @@ _Kafka_ bi Pete Fortune #### Winner +_A Sang tae the Heir_ bi Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ bi Dorothy Lawrenson + +_Salome_ bi Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ bi Donald Adamson + +_Weddin Blessin_ bi Gordon Davidson + +_A Dug wi Nae Maister_ bi Tom Ellett + +_Seeven Auld Fodies_ bi WS Milne + +_The Tale o Thorstein Grue_ bi Colin Mackenzie + +_The Yirdin o Sorley MacLean_ bi Derrick McClure + +_Propertius_ bi John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + _Roond Stane_ bi Finola Scott #### Jynt Rinner-up -- cgit v1.2.3 From e64a836228bfb6fa62ee905fed1ec9c6bf5467e5 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 1 Dec 2023 19:18:38 +0000 Subject: Fixes Sangschaw winners list in Eiks 30 (#36) --- src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx index c96c665..82a4fa7 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx @@ -49,7 +49,9 @@ _Haymarket Wumman_ by Jerry Randalls #### Ruisit _Bother wi a Babby Bird_ by Anne Jones + _Benny_ by Andrew G Matthews + _Kafka_ by Pete Fortune ### The John MacPhail Law Tassie for Owersettin -- cgit v1.2.3 From f979c07e2c7c3716492a4121383aeacc5e58cfce Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 1 Dec 2023 19:28:17 +0000 Subject: Fixes Sangschaw winners list in Eiks 30 (#38) --- src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx index 82a4fa7..34a83ac 100644 --- a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx +++ b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx @@ -96,16 +96,27 @@ _Aliens_ by James Sinclair #### Ruisit _Chale Shaw_ by Joe Carstairs + _John MacLean’s Coat_ by Robert Duncan + _Jock Tamson’s Luve-Bairns_ by David Bleiman + _Bauk in the USSR_ by Alastair McLeish + _Eldritch, Cretaceous Man Jinkin_ by Alan Millar + _The Ootgaun_ by Hamish Scott + _Mindin Joe_ by Jock Stein + _The Ceremonie o Cairnholy_ by Donald Adamson + _A New Sang_ by David Bleiman + _Ahint the Haund_ by Kevin Connelly + _The Marriage Lair_ by Irene Howat + _Leid in ma Heid_ by Alan Millar ## Wittins: Sangschaw, Lallans 102-103 -- cgit v1.2.3 From 4710fb1c87d5926f630716f003e736e019b3fcf5 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Thu, 14 Dec 2023 21:28:31 +0000 Subject: Eiks 31 (#41) * Eiks 31 * Prettier dl's * Prettier headings --------- Co-authored-by: Joe Carstairs --- scss/base/dl.scss | 5 + scss/base/index.scss | 6 +- scss/base/typography.scss | 3 + scss/modules/schedule.scss | 1 + .../news/en-GB/2023-12-10-eiks-an-ens-31.mdx | 104 +++++++++++++++++++++ src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx | 103 ++++++++++++++++++++ 6 files changed, 219 insertions(+), 3 deletions(-) create mode 100644 scss/base/dl.scss create mode 100644 src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx create mode 100644 src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx diff --git a/scss/base/dl.scss b/scss/base/dl.scss new file mode 100644 index 0000000..95cc836 --- /dev/null +++ b/scss/base/dl.scss @@ -0,0 +1,5 @@ +dt { + font-weight: 700; + text-decoration: underline; + margin-top: 1rem; +} \ No newline at end of file diff --git a/scss/base/index.scss b/scss/base/index.scss index da4f59e..f338772 100644 --- a/scss/base/index.scss +++ b/scss/base/index.scss @@ -1,4 +1,4 @@ -@use 'typography'; -@use 'theme'; +@use 'dl'; @use 'list'; - +@use 'theme'; +@use 'typography'; diff --git a/scss/base/typography.scss b/scss/base/typography.scss index fb2ac17..b9936ec 100644 --- a/scss/base/typography.scss +++ b/scss/base/typography.scss @@ -45,6 +45,8 @@ h3, h4 { font-family: var(--font-serif); font-weight: 700; + line-height: 1.15; + text-wrap: balance; } .title { @@ -52,6 +54,7 @@ h4 { font-size: var(--font-size-6); font-weight: 700; margin-block-start: var(--margin-block-sm); + text-wrap: balance; } .title--small { diff --git a/scss/modules/schedule.scss b/scss/modules/schedule.scss index 140767c..40a9fee 100644 --- a/scss/modules/schedule.scss +++ b/scss/modules/schedule.scss @@ -6,6 +6,7 @@ font-weight: 700; margin-block-start: var(--margin-block-sm); text-align: center; + text-decoration: none; } .schedule dd { diff --git a/src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx b/src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx new file mode 100644 index 0000000..1158dde --- /dev/null +++ b/src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx @@ -0,0 +1,104 @@ +--- +title: Eiks an Ens 31 +summary: >- + The 2024 Sangschaw is open for submissions! Not only that, learn about a new + 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! + +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: + +- The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original + Scots prose. +- The **John MacPhail Law Prize for Translation**: up to 3000 words of + original translation into Scots from another language. Provide along with a + copy of the original text. +- The **Hugh MacDiarmaid Tassie for Poetry**: up to 60 lines of original Scots + poetry. + +Writers new and old are all welcome, so don’t hold back! We look forward to +having your entries! +failte@go-plus.net +along with proof of payment, or with a cheque or cash to the following address: + +
+ Sangschaw + 6 Dryden Place + Edinburgh + EH9 1RP +
+ +Address any cheque to the Scots Language Society. You can pay by bank transfer +to the following account: + +
+
Account name
+
Scots Language Society
+ +
Account number
+
00153458
+ +
Sort code
+
83 47 00
+
+ +## Upcoming album release: _Leid_ + +Our very own Wullie Hershaw will soon be releasing a new album of contemporary +Scots songs titled _Leid_. It will be coming early in the new year, so stay +tuned in! + +To whet your appetite, you can watch +Frieda Morrison’s excellent video about a recent scheme of Wullie’s, when he released the book, +_The Sair Road_, along with illustrations from Les McConnel and an exhibition +in the Lochgelly Centre about the famous miner-playwright, Joe Corrie. You can +also have a listen to the musical work of his group, +the Bowhill Players on Bandcamp. + +## New audio guide at Linlithgow Palace + +This winter, the good folks at Historic Environment Scotland have translated +their audio guides for visitors into Scots for the first time. The aim is to +promote the status of the Scots language as well as to give visitors the +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. + +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 +anything similar? Answers on a postcard please! + +## Haven’t received Lallans 103 yet? + +It has come to the attention of George, our membership secretary, that there +has been an error with the posting of _Lallans_ 103. Two members, both +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 +and make us aware of it. A copy of _Lallans_ 103 will be posted out to you +straight away! + +## New format for Eiks an Ens + +Old friends will recall that _Eiks an Ens_ has formerly been a literary +magazine to accompany _Lallans_. We on the Committee felt that this neither +gave _Eiks_ the distinct identity which it deserved, nor took full advantage of +the opportunity it afforded to hold our community together. + +Therefore, this is the first issue of _Eiks_ to take a new format, where we’ll +be endeavouring to share current affairs in the world of Scots language and +literature, especially where it relates directly to our membership. + +So send us in your inside information! If you’ve spotted something you think we +ought to share in the next _Eiks_, send it to lallans@hotmail.co.uk. diff --git a/src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx b/src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx new file mode 100644 index 0000000..8aa6604 --- /dev/null +++ b/src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx @@ -0,0 +1,103 @@ +--- +title: Eiks an Ens 31 +summary: >- + The 2024 Sangschaw is open for submeissions! Forby, lairn about a new lug-in + guide at Lithgae Pailace and an upcomin album release bi our ain Wullie + Hershaw. +--- +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: + +- The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal + Scots prose. +- The **John MacPhail Law Tassie for Owersettin**: up til 3000 wirds o + oreiginal owersettin intil Scots frae anither leid. Provide alang wi a copy o + the oreiginal text. +- The **Hugh MacDiarmaid Tassie for Poesie**: up til 60 lines o oreiginal Scots + poesie. + +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 failte@go-plus.net +alang wi pruif o peyment or wi a cheque or cash til: + +
+ Sangschaw + 6 Dryden Place + Edinburgh + EH9 1RP +
+ +Address ony cheque til the Scots Language Society. Ye can pey bi bank transfer +til the follaein account: + +
+
Account nem
+
Scots Language Society
+ +
Account number
+
00153458
+ +
Sort code
+
83 47 00
+
+ +## Upcomin album release: _Leid_ + +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 watch +Frieda Morrison’s braw video about a recent ventur o Wullie’s, +whan he released the buik, _The Sair Road_, alang wi illustrations frae Les +McConnell and an exhibeition in the Lochgelly Centre about the famous +miner-playwreicht, Joe Corrie. Ye can forby pree the muisical wark o his group, +the Bowhill Players on +Bandcamp. + +## New lug-in guide at Lithgae Pailace + +This winter, the guid fowks at Historic Environment Scotland hae owerset their +lug-in guides for veisitors intil Scots for the first time. The aim is tae +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. + +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 +similar? Answers on a postcaird pleise! + +## No received Lallans 103 yet? + +It haes cam tae the notice o George, our membership secretar, that thare haes +been a mishanter wi the postin o _Lallans_ 103. Twa memmers, baith subscribers +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 +mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! + +## New format for Eiks an Ens + +Auld freinds will mind that _Eiks an Ens_ haes formerlie been a leiterar magazine +tae accompanie _Lallans_. We on the Comatee felt that this didnae gie Eiks an +Ens the distinct purpose that it deserved, and it didnae tak fu advauntage o +the opportunitie _Eiks_ affuirdit tae jeel our communitie thegether. + +Sae this is the first issue o _Eiks_ tae tak a new format, whaur we’ll be +ettlin tae skair current affairs i the warld o Scots leid and leitratur, +especially whaur it effeirs directly til our membership. + +Sae send us in your inside information! Gin ye’ve spottit somethin you think +we shuid skair in the neist _Eiks_, send it til lallans@hotmail.co.uk. -- cgit v1.2.3 From a783b4a6858f25a1453d77931926ba93bc0b7052 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:39:57 +0000 Subject: Reorder news (#42) * Reslugs news items * Fixes typo in getMostRecentNewsItem() * Fixes typo in newUtils.getDate() * Sorts news index from most recent to oldest --- src/content/news/en-GB/2023-03-17-eiks-30.mdx | 171 ++++++++++++++++++++ .../news/en-GB/2023-03-17-eiks-an-ens-30.mdx | 171 -------------------- src/content/news/en-GB/2023-12-10-eiks-31.mdx | 104 +++++++++++++ .../news/en-GB/2023-12-10-eiks-an-ens-31.mdx | 104 ------------- src/content/news/sco/2023-03-17-eiks-30.mdx | 173 +++++++++++++++++++++ src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx | 173 --------------------- src/content/news/sco/2023-12-10-eiks-31.mdx | 103 ++++++++++++ src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx | 103 ------------ src/lib/newsUtils.ts | 20 ++- src/pages/[locale]/news/[...slug].astro | 23 +-- src/pages/[locale]/news/index.astro | 6 +- 11 files changed, 573 insertions(+), 578 deletions(-) create mode 100644 src/content/news/en-GB/2023-03-17-eiks-30.mdx delete mode 100644 src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx create mode 100644 src/content/news/en-GB/2023-12-10-eiks-31.mdx delete mode 100644 src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx create mode 100644 src/content/news/sco/2023-03-17-eiks-30.mdx delete mode 100644 src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx create mode 100644 src/content/news/sco/2023-12-10-eiks-31.mdx delete mode 100644 src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx 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 new file mode 100644 index 0000000..34a83ac --- /dev/null +++ b/src/content/news/en-GB/2023-03-17-eiks-30.mdx @@ -0,0 +1,171 @@ +--- +title: Eiks an Ens 30 +summary: >- + Included in this issue of Eiks an Ens are details of our next + 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 + +The Annual Conference of the Scots Language Society will be held on Saturday the +3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 +8EP. This year’s theme will be _The Art of Flyting in Scottish Literature_. + + + +The cost of attending the Collogue is £20. Contact George Watt on +lallans@hotmail.co.uk +or Elaine Morton on +failte@go-plus.net. + +## Sangschaw 2023 Winners + +### The Robert McLellan Tassie fur Scots Prose + +#### Winner + +_Aince_ by Jamie Purves + +#### Rinner-up + +_Haymarket Wumman_ by Jerry Randalls + +#### Ruisit + +_Bother wi a Babby Bird_ by Anne Jones + +_Benny_ by Andrew G Matthews + +_Kafka_ by Pete Fortune + +### The John MacPhail Law Tassie for Owersettin + +#### Winner + +_A Sang tae the Heir_ by Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ by Dorothy Lawrenson + +_Salome_ by Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ by Donald Adamson + +_Weddin Blessin_ by Gordon Davidson + +_A Dug wi Nae Maister_ by Tom Ellett + +_Seeven Auld Fodies_ by WS Milne + +_The Tale o Thorstein Grue_ by Colin Mackenzie + +_The Yirdin o Sorley MacLean_ by Derrick McClure + +_Propertius_ by John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + +_Roond Stane_ by Finola Scott + +#### Jynt Rinner-up + +_The Black Loch_ by Robert Duncan +_Aliens_ by James Sinclair + +#### Ruisit + +_Chale Shaw_ by Joe Carstairs + +_John MacLean’s Coat_ by Robert Duncan + +_Jock Tamson’s Luve-Bairns_ by David Bleiman + +_Bauk in the USSR_ by Alastair McLeish + +_Eldritch, Cretaceous Man Jinkin_ by Alan Millar + +_The Ootgaun_ by Hamish Scott + +_Mindin Joe_ by Jock Stein + +_The Ceremonie o Cairnholy_ by Donald Adamson + +_A New Sang_ by David Bleiman + +_Ahint the Haund_ by Kevin Connelly + +_The Marriage Lair_ by Irene Howat + +_Leid in ma Heid_ by Alan Millar + +## Wittins: Sangschaw, Lallans 102-103 + +Our own Lord Braxfield, Judge of the Sangschaw, will deliver his summary of +this year’s happenings in Lallans 102. The word on the street is that the +cranky old grump was pretty impressed by what was put before him. So keep at +it, Scots writers - it vexes him no end to see the Scots language being put to +such good effect! It’s not too early to start working on your masterpiece for +next year. The winner of the poetry class is printed below, but the editor will +endeavour to include as many entries as possible in the forthcoming Lallans +102/103. The summer number in particular will have an extraordinary and broad +showing of further Scots writing, including an interview with Scots Radio +broadcaster Frieda Morrison; Fred Freeman’s epic on Burns, Hamish Henderson +and song; the final instalment of Sam Burns’ Deacon Broadie play and an +abundance of thought-provoking poetry, stories, reviews and news concerning +all the other ventures in the ever-expanding world of the Scots language. + +## _The Galloway Hoard, Kirkcudbright Museum_ by Finola Scott + +_Winner of the Hugh MacDiarmid Cup for Poetry, Sangschaw 2023_ + +Aw muscle and glaur, he’s preenin
+An muckle boastin. Yi’d think
+He wis the first. In he struts
+Aw Cock o the walk,
+King o Faithers, comb throbbin.
+ +Aye unnerfit, he wants tae feel
+Ma flutters, tae cup the load I coorie.
+He brags aboot the hero it’ll be.
+Weel mibbe, but fir noo it’s jist
+A wee will o the wisp, ma treisur.
+ +I shouldnae compleen, sure he broucht
+thon gift - a wee baa. Its hollow jinglet
+when I joogelt it. I thocht it a toy
+fir the bairn. But naw, seems it’s tae ease
+an bless the birthin. Whit a man.
+ +## Anthologies + +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 +or Willie Hershaw at +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-03-17-eiks-an-ens-30.mdx b/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx deleted file mode 100644 index 34a83ac..0000000 --- a/src/content/news/en-GB/2023-03-17-eiks-an-ens-30.mdx +++ /dev/null @@ -1,171 +0,0 @@ ---- -title: Eiks an Ens 30 -summary: >- - Included in this issue of Eiks an Ens are details of our next - 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 - -The Annual Conference of the Scots Language Society will be held on Saturday the -3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 -8EP. This year’s theme will be _The Art of Flyting in Scottish Literature_. - - - -The cost of attending the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk -or Elaine Morton on -failte@go-plus.net. - -## Sangschaw 2023 Winners - -### The Robert McLellan Tassie fur Scots Prose - -#### Winner - -_Aince_ by Jamie Purves - -#### Rinner-up - -_Haymarket Wumman_ by Jerry Randalls - -#### Ruisit - -_Bother wi a Babby Bird_ by Anne Jones - -_Benny_ by Andrew G Matthews - -_Kafka_ by Pete Fortune - -### The John MacPhail Law Tassie for Owersettin - -#### Winner - -_A Sang tae the Heir_ by Derrick McClure - -#### Jynt Rinner-up - -_The King o the Bees_ by Dorothy Lawrenson - -_Salome_ by Jerry Randalls - -#### Ruisit - -_Mylkwiffe_ by Donald Adamson - -_Weddin Blessin_ by Gordon Davidson - -_A Dug wi Nae Maister_ by Tom Ellett - -_Seeven Auld Fodies_ by WS Milne - -_The Tale o Thorstein Grue_ by Colin Mackenzie - -_The Yirdin o Sorley MacLean_ by Derrick McClure - -_Propertius_ by John Erskine - -### The Hugh MacDiarmaid Tassie for Poesie - -#### Winner - -_Roond Stane_ by Finola Scott - -#### Jynt Rinner-up - -_The Black Loch_ by Robert Duncan -_Aliens_ by James Sinclair - -#### Ruisit - -_Chale Shaw_ by Joe Carstairs - -_John MacLean’s Coat_ by Robert Duncan - -_Jock Tamson’s Luve-Bairns_ by David Bleiman - -_Bauk in the USSR_ by Alastair McLeish - -_Eldritch, Cretaceous Man Jinkin_ by Alan Millar - -_The Ootgaun_ by Hamish Scott - -_Mindin Joe_ by Jock Stein - -_The Ceremonie o Cairnholy_ by Donald Adamson - -_A New Sang_ by David Bleiman - -_Ahint the Haund_ by Kevin Connelly - -_The Marriage Lair_ by Irene Howat - -_Leid in ma Heid_ by Alan Millar - -## Wittins: Sangschaw, Lallans 102-103 - -Our own Lord Braxfield, Judge of the Sangschaw, will deliver his summary of -this year’s happenings in Lallans 102. The word on the street is that the -cranky old grump was pretty impressed by what was put before him. So keep at -it, Scots writers - it vexes him no end to see the Scots language being put to -such good effect! It’s not too early to start working on your masterpiece for -next year. The winner of the poetry class is printed below, but the editor will -endeavour to include as many entries as possible in the forthcoming Lallans -102/103. The summer number in particular will have an extraordinary and broad -showing of further Scots writing, including an interview with Scots Radio -broadcaster Frieda Morrison; Fred Freeman’s epic on Burns, Hamish Henderson -and song; the final instalment of Sam Burns’ Deacon Broadie play and an -abundance of thought-provoking poetry, stories, reviews and news concerning -all the other ventures in the ever-expanding world of the Scots language. - -## _The Galloway Hoard, Kirkcudbright Museum_ by Finola Scott - -_Winner of the Hugh MacDiarmid Cup for Poetry, Sangschaw 2023_ - -Aw muscle and glaur, he’s preenin
-An muckle boastin. Yi’d think
-He wis the first. In he struts
-Aw Cock o the walk,
-King o Faithers, comb throbbin.
- -Aye unnerfit, he wants tae feel
-Ma flutters, tae cup the load I coorie.
-He brags aboot the hero it’ll be.
-Weel mibbe, but fir noo it’s jist
-A wee will o the wisp, ma treisur.
- -I shouldnae compleen, sure he broucht
-thon gift - a wee baa. Its hollow jinglet
-when I joogelt it. I thocht it a toy
-fir the bairn. But naw, seems it’s tae ease
-an bless the birthin. Whit a man.
- -## Anthologies - -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 -or Willie Hershaw at -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 new file mode 100644 index 0000000..1158dde --- /dev/null +++ b/src/content/news/en-GB/2023-12-10-eiks-31.mdx @@ -0,0 +1,104 @@ +--- +title: Eiks an Ens 31 +summary: >- + The 2024 Sangschaw is open for submissions! Not only that, learn about a new + 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! + +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: + +- The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original + Scots prose. +- The **John MacPhail Law Prize for Translation**: up to 3000 words of + original translation into Scots from another language. Provide along with a + copy of the original text. +- The **Hugh MacDiarmaid Tassie for Poetry**: up to 60 lines of original Scots + poetry. + +Writers new and old are all welcome, so don’t hold back! We look forward to +having your entries! +failte@go-plus.net +along with proof of payment, or with a cheque or cash to the following address: + +
+ Sangschaw + 6 Dryden Place + Edinburgh + EH9 1RP +
+ +Address any cheque to the Scots Language Society. You can pay by bank transfer +to the following account: + +
+
Account name
+
Scots Language Society
+ +
Account number
+
00153458
+ +
Sort code
+
83 47 00
+
+ +## Upcoming album release: _Leid_ + +Our very own Wullie Hershaw will soon be releasing a new album of contemporary +Scots songs titled _Leid_. It will be coming early in the new year, so stay +tuned in! + +To whet your appetite, you can watch +Frieda Morrison’s excellent video about a recent scheme of Wullie’s, when he released the book, +_The Sair Road_, along with illustrations from Les McConnel and an exhibition +in the Lochgelly Centre about the famous miner-playwright, Joe Corrie. You can +also have a listen to the musical work of his group, +the Bowhill Players on Bandcamp. + +## New audio guide at Linlithgow Palace + +This winter, the good folks at Historic Environment Scotland have translated +their audio guides for visitors into Scots for the first time. The aim is to +promote the status of the Scots language as well as to give visitors the +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. + +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 +anything similar? Answers on a postcard please! + +## Haven’t received Lallans 103 yet? + +It has come to the attention of George, our membership secretary, that there +has been an error with the posting of _Lallans_ 103. Two members, both +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 +and make us aware of it. A copy of _Lallans_ 103 will be posted out to you +straight away! + +## New format for Eiks an Ens + +Old friends will recall that _Eiks an Ens_ has formerly been a literary +magazine to accompany _Lallans_. We on the Committee felt that this neither +gave _Eiks_ the distinct identity which it deserved, nor took full advantage of +the opportunity it afforded to hold our community together. + +Therefore, this is the first issue of _Eiks_ to take a new format, where we’ll +be endeavouring to share current affairs in the world of Scots language and +literature, especially where it relates directly to our membership. + +So send us in your inside information! If you’ve spotted something you think we +ought to share in the next _Eiks_, send it to lallans@hotmail.co.uk. diff --git a/src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx b/src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx deleted file mode 100644 index 1158dde..0000000 --- a/src/content/news/en-GB/2023-12-10-eiks-an-ens-31.mdx +++ /dev/null @@ -1,104 +0,0 @@ ---- -title: Eiks an Ens 31 -summary: >- - The 2024 Sangschaw is open for submissions! Not only that, learn about a new - 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! - -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: - -- The **Robert McLellan Prize for Scots Prose**: up to 3000 words of original - Scots prose. -- The **John MacPhail Law Prize for Translation**: up to 3000 words of - original translation into Scots from another language. Provide along with a - copy of the original text. -- The **Hugh MacDiarmaid Tassie for Poetry**: up to 60 lines of original Scots - poetry. - -Writers new and old are all welcome, so don’t hold back! We look forward to -having your entries! -failte@go-plus.net -along with proof of payment, or with a cheque or cash to the following address: - -
- Sangschaw - 6 Dryden Place - Edinburgh - EH9 1RP -
- -Address any cheque to the Scots Language Society. You can pay by bank transfer -to the following account: - -
-
Account name
-
Scots Language Society
- -
Account number
-
00153458
- -
Sort code
-
83 47 00
-
- -## Upcoming album release: _Leid_ - -Our very own Wullie Hershaw will soon be releasing a new album of contemporary -Scots songs titled _Leid_. It will be coming early in the new year, so stay -tuned in! - -To whet your appetite, you can watch -Frieda Morrison’s excellent video about a recent scheme of Wullie’s, when he released the book, -_The Sair Road_, along with illustrations from Les McConnel and an exhibition -in the Lochgelly Centre about the famous miner-playwright, Joe Corrie. You can -also have a listen to the musical work of his group, -the Bowhill Players on Bandcamp. - -## New audio guide at Linlithgow Palace - -This winter, the good folks at Historic Environment Scotland have translated -their audio guides for visitors into Scots for the first time. The aim is to -promote the status of the Scots language as well as to give visitors the -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. - -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 -anything similar? Answers on a postcard please! - -## Haven’t received Lallans 103 yet? - -It has come to the attention of George, our membership secretary, that there -has been an error with the posting of _Lallans_ 103. Two members, both -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 -and make us aware of it. A copy of _Lallans_ 103 will be posted out to you -straight away! - -## New format for Eiks an Ens - -Old friends will recall that _Eiks an Ens_ has formerly been a literary -magazine to accompany _Lallans_. We on the Committee felt that this neither -gave _Eiks_ the distinct identity which it deserved, nor took full advantage of -the opportunity it afforded to hold our community together. - -Therefore, this is the first issue of _Eiks_ to take a new format, where we’ll -be endeavouring to share current affairs in the world of Scots language and -literature, especially where it relates directly to our membership. - -So send us in your inside information! If you’ve spotted something you think we -ought to share in the next _Eiks_, send it to lallans@hotmail.co.uk. diff --git a/src/content/news/sco/2023-03-17-eiks-30.mdx b/src/content/news/sco/2023-03-17-eiks-30.mdx new file mode 100644 index 0000000..201642c --- /dev/null +++ b/src/content/news/sco/2023-03-17-eiks-30.mdx @@ -0,0 +1,173 @@ +--- +title: Eiks an Ens 30 +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 + +The Annual Collogue o the Scots Leid Associe will be held on Setturday, June +3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. +This year’s theme will be _The Art o Flyting in Scottish Leiterature_. + +### Events schedule + + + +The cost o attendin the Collogue is £20. Contact George Watt on +lallans@hotmail.co.uk +or Elaine Morton on +failte@go-plus.net. + + +## Sangschaw 2023 Winners + +### The Robert McLellan Tassie fur Scots Prose + +#### Winner + +_Aince_ bi Jamie Purves + +#### Rinner-up + +_Haymarket Wumman_ bi Jerry Randalls + +#### Ruisit + +_Bother wi a Babby Bird_ bi Anne Jones + +_Benny_ bi Andrew G. Matthews + +_Kafka_ bi Pete Fortune + +### The John MacPhail Law Tassie for Owersettin + +#### Winner + +_A Sang tae the Heir_ bi Derrick McClure + +#### Jynt Rinner-up + +_The King o the Bees_ bi Dorothy Lawrenson + +_Salome_ bi Jerry Randalls + +#### Ruisit + +_Mylkwiffe_ bi Donald Adamson + +_Weddin Blessin_ bi Gordon Davidson + +_A Dug wi Nae Maister_ bi Tom Ellett + +_Seeven Auld Fodies_ bi WS Milne + +_The Tale o Thorstein Grue_ bi Colin Mackenzie + +_The Yirdin o Sorley MacLean_ bi Derrick McClure + +_Propertius_ bi John Erskine + +### The Hugh MacDiarmaid Tassie for Poesie + +#### Winner + +_Roond Stane_ bi Finola Scott + +#### Jynt Rinner-up + +_The Black Loch_ bi Robert Duncan + +_Aliens_ bi James Sinclair + +#### Ruisit + +_Chale Shaw_ bi Joe Carstairs + +_John MacLean’s Coat_ bi Robert Duncan + +_Jock Tamson’s Luve-Bairns_ bi David Bleiman + +_Bauk in the USSR_ bi Alastair McLeish + +_Eldritch, Cretaceous Man Jinkin_ bi Alan Millar + +_The Ootgaun_ bi Hamish Scott + +_Mindin Joe_ bi Jock Stein + +_The Ceremonie o Cairnholy_ bi Donald Adamson + +_A New Sang_ bi David Bleiman + +_Ahint the Haund_ bi Kevin Connelly + +_The Marriage Lair_ bi Irene Howat + +_Leid in ma Heid_ bi Alan Millar + +## Wittins: Sangschaw, Lallans 102-103 + +Our ain Lord Braxfield, Jeidge o the Sangschaw, will deleiver his summation +o this year’s fairins in Lallans 102. The wird on the pavey is that the +crabbit auld scunner wass fair taen up wi whit was puit afore him. Sae caw +awaa Scots screivers - it deaves him sairly tae see the leid being yokit +tae sic guid effeck! It’s no ower airly tae get makkin your maisterpiece +for neist year. The winner o the poesie is prentit ablaw but the editor +will ettle tae include as monie entries as possible in the furthcoming Lallans +102/103. Forby, the simmer nummer will hae a byous kythin and spreid o Scots +screivin including an interview wi Scots Radio broadcaster Frieda Morrison, +Fred Freeman’s epic on Burns, Hamish Henderson and sang, the final instalment +o Sam Burns Deacon Brodie play and a wheen o thochtie poesie, tales, reviews +and wittins anent aa the ither ploys gaun on in the aye raxin warld o Scots Leid. + +## _The Galloway Hoard, Kirkcudbright Museum_ bi Finola Scott + +_Winner o the Hugh MacDiarmid Tassie fur Poesie, Sangschaw 2023_ + +Aw muscle and glaur, he’s preenin
+An muckle boastin. Yi’d think
+He wis the first. In he struts
+Aw Cock o the walk,
+King o Faithers, comb throbbin.
+ +Aye unnerfit, he wants tae feel
+Ma flutters, tae cup the load I coorie.
+He brags aboot the hero it’ll be.
+Weel mibbe, but fir noo it’s jist
+A wee will o the wisp, ma treisur.
+ +I shouldnae compleen, sure he broucht
+thon gift - a wee baa. Its hollow jinglet
+when I joogelt it. I thocht it a toy
+fir the bairn. But naw, seems it’s tae ease
+an bless the birthin. Whit a man.
+ +## Anthologies + +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 +or Willie Hershaw at +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-03-17-eiks-an-ens-30.mdx b/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx deleted file mode 100644 index 201642c..0000000 --- a/src/content/news/sco/2023-03-17-eiks-an-ens-30.mdx +++ /dev/null @@ -1,173 +0,0 @@ ---- -title: Eiks an Ens 30 -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 - -The Annual Collogue o the Scots Leid Associe will be held on Setturday, June -3rd in the Sandeman Room, AK Bell Library, York Place, Perth, PH2 8EP. -This year’s theme will be _The Art o Flyting in Scottish Leiterature_. - -### Events schedule - - - -The cost o attendin the Collogue is £20. Contact George Watt on -lallans@hotmail.co.uk -or Elaine Morton on -failte@go-plus.net. - - -## Sangschaw 2023 Winners - -### The Robert McLellan Tassie fur Scots Prose - -#### Winner - -_Aince_ bi Jamie Purves - -#### Rinner-up - -_Haymarket Wumman_ bi Jerry Randalls - -#### Ruisit - -_Bother wi a Babby Bird_ bi Anne Jones - -_Benny_ bi Andrew G. Matthews - -_Kafka_ bi Pete Fortune - -### The John MacPhail Law Tassie for Owersettin - -#### Winner - -_A Sang tae the Heir_ bi Derrick McClure - -#### Jynt Rinner-up - -_The King o the Bees_ bi Dorothy Lawrenson - -_Salome_ bi Jerry Randalls - -#### Ruisit - -_Mylkwiffe_ bi Donald Adamson - -_Weddin Blessin_ bi Gordon Davidson - -_A Dug wi Nae Maister_ bi Tom Ellett - -_Seeven Auld Fodies_ bi WS Milne - -_The Tale o Thorstein Grue_ bi Colin Mackenzie - -_The Yirdin o Sorley MacLean_ bi Derrick McClure - -_Propertius_ bi John Erskine - -### The Hugh MacDiarmaid Tassie for Poesie - -#### Winner - -_Roond Stane_ bi Finola Scott - -#### Jynt Rinner-up - -_The Black Loch_ bi Robert Duncan - -_Aliens_ bi James Sinclair - -#### Ruisit - -_Chale Shaw_ bi Joe Carstairs - -_John MacLean’s Coat_ bi Robert Duncan - -_Jock Tamson’s Luve-Bairns_ bi David Bleiman - -_Bauk in the USSR_ bi Alastair McLeish - -_Eldritch, Cretaceous Man Jinkin_ bi Alan Millar - -_The Ootgaun_ bi Hamish Scott - -_Mindin Joe_ bi Jock Stein - -_The Ceremonie o Cairnholy_ bi Donald Adamson - -_A New Sang_ bi David Bleiman - -_Ahint the Haund_ bi Kevin Connelly - -_The Marriage Lair_ bi Irene Howat - -_Leid in ma Heid_ bi Alan Millar - -## Wittins: Sangschaw, Lallans 102-103 - -Our ain Lord Braxfield, Jeidge o the Sangschaw, will deleiver his summation -o this year’s fairins in Lallans 102. The wird on the pavey is that the -crabbit auld scunner wass fair taen up wi whit was puit afore him. Sae caw -awaa Scots screivers - it deaves him sairly tae see the leid being yokit -tae sic guid effeck! It’s no ower airly tae get makkin your maisterpiece -for neist year. The winner o the poesie is prentit ablaw but the editor -will ettle tae include as monie entries as possible in the furthcoming Lallans -102/103. Forby, the simmer nummer will hae a byous kythin and spreid o Scots -screivin including an interview wi Scots Radio broadcaster Frieda Morrison, -Fred Freeman’s epic on Burns, Hamish Henderson and sang, the final instalment -o Sam Burns Deacon Brodie play and a wheen o thochtie poesie, tales, reviews -and wittins anent aa the ither ploys gaun on in the aye raxin warld o Scots Leid. - -## _The Galloway Hoard, Kirkcudbright Museum_ bi Finola Scott - -_Winner o the Hugh MacDiarmid Tassie fur Poesie, Sangschaw 2023_ - -Aw muscle and glaur, he’s preenin
-An muckle boastin. Yi’d think
-He wis the first. In he struts
-Aw Cock o the walk,
-King o Faithers, comb throbbin.
- -Aye unnerfit, he wants tae feel
-Ma flutters, tae cup the load I coorie.
-He brags aboot the hero it’ll be.
-Weel mibbe, but fir noo it’s jist
-A wee will o the wisp, ma treisur.
- -I shouldnae compleen, sure he broucht
-thon gift - a wee baa. Its hollow jinglet
-when I joogelt it. I thocht it a toy
-fir the bairn. But naw, seems it’s tae ease
-an bless the birthin. Whit a man.
- -## Anthologies - -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 -or Willie Hershaw at -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 new file mode 100644 index 0000000..8aa6604 --- /dev/null +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -0,0 +1,103 @@ +--- +title: Eiks an Ens 31 +summary: >- + The 2024 Sangschaw is open for submeissions! Forby, lairn about a new lug-in + guide at Lithgae Pailace and an upcomin album release bi our ain Wullie + Hershaw. +--- +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: + +- The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal + Scots prose. +- The **John MacPhail Law Tassie for Owersettin**: up til 3000 wirds o + oreiginal owersettin intil Scots frae anither leid. Provide alang wi a copy o + the oreiginal text. +- The **Hugh MacDiarmaid Tassie for Poesie**: up til 60 lines o oreiginal Scots + poesie. + +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 failte@go-plus.net +alang wi pruif o peyment or wi a cheque or cash til: + +
+ Sangschaw + 6 Dryden Place + Edinburgh + EH9 1RP +
+ +Address ony cheque til the Scots Language Society. Ye can pey bi bank transfer +til the follaein account: + +
+
Account nem
+
Scots Language Society
+ +
Account number
+
00153458
+ +
Sort code
+
83 47 00
+
+ +## Upcomin album release: _Leid_ + +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 watch +Frieda Morrison’s braw video about a recent ventur o Wullie’s, +whan he released the buik, _The Sair Road_, alang wi illustrations frae Les +McConnell and an exhibeition in the Lochgelly Centre about the famous +miner-playwreicht, Joe Corrie. Ye can forby pree the muisical wark o his group, +the Bowhill Players on +Bandcamp. + +## New lug-in guide at Lithgae Pailace + +This winter, the guid fowks at Historic Environment Scotland hae owerset their +lug-in guides for veisitors intil Scots for the first time. The aim is tae +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. + +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 +similar? Answers on a postcaird pleise! + +## No received Lallans 103 yet? + +It haes cam tae the notice o George, our membership secretar, that thare haes +been a mishanter wi the postin o _Lallans_ 103. Twa memmers, baith subscribers +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 +mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! + +## New format for Eiks an Ens + +Auld freinds will mind that _Eiks an Ens_ haes formerlie been a leiterar magazine +tae accompanie _Lallans_. We on the Comatee felt that this didnae gie Eiks an +Ens the distinct purpose that it deserved, and it didnae tak fu advauntage o +the opportunitie _Eiks_ affuirdit tae jeel our communitie thegether. + +Sae this is the first issue o _Eiks_ tae tak a new format, whaur we’ll be +ettlin tae skair current affairs i the warld o Scots leid and leitratur, +especially whaur it effeirs directly til our membership. + +Sae send us in your inside information! Gin ye’ve spottit somethin you think +we shuid skair in the neist _Eiks_, send it til lallans@hotmail.co.uk. diff --git a/src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx b/src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx deleted file mode 100644 index 8aa6604..0000000 --- a/src/content/news/sco/2023-12-10-eiks-an-ens-31.mdx +++ /dev/null @@ -1,103 +0,0 @@ ---- -title: Eiks an Ens 31 -summary: >- - The 2024 Sangschaw is open for submeissions! Forby, lairn about a new lug-in - guide at Lithgae Pailace and an upcomin album release bi our ain Wullie - Hershaw. ---- -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: - -- The **Robert McLellan Tassie for Scots Prose**: up til 3000 wirds o oreiginal - Scots prose. -- The **John MacPhail Law Tassie for Owersettin**: up til 3000 wirds o - oreiginal owersettin intil Scots frae anither leid. Provide alang wi a copy o - the oreiginal text. -- The **Hugh MacDiarmaid Tassie for Poesie**: up til 60 lines o oreiginal Scots - poesie. - -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 failte@go-plus.net -alang wi pruif o peyment or wi a cheque or cash til: - -
- Sangschaw - 6 Dryden Place - Edinburgh - EH9 1RP -
- -Address ony cheque til the Scots Language Society. Ye can pey bi bank transfer -til the follaein account: - -
-
Account nem
-
Scots Language Society
- -
Account number
-
00153458
- -
Sort code
-
83 47 00
-
- -## Upcomin album release: _Leid_ - -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 watch -Frieda Morrison’s braw video about a recent ventur o Wullie’s, -whan he released the buik, _The Sair Road_, alang wi illustrations frae Les -McConnell and an exhibeition in the Lochgelly Centre about the famous -miner-playwreicht, Joe Corrie. Ye can forby pree the muisical wark o his group, -the Bowhill Players on -Bandcamp. - -## New lug-in guide at Lithgae Pailace - -This winter, the guid fowks at Historic Environment Scotland hae owerset their -lug-in guides for veisitors intil Scots for the first time. The aim is tae -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. - -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 -similar? Answers on a postcaird pleise! - -## No received Lallans 103 yet? - -It haes cam tae the notice o George, our membership secretar, that thare haes -been a mishanter wi the postin o _Lallans_ 103. Twa memmers, baith subscribers -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 -mak us ken o it. A copy o _Lallans_ 103 will be postit out tae ye straucht awa! - -## New format for Eiks an Ens - -Auld freinds will mind that _Eiks an Ens_ haes formerlie been a leiterar magazine -tae accompanie _Lallans_. We on the Comatee felt that this didnae gie Eiks an -Ens the distinct purpose that it deserved, and it didnae tak fu advauntage o -the opportunitie _Eiks_ affuirdit tae jeel our communitie thegether. - -Sae this is the first issue o _Eiks_ tae tak a new format, whaur we’ll be -ettlin tae skair current affairs i the warld o Scots leid and leitratur, -especially whaur it effeirs directly til our membership. - -Sae send us in your inside information! Gin ye’ve spottit somethin you think -we shuid skair in the neist _Eiks_, send it til lallans@hotmail.co.uk. diff --git a/src/lib/newsUtils.ts b/src/lib/newsUtils.ts index aa711e3..bffc7d6 100644 --- a/src/lib/newsUtils.ts +++ b/src/lib/newsUtils.ts @@ -1,5 +1,6 @@ +import locales from '$i18n/locales'; import type Locale from '$types/Locale'; -import { CollectionEntry, getCollection } from 'astro:content'; +import { getCollection, type CollectionEntry } from 'astro:content'; export async function getMostRecentNewsItem(locale: Locale) { const allNews = await getCollection('news'); @@ -8,7 +9,7 @@ export async function getMostRecentNewsItem(locale: Locale) { if (!someNewsItem) { return null; } - return allNewsInLocale.reduce((prev, curr) => (isBefore(curr, prev) ? curr : prev), someNewsItem); + return allNewsInLocale.reduce((prev, curr) => (isBefore(prev, curr) ? curr : prev), someNewsItem); } export function getLocale(newsItem: CollectionEntry<'news'>) { @@ -18,7 +19,13 @@ export function getLocale(newsItem: CollectionEntry<'news'>) { export function getHref(newsItem: CollectionEntry<'news'>) { const locale = getLocale(newsItem); - return `/${locale}/news/${newsItem.slug.replace('/', '-')}`; + return `/${locale}/news/${getSlug(newsItem)}`; +} + +export function getSlug(newsItem: CollectionEntry<'news'>) { + const toLowerCase = (s: string) => s.toLowerCase(); + const matchLocales = new RegExp(`(${locales.map(toLowerCase).join('|')})/`); + return newsItem.slug.replace(matchLocales, ''); } export function isNewsItemInLocale(newsItem: CollectionEntry<'news'>, locale: Locale) { @@ -26,7 +33,7 @@ export function isNewsItemInLocale(newsItem: CollectionEntry<'news'>, locale: Lo return newsItemLocale === locale; } -function isBefore(item1: CollectionEntry<'news'>, item2: CollectionEntry<'news'>) { +export function isBefore(item1: CollectionEntry<'news'>, item2: CollectionEntry<'news'>) { const date1 = getDate(item1); const date2 = getDate(item2); if (!date2) { @@ -39,6 +46,7 @@ function isBefore(item1: CollectionEntry<'news'>, item2: CollectionEntry<'news'> } export function getDate(newsItem: CollectionEntry<'news'>) { - const match = newsItem.id.match(/(?<=(en-GB|sco))\/(\d\d\d\d-\d\d-\d\d)/)?.[2]; - return match ? new Date(match) : null; + const matchDate = new RegExp(`(${locales.join('|')})/(\\d\\d\\d\\d-\\d\\d-\\d\\d)`); + const date = newsItem.id.match(matchDate)?.[2]; + return date ? new Date(date) : null; } diff --git a/src/pages/[locale]/news/[...slug].astro b/src/pages/[locale]/news/[...slug].astro index e3b8b36..a24e65a 100644 --- a/src/pages/[locale]/news/[...slug].astro +++ b/src/pages/[locale]/news/[...slug].astro @@ -1,28 +1,13 @@ --- -import locales from '$i18n/locales'; import Article from '$layouts/Article.astro'; -import type Locale from '$types/Locale'; -import { CollectionEntry, getCollection } from 'astro:content'; +import { getCollection } from 'astro:content'; +import { getLocale, getSlug } from '$lib/newsUtils'; export async function getStaticPaths() { - function localeFromSlug(slug: CollectionEntry<'news'>['slug']): Locale | undefined { - const lowerCaseLocale = new RegExp(`^(${locales.map((l) => l.toLocaleLowerCase()).join('|')})`); - const matchedLowerCaseLocale = slug.match(lowerCaseLocale)?.[1]; - switch (matchedLowerCaseLocale) { - case 'sco': - return 'sco'; - case 'en-gb': - return 'en-GB'; - default: - console.warn('Could not find locale in slug %s', slug); - return undefined; - } - } - return (await getCollection('news')).map((entry) => ({ params: { - slug: entry.slug.replace('/', '-'), - locale: localeFromSlug(entry.slug), + slug: getSlug(entry), + locale: getLocale(entry), }, props: { entry }, })); diff --git a/src/pages/[locale]/news/index.astro b/src/pages/[locale]/news/index.astro index 37e7dd6..112f87b 100644 --- a/src/pages/[locale]/news/index.astro +++ b/src/pages/[locale]/news/index.astro @@ -5,12 +5,14 @@ import Page from '$layouts/Page.astro'; import { getLocaleFromPathOrThrow } from '$lib/getLocaleFromPath'; import localeStaticPaths from '$lib/localeStaticPaths'; import { getCollection } from 'astro:content'; -import { isNewsItemInLocale } from '$lib/newsUtils'; +import { isBefore, isNewsItemInLocale } from '$lib/newsUtils'; import NewsIndex from '$components/NewsIndex/NewsIndex.astro'; const allNews = await getCollection('news'); const locale = getLocaleFromPathOrThrow(Astro.url.pathname); -const allNewsInLocale = allNews.filter((item) => isNewsItemInLocale(item, locale)); +const allNewsInLocale = allNews + .filter((item) => isNewsItemInLocale(item, locale)) + .sort((a, b) => (isBefore(a, b) ? 1 : isBefore(b, a) ? -1 : 0)); const t = translate(locale); export async function getStaticPaths() { -- cgit v1.2.3 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);

Contributions

-
    +
      { contributions.map((contribution) => (
    • - {contribution.title} + {contribution.title} {'author' in contribution && ( - {t(tSite, { key: 'by' }) + ' ' + contribution.author} + + {t(tSite, { key: 'by' }) + ' ' + contribution.author} + )}
      • )) 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; --- -
      +

      Contributors

      -
        +
          {contributors.map((contributor) =>
        • {contributor}
          • )}
      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 && ( <>

      Track list

      -
        +
          {scotsoun.trackList.map((track) => (
        1. {track}
          2. ))} 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! -failte@go-plus.net -along with proof of payment, or with a cheque or cash to the following address: -
          - Sangschaw - 6 Dryden Place - Edinburgh - EH9 1RP -
          +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.
          Account name
          @@ -49,6 +46,27 @@ to the following account:
          83 47 00
          +Then, send your entries to +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. + +### 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: + +
          + Sangschaw + c/o 6 Dryden Place + Edinburgh + EH9 1RP +
          + +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 failte@go-plus.net -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. -
          - Sangschaw - 6 Dryden Place - Edinburgh - EH9 1RP -
          +### 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.
          Account nem
          @@ -50,6 +45,26 @@ til the follaein account:
          83 47 00
          +Syne, send your entries til +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. + +### 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: + +
          + Sangschaw + c/o 6 Dryden Place + Edinburgh + EH9 1RP +
          + +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 From 7385ba581d9f2ab8717a83e4f638f7b26652219c Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:22:58 +0000 Subject: Links to Leid title track on YouTube (#45) --- src/content/news/en-GB/2023-12-10-eiks-31.mdx | 8 +++----- src/content/news/sco/2023-12-10-eiks-31.mdx | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) 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 260eb1b..2c25f08 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 @@ -73,11 +73,9 @@ Our very own Wullie Hershaw will soon be releasing a new album of contemporary Scots songs titled _Leid_. It will be coming early in the new year, so stay tuned in! -To whet your appetite, you can watch -Frieda Morrison’s excellent video about a recent scheme of Wullie’s, when he released the book, -_The Sair Road_, along with illustrations from Les McConnel and an exhibition -in the Lochgelly Centre about the famous miner-playwright, Joe Corrie. You can -also have a listen to the musical work of his group, +To whet your appetite, you can +listen to the title track on YouTube. +You can also have a listen to the musical work of his group, the Bowhill Players on Bandcamp. ## New audio guide at Linlithgow Palace 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 1b6dbbf..22a11be 100644 --- a/src/content/news/sco/2023-12-10-eiks-31.mdx +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -70,11 +70,9 @@ cheque til the Scots Language Society. 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 watch -Frieda Morrison’s braw video about a recent ventur o Wullie’s, -whan he released the buik, _The Sair Road_, alang wi illustrations frae Les -McConnell and an exhibeition in the Lochgelly Centre about the famous -miner-playwreicht, Joe Corrie. Ye can forby pree the muisical wark o his group, +For tae whet your appetite, you can +lug in til the title track on YouTube. +Ye can forby pree the muisical wark o his group, the Bowhill Players on Bandcamp. -- cgit v1.2.3 From 44c3c04be6eb9af004d704bd2d78a5ef783fe8ae Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Sat, 16 Dec 2023 13:02:41 +0000 Subject: Eiks 31 fixes (#47) * Links to Leid title track on YouTube * Corrects Sangschaw pricing --- src/content/news/en-GB/2023-12-10-eiks-31.mdx | 10 +++++----- src/content/news/sco/2023-12-10-eiks-31.mdx | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) 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 2c25f08..aff0d2a 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 @@ -26,14 +26,14 @@ writers develop. We have three prizes: Writers new and old are all welcome, so don’t hold back! We look forward to having your entries! -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. +You can enter for £5 for one category, £10 for two or £12 for all three, +whether that’s all in the same category or spread across the three. You can +submit either by email or by post. ### Submitting by email 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. +following account. Remember, it’s £5 for one submission or £12 for three.
          Account name
          @@ -64,7 +64,7 @@ address: EH9 1RP -Remember it’s £5 for one, £10 for two or £12 for all three prizes. Address any +Remember it’s £5 per submission or £12 for three. Address any cheque to the Scots Language Society. ## Upcoming album release: _Leid_ 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 22a11be..3569788 100644 --- a/src/content/news/sco/2023-12-10-eiks-31.mdx +++ b/src/content/news/sco/2023-12-10-eiks-31.mdx @@ -26,13 +26,13 @@ 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. Ye can -either submit by email or by post. +It’s £5 for ae submeission, or £12 for three, whither in the same categorie +or in different categories. Ye can either submit by email or by post. ### Submittin by email 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. +account. Mind it’s £5 per submeission or £12 for three.
          Account nem
          @@ -62,7 +62,7 @@ and your return address on a separate sheet o paper til the follaein address: EH9 1RP -Mind it’s £5 for ane, £10 for twa or £12 for aw three tassies. Address ony +Mind it’s £5 per submeission or £12 for three. Address ony cheque til the Scots Language Society. ## Upcomin album release: _Leid_ -- cgit v1.2.3 -- cgit v1.2.3 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 --- scss/modules/btn.scss | 9 +- scss/modules/link.scss | 33 +++---- scss/modules/nav.scss | 46 +++++---- scss/modules/news-index.scss | 7 +- scss/normalize.scss | 107 +++++++++++++++------ scss/utils.scss | 4 + 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 +- .../payment-success-confirmation.astro | 2 +- .../payment-success-confirmation.astro | 2 +- src/pages/[locale]/index.astro | 2 +- 22 files changed, 178 insertions(+), 135 deletions(-) delete mode 100644 src/components/Link.astro 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) => (
        2. 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 (
        3. - - {t(tBreadcrumbs, { key: route })} - + {t(tBreadcrumbs, { key: route })}
          4. ); }) 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) => (
        4. 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.
          5. 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);
          • - +

            {t(tSite, { key: 'lallans' })}
          • - +

            {t(tSite, { key: 'scotsoun' })}

             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

            {t(tPage, { key: 'title' })}

            {t(tPage, { key: 'payment-confirmation-message', issueNumber: `${issueNumber}` })}

            - + {t(tPage, { key: 'back-button-text', issueNumber: `${issueNumber}` })}
            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);

            {t(tPage, { key: 'title' })}

            {t(tPage, { key: 'payment-confirmation-message', scotsounId })}

            - + {t(tPage, { key: 'back-button-text', scotsounId })}
            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);

            - + {contactDetails.generalEnquiries.emailAddress}
            -- cgit v1.2.3 From da96287803ea26f4cc35173f9f34b71a1d6adfa5 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+joeacarstairs@users.noreply.github.com> Date: Thu, 11 Jan 2024 08:01:32 +0000 Subject: Adds Sangschaw ad to top of homepage (#59) Co-authored-by: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> --- src/i18n/translations/pages/home.ts | 34 ++++++++++++++++++++++++++-------- src/pages/[locale]/index.astro | 1 + 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index 2166eaa..3a81710 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -6,25 +6,43 @@ const tPage = { 'en-GB': () => 'Home', }, submit: { - sco: () => 'Submit til Lallans', - 'en-GB': () => 'Submit to Lallans', + sco: () => 'Sangschaw apen for submeissions', + 'en-GB': () => 'Sangschaw open for submissions', }, 'submit-para-1': { - sco: () => 'We ar acceptin submeissions til Lallans 104!', - 'en-GB': () => 'We are accepting submissions to Lallans 104!', + sco: () => ` + We ar acceptin submeissions til our annual Scots scrievin competeition, + the Sangschaw, until the 31st o Januar 2024. + `, + 'en-GB': () => ` + We are accepting submissions to our annual Scots writing competition, the + Sangschaw, until the 31st of January 2024. + `, }, 'submit-para-2': { sco: () => ` - We accep poesie, cuttie tales, reviews, essays an drama, baith - oreiginal an owerset. Sen yer submeissions til + Aince ye’ve read the submeission criteria in + Eiks an Ens 31, send + your submeissions til lallans@hotmail.co.uk. `, 'en-GB': () => ` - We accept poetry, short stories, reviews, essays and drama, both - original and translated. Send your submissions to + Once you’ve read the submission criteria in + Eiks an Ens 31, send + your submissions to lallans@hotmail.co.uk. `, }, + 'submit-para-3': { + sco: () => ` + We luik forrit tae haein your submeission, whither you’ve been submittin + for years or you’re a first-time writer! + `, + 'en-GB': () => ` + We look forward to having your submission, whether you’ve been + submitting for years or you’re a first-time writer! + `, + }, news: { sco: () => 'Recent News', 'en-GB': () => 'Recent News', diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index efccd22..b08f412 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -24,6 +24,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);

            +

            -- cgit v1.2.3 From 0b2fbe3f5b9e2fcf0da2b320af504d5cca759045 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> Date: Fri, 19 Jan 2024 07:32:30 +0000 Subject: Layout and typography improvements (#63) * Adds soft hyphens to homepage * auto-hyphenates! * Tighter line-height in logo * Fixes spacing and typography below xs breakpoint * Fixes xs-sm spacing and typography * Fixes border widths * Link hover uses wavy underline instead of fat underline * Fixes committee img layout on scss/custom-properties * Pulls out colours SCSS variables * Merges margins and padding values * Moves variables/colours -> values/colours * Starts migrating spacing values to SCSS * Pulls out typography logic to SCSS variables/functions * Removes unneeded --er custom property * Calculates grid-total-width-absolute in SCSS * Forwards constants with @forward * Removes TODOs and unnecessary assignment to --width-prose --- scss/base/typography.scss | 13 ++--- scss/custom-properties/colours.scss | 23 ++++++++ scss/custom-properties/index.lg.scss | 3 ++ scss/custom-properties/index.md.scss | 3 ++ scss/custom-properties/index.scss | 3 ++ scss/custom-properties/index.sm.scss | 3 ++ scss/custom-properties/index.xl.scss | 3 ++ scss/custom-properties/index.xs.scss | 3 ++ scss/custom-properties/index.xxl.scss | 3 ++ scss/custom-properties/spacing/_mixins.scss | 21 ++++++++ scss/custom-properties/spacing/initial.scss | 14 +++++ scss/custom-properties/spacing/lg.scss | 7 +++ scss/custom-properties/spacing/md.scss | 7 +++ scss/custom-properties/spacing/sm.scss | 7 +++ scss/custom-properties/spacing/xl.scss | 7 +++ scss/custom-properties/spacing/xs.scss | 7 +++ scss/custom-properties/spacing/xxl.scss | 7 +++ scss/custom-properties/typography/_mixins.scss | 12 +++++ scss/custom-properties/typography/initial.scss | 41 ++++++++++++++ scss/custom-properties/typography/lg.scss | 9 ++++ scss/custom-properties/typography/md.scss | 9 ++++ scss/custom-properties/typography/sm.scss | 9 ++++ scss/custom-properties/typography/xl.scss | 9 ++++ scss/custom-properties/typography/xs.scss | 9 ++++ scss/custom-properties/typography/xxl.scss | 9 ++++ scss/index.lg.scss | 2 +- scss/index.md.scss | 2 +- scss/index.scss | 2 +- scss/index.sm.scss | 3 +- scss/index.xl.scss | 2 +- scss/index.xs.scss | 2 +- scss/index.xxl.scss | 2 +- scss/layout/section-margins.scss | 13 +++-- scss/modules/btn.scss | 8 +-- scss/modules/committee.scss | 33 ++++++++++-- scss/modules/committee.sm.scss | 5 ++ scss/modules/committee.xs.scss | 5 ++ scss/modules/footer.scss | 14 ++--- scss/modules/footer.xs.scss | 7 +++ scss/modules/index.sm.scss | 3 ++ scss/modules/index.xs.scss | 2 + scss/modules/link-gallery.scss | 6 +-- scss/modules/link.scss | 8 +-- scss/modules/nav.md.scss | 29 +++++++--- scss/modules/nav.scss | 14 ++--- scss/modules/nav.sm.scss | 38 +++++++++++++ scss/modules/news-index.scss | 6 +-- scss/utils.scss | 4 -- scss/values/_colours.scss | 34 ++++++++++++ scss/values/spacing/_constants.scss | 58 ++++++++++++++++++++ scss/values/spacing/_grid.scss | 63 ++++++++++++++++++++++ scss/values/spacing/_index.scss | 24 +++++++++ scss/values/spacing/_spacing.scss | 32 +++++++++++ scss/values/typography/_constants.scss | 20 +++++++ scss/values/typography/_index.scss | 18 +++++++ scss/variables/colours.scss | 21 -------- scss/variables/index.lg.scss | 2 - scss/variables/index.md.scss | 3 -- scss/variables/index.scss | 5 -- scss/variables/index.sm.scss | 2 - scss/variables/index.xl.scss | 2 - scss/variables/index.xs.scss | 3 -- scss/variables/index.xxl.scss | 2 - scss/variables/palette.scss | 35 ------------ scss/variables/spacing.lg.scss | 6 --- scss/variables/spacing.md.scss | 6 --- scss/variables/spacing.scss | 47 ---------------- scss/variables/spacing.sm.scss | 4 -- scss/variables/spacing.xl.scss | 10 ---- scss/variables/spacing.xs.scss | 6 --- scss/variables/spacing.xxl.scss | 6 --- scss/variables/typography.md.scss | 9 ---- scss/variables/typography.scss | 42 --------------- scss/variables/typography.xs.scss | 9 ---- .../CommitteeList/CommitteeListItem.astro | 3 +- src/i18n/translations/pages/home.ts | 12 ++--- src/i18n/translations/site.ts | 10 ++-- src/pages/[locale]/index.astro | 1 - 78 files changed, 645 insertions(+), 301 deletions(-) create mode 100644 scss/custom-properties/colours.scss create mode 100644 scss/custom-properties/index.lg.scss create mode 100644 scss/custom-properties/index.md.scss create mode 100644 scss/custom-properties/index.scss create mode 100644 scss/custom-properties/index.sm.scss create mode 100644 scss/custom-properties/index.xl.scss create mode 100644 scss/custom-properties/index.xs.scss create mode 100644 scss/custom-properties/index.xxl.scss create mode 100644 scss/custom-properties/spacing/_mixins.scss create mode 100644 scss/custom-properties/spacing/initial.scss create mode 100644 scss/custom-properties/spacing/lg.scss create mode 100644 scss/custom-properties/spacing/md.scss create mode 100644 scss/custom-properties/spacing/sm.scss create mode 100644 scss/custom-properties/spacing/xl.scss create mode 100644 scss/custom-properties/spacing/xs.scss create mode 100644 scss/custom-properties/spacing/xxl.scss create mode 100644 scss/custom-properties/typography/_mixins.scss create mode 100644 scss/custom-properties/typography/initial.scss create mode 100644 scss/custom-properties/typography/lg.scss create mode 100644 scss/custom-properties/typography/md.scss create mode 100644 scss/custom-properties/typography/sm.scss create mode 100644 scss/custom-properties/typography/xl.scss create mode 100644 scss/custom-properties/typography/xs.scss create mode 100644 scss/custom-properties/typography/xxl.scss create mode 100644 scss/modules/committee.sm.scss create mode 100644 scss/modules/committee.xs.scss create mode 100644 scss/modules/footer.xs.scss create mode 100644 scss/modules/index.sm.scss create mode 100644 scss/modules/nav.sm.scss create mode 100644 scss/values/_colours.scss create mode 100644 scss/values/spacing/_constants.scss create mode 100644 scss/values/spacing/_grid.scss create mode 100644 scss/values/spacing/_index.scss create mode 100644 scss/values/spacing/_spacing.scss create mode 100644 scss/values/typography/_constants.scss create mode 100644 scss/values/typography/_index.scss delete mode 100644 scss/variables/colours.scss delete mode 100644 scss/variables/index.lg.scss delete mode 100644 scss/variables/index.md.scss delete mode 100644 scss/variables/index.scss delete mode 100644 scss/variables/index.sm.scss delete mode 100644 scss/variables/index.xl.scss delete mode 100644 scss/variables/index.xs.scss delete mode 100644 scss/variables/index.xxl.scss delete mode 100644 scss/variables/palette.scss delete mode 100644 scss/variables/spacing.lg.scss delete mode 100644 scss/variables/spacing.md.scss delete mode 100644 scss/variables/spacing.scss delete mode 100644 scss/variables/spacing.sm.scss delete mode 100644 scss/variables/spacing.xl.scss delete mode 100644 scss/variables/spacing.xs.scss delete mode 100644 scss/variables/spacing.xxl.scss delete mode 100644 scss/variables/typography.md.scss delete mode 100644 scss/variables/typography.scss delete mode 100644 scss/variables/typography.xs.scss diff --git a/scss/base/typography.scss b/scss/base/typography.scss index 9f40bcc..4dd0afb 100644 --- a/scss/base/typography.scss +++ b/scss/base/typography.scss @@ -5,6 +5,7 @@ body { letter-spacing: 0.03rem; line-height: 1.5; word-wrap: break-word; + hyphens: auto; } h1 { @@ -12,7 +13,7 @@ h1 { } h1:not(:first-child) { - margin-block-start: var(--margin-block-lg); + margin-block-start: var(--spacing-block-lg); } h2 { @@ -20,7 +21,7 @@ h2 { } h2:not(:first-child) { - margin-block-start: var(--margin-block-lg); + margin-block-start: var(--spacing-block-lg); } h3 { @@ -28,7 +29,7 @@ h3 { } h3:not(:first-child) { - margin-block-start: var(--margin-block-md); + margin-block-start: var(--spacing-block-md); } h4 { @@ -36,7 +37,7 @@ h4 { } h4:not(:first-child) { - margin-block-start: var(--margin-block-sm); + margin-block-start: var(--spacing-block-sm); } h1, @@ -53,7 +54,7 @@ h4 { font-family: var(--font-serif); font-size: var(--font-size-6); font-weight: 700; - margin-block-start: var(--margin-block-sm); + margin-block-start: var(--spacing-block-sm); text-wrap: balance; } @@ -63,7 +64,7 @@ h4 { } :is(p, ol, ul):not(:first-child) { - margin-block-start: var(--margin-block-sm); + margin-block-start: var(--spacing-block-sm); } :is(p, h1, h2, h3, h4) { diff --git a/scss/custom-properties/colours.scss b/scss/custom-properties/colours.scss new file mode 100644 index 0000000..dadb50e --- /dev/null +++ b/scss/custom-properties/colours.scss @@ -0,0 +1,23 @@ +@use '../values/colours' as colours; + +:root { + --text-color: #{colours.$primary-98}; + --text-highlight-color: #{colours.$primary-10}; + --background-color: #{colours.$primary-10}; + --background-highlight-color: #{colours.$primary-90}; + --special-text-color: #{colours.$secondary-90}; + --special-text-highlight-color: #{colours.$secondary-10}; +} + +:is(main, article) { + --text-color: #{colours.$primary-10}; + --text-highlight-color: #{colours.$primary-90}; + --background-color: #{colours.$primary-98}; + --background-highlight-color: #{colours.$primary-10}; + --special-text-color: #{colours.$secondary-40}; + --special-text-highlight-color: #{colours.$secondary-90}; +} + +:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)) { + --background-color: #{colours.$primary-95}; +} diff --git a/scss/custom-properties/index.lg.scss b/scss/custom-properties/index.lg.scss new file mode 100644 index 0000000..2a36586 --- /dev/null +++ b/scss/custom-properties/index.lg.scss @@ -0,0 +1,3 @@ +@use 'spacing/lg' as *; +@use 'typography/lg' as *; + diff --git a/scss/custom-properties/index.md.scss b/scss/custom-properties/index.md.scss new file mode 100644 index 0000000..2367952 --- /dev/null +++ b/scss/custom-properties/index.md.scss @@ -0,0 +1,3 @@ +@use 'spacing/md' as *; +@use 'typography/md' as *; + diff --git a/scss/custom-properties/index.scss b/scss/custom-properties/index.scss new file mode 100644 index 0000000..e7279b6 --- /dev/null +++ b/scss/custom-properties/index.scss @@ -0,0 +1,3 @@ +@use 'colours' as *; +@use 'spacing/initial' as *; +@use 'typography/initial' as *; diff --git a/scss/custom-properties/index.sm.scss b/scss/custom-properties/index.sm.scss new file mode 100644 index 0000000..c1ddffe --- /dev/null +++ b/scss/custom-properties/index.sm.scss @@ -0,0 +1,3 @@ +@use 'spacing/sm' as *; +@use 'typography/sm' as *; + diff --git a/scss/custom-properties/index.xl.scss b/scss/custom-properties/index.xl.scss new file mode 100644 index 0000000..14c55cf --- /dev/null +++ b/scss/custom-properties/index.xl.scss @@ -0,0 +1,3 @@ +@use 'spacing/xl' as *; +@use 'typography/xl' as *; + diff --git a/scss/custom-properties/index.xs.scss b/scss/custom-properties/index.xs.scss new file mode 100644 index 0000000..32eb377 --- /dev/null +++ b/scss/custom-properties/index.xs.scss @@ -0,0 +1,3 @@ +@use 'spacing/xs' as *; +@use 'typography/xs' as *; + diff --git a/scss/custom-properties/index.xxl.scss b/scss/custom-properties/index.xxl.scss new file mode 100644 index 0000000..8555eee --- /dev/null +++ b/scss/custom-properties/index.xxl.scss @@ -0,0 +1,3 @@ +@use 'spacing/xxl' as *; +@use 'typography/xxl' as *; + diff --git a/scss/custom-properties/spacing/_mixins.scss b/scss/custom-properties/spacing/_mixins.scss new file mode 100644 index 0000000..4e35ee7 --- /dev/null +++ b/scss/custom-properties/spacing/_mixins.scss @@ -0,0 +1,21 @@ +@use 'sass:map'; + +@use '../../values/spacing' as spacing-values; + +@mixin spacing($breakpoint: initial) { + --spacing-inline-lg: #{spacing-values.spacing($direction: inline, $size: lg, $breakpoint: $breakpoint)}; + --spacing-inline-md: #{spacing-values.spacing($direction: inline, $size: md, $breakpoint: $breakpoint)}; + --spacing-inline-sm: #{spacing-values.spacing($direction: inline, $size: sm, $breakpoint: $breakpoint)}; + --spacing-block-lg: #{spacing-values.spacing($direction: block, $size: lg, $breakpoint: $breakpoint)}; + --spacing-block-md: #{spacing-values.spacing($direction: block, $size: md, $breakpoint: $breakpoint)}; + --spacing-block-sm: #{spacing-values.spacing($direction: block, $size: sm, $breakpoint: $breakpoint)}; +} + +@mixin grid($breakpoint: initial) { + --grid-padding: #{spacing-values.grid-padding($breakpoint: $breakpoint)}; + --grid-column-count: #{map.get(spacing-values.$grid-column-count, $breakpoint)}; + --grid-column-width: #{spacing-values.grid-column-width($breakpoint: $breakpoint)}; + --grid-gutter-width: #{spacing-values.grid-gutter-width($breakpoint: $breakpoint)}; + --grid-prose-column-count: #{map.get(spacing-values.$grid-prose-column-count, $breakpoint)}; + --grid-total-width: #{spacing-values.grid-total-width-absolute($breakpoint)}; +} diff --git a/scss/custom-properties/spacing/initial.scss b/scss/custom-properties/spacing/initial.scss new file mode 100644 index 0000000..a38388f --- /dev/null +++ b/scss/custom-properties/spacing/initial.scss @@ -0,0 +1,14 @@ +@use 'sass:map'; + +@use '../../values/spacing' as spacing-values; +@use 'mixins'; + +:root { + @include mixins.spacing(); + @include mixins.grid(); + + --width-prose: calc( + var(--grid-column-width) * var(--grid-prose-column-count) + + var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + ); +} diff --git a/scss/custom-properties/spacing/lg.scss b/scss/custom-properties/spacing/lg.scss new file mode 100644 index 0000000..1e9b090 --- /dev/null +++ b/scss/custom-properties/spacing/lg.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: lg); +} diff --git a/scss/custom-properties/spacing/md.scss b/scss/custom-properties/spacing/md.scss new file mode 100644 index 0000000..99b9352 --- /dev/null +++ b/scss/custom-properties/spacing/md.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: md); +} diff --git a/scss/custom-properties/spacing/sm.scss b/scss/custom-properties/spacing/sm.scss new file mode 100644 index 0000000..0fdfcfe --- /dev/null +++ b/scss/custom-properties/spacing/sm.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + @include mixins.spacing($breakpoint: sm); + @include mixins.grid($breakpoint: sm); +} diff --git a/scss/custom-properties/spacing/xl.scss b/scss/custom-properties/spacing/xl.scss new file mode 100644 index 0000000..265c6e9 --- /dev/null +++ b/scss/custom-properties/spacing/xl.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: xl); +} diff --git a/scss/custom-properties/spacing/xs.scss b/scss/custom-properties/spacing/xs.scss new file mode 100644 index 0000000..13a14d6 --- /dev/null +++ b/scss/custom-properties/spacing/xs.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + @include mixins.spacing($breakpoint: xs); + @include mixins.grid($breakpoint: xs); +} diff --git a/scss/custom-properties/spacing/xxl.scss b/scss/custom-properties/spacing/xxl.scss new file mode 100644 index 0000000..600f74e --- /dev/null +++ b/scss/custom-properties/spacing/xxl.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: xxl); +} diff --git a/scss/custom-properties/typography/_mixins.scss b/scss/custom-properties/typography/_mixins.scss new file mode 100644 index 0000000..a370356 --- /dev/null +++ b/scss/custom-properties/typography/_mixins.scss @@ -0,0 +1,12 @@ +@use '../../values/typography' as typography-values; + +@mixin font-sizes($breakpoint: initial) { + --font-size-0: #{typography-values.font-size('0', $breakpoint)}; + --font-size-1: #{typography-values.font-size('1', $breakpoint)}; + --font-size-2: #{typography-values.font-size('2', $breakpoint)}; + --font-size-3: #{typography-values.font-size('3', $breakpoint)}; + --font-size-4: #{typography-values.font-size('4', $breakpoint)}; + --font-size-5: #{typography-values.font-size('5', $breakpoint)}; + --font-size-6: #{typography-values.font-size('6', $breakpoint)}; +} + diff --git a/scss/custom-properties/typography/initial.scss b/scss/custom-properties/typography/initial.scss new file mode 100644 index 0000000..c9d95da --- /dev/null +++ b/scss/custom-properties/typography/initial.scss @@ -0,0 +1,41 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(); + --border-width: #{typography-values.border-width()}; + + --font-serif: + Alegreya, + -apple-system-ui-serif, + Iowan Old Style, + Apple Garamond, + Baskerville, + Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", + Times New Roman, + Droid Serif, + Times, + Source Serif Pro, + serif, + Apple Color Emoji, + Segoe UI Emoji, + Segoe UI Symbol; + + --font-sans-serif: + 'Alegreya Sans', + Lato, + -apple-system, + BlinkMacSystemFont, + avenir next, + avenir, + segoe ui, + helvetica neue, + helvetica, + Cantarell, + Ubuntu, + roboto, + noto, + arial, + sans-serif; +} diff --git a/scss/custom-properties/typography/lg.scss b/scss/custom-properties/typography/lg.scss new file mode 100644 index 0000000..30a3019 --- /dev/null +++ b/scss/custom-properties/typography/lg.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(lg); + --border-width: #{typography-values.border-width(lg)}; +} + diff --git a/scss/custom-properties/typography/md.scss b/scss/custom-properties/typography/md.scss new file mode 100644 index 0000000..df49bdd --- /dev/null +++ b/scss/custom-properties/typography/md.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(md); + --border-width: #{typography-values.border-width(md)}; +} + diff --git a/scss/custom-properties/typography/sm.scss b/scss/custom-properties/typography/sm.scss new file mode 100644 index 0000000..e1c3585 --- /dev/null +++ b/scss/custom-properties/typography/sm.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(sm); + --border-width: #{typography-values.border-width(sm)}; +} + diff --git a/scss/custom-properties/typography/xl.scss b/scss/custom-properties/typography/xl.scss new file mode 100644 index 0000000..0ddba99 --- /dev/null +++ b/scss/custom-properties/typography/xl.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(xl); + --border-width: #{typography-values.border-width(xl)}; +} + diff --git a/scss/custom-properties/typography/xs.scss b/scss/custom-properties/typography/xs.scss new file mode 100644 index 0000000..44d8bbb --- /dev/null +++ b/scss/custom-properties/typography/xs.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(xs); + --border-width: #{typography-values.border-width(xs)}; +} + diff --git a/scss/custom-properties/typography/xxl.scss b/scss/custom-properties/typography/xxl.scss new file mode 100644 index 0000000..1a777dc --- /dev/null +++ b/scss/custom-properties/typography/xxl.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(xxl); + --border-width: #{typography-values.border-width(xxl)}; +} + diff --git a/scss/index.lg.scss b/scss/index.lg.scss index 4060f14..622262f 100644 --- a/scss/index.lg.scss +++ b/scss/index.lg.scss @@ -1,3 +1,3 @@ @use 'modules/index.lg' as *; -@use 'variables/index.lg' as *; +@use 'custom-properties/index.lg' as *; diff --git a/scss/index.md.scss b/scss/index.md.scss index a49e979..e7f1fbd 100644 --- a/scss/index.md.scss +++ b/scss/index.md.scss @@ -1,4 +1,4 @@ @use 'layout/index.md' as *; @use 'modules/index.md' as *; -@use 'variables/index.md' as *; +@use 'custom-properties/index.md' as *; diff --git a/scss/index.scss b/scss/index.scss index 485e64c..b8e2334 100644 --- a/scss/index.scss +++ b/scss/index.scss @@ -2,6 +2,6 @@ @use 'base/index' as *; @use 'layout/index' as *; @use 'modules/index' as *; -@use 'variables/index' as *; +@use 'custom-properties/index' as *; @use 'utils' as *; diff --git a/scss/index.sm.scss b/scss/index.sm.scss index 37c6ec7..0ea47c9 100644 --- a/scss/index.sm.scss +++ b/scss/index.sm.scss @@ -1,2 +1,3 @@ -@use 'variables/index.sm' as *; +@use 'modules/index.sm' as *; +@use 'custom-properties/index.sm' as *; diff --git a/scss/index.xl.scss b/scss/index.xl.scss index 7848b38..e692c09 100644 --- a/scss/index.xl.scss +++ b/scss/index.xl.scss @@ -1,3 +1,3 @@ @use 'modules/index.xl' as *; -@use 'variables/index.xl' as *; +@use 'custom-properties/index.xl' as *; diff --git a/scss/index.xs.scss b/scss/index.xs.scss index 6aee8e5..78bc9bf 100644 --- a/scss/index.xs.scss +++ b/scss/index.xs.scss @@ -1,4 +1,4 @@ @use 'layout/index.xs' as *; @use 'modules/index.xs' as *; -@use 'variables/index.xs' as *; +@use 'custom-properties/index.xs' as *; diff --git a/scss/index.xxl.scss b/scss/index.xxl.scss index 067147c..67ec408 100644 --- a/scss/index.xxl.scss +++ b/scss/index.xxl.scss @@ -1,2 +1,2 @@ -@use 'variables/index.xxl' as *; +@use 'custom-properties/index.xxl' as *; diff --git a/scss/layout/section-margins.scss b/scss/layout/section-margins.scss index a11073f..8105dcb 100644 --- a/scss/layout/section-margins.scss +++ b/scss/layout/section-margins.scss @@ -1,14 +1,13 @@ :is(main, article) > :is(section, header):not(:is(section, header) :is(section, header)) { - padding-block-start: var(--margin-block-lg); - padding-block-end: var(--margin-block-md); + padding-block: var(--spacing-block-md); } footer { - padding-block-start: var(--margin-block-md); - padding-block-end: var(--margin-block-lg); + padding-block-start: var(--spacing-block-md); + padding-block-end: var(--spacing-block-lg); } nav { - padding-block-start: var(--margin-block-sm); - padding-block-end: var(--margin-block-md); -} \ No newline at end of file + padding-block-start: var(--spacing-block-sm); + padding-block-end: var(--spacing-block-md); +} diff --git a/scss/modules/btn.scss b/scss/modules/btn.scss index e9db392..6b5e543 100644 --- a/scss/modules/btn.scss +++ b/scss/modules/btn.scss @@ -1,11 +1,11 @@ .btn { display: block; - border: solid var(--relative-eighth-rem) var(--text-color); + border: solid var(--border-width) var(--text-color); font-weight: 600; text-align: center; - margin-block-start: var(--margin-block-sm); - padding-inline: var(--padding-inline-md); - padding-block: var(--padding-block-sm); + margin-block-start: var(--spacing-block-sm); + padding-inline: var(--spacing-inline-md); + padding-block: var(--spacing-block-sm); background-color: transparent; transition: background-color 100ms, diff --git a/scss/modules/committee.scss b/scss/modules/committee.scss index 2badf57..f6528a3 100644 --- a/scss/modules/committee.scss +++ b/scss/modules/committee.scss @@ -1,10 +1,37 @@ .committee__member { list-style-type: none; - margin-block-start: var(--margin-block-sm); + margin-block-start: var(--spacing-block-sm); +} + +.committee__member + .committee__member { + border-top-width: var(--border-width); + border-top-style: solid; + border-image: linear-gradient( + to right, + transparent 0%, + transparent 19.1%, + var(--text-color) 19.1%, + var(--text-color) 80.9%, + transparent 80.9%, + transparent 100% + ) 1; + margin-block-start: var(--spacing-block-md); + padding-block-start: var(--spacing-block-md); } .committee__member__img { - margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); - width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); + margin-inline: 25%; + width: 50%; border-radius: 50%; } + +.committee__member__text { + text-align: center; + margin-block-start: var(--spacing-block-sm); +} + +.committee__member__role { + display: block; + font-weight: lighter; +} + diff --git a/scss/modules/committee.sm.scss b/scss/modules/committee.sm.scss new file mode 100644 index 0000000..a2b2216 --- /dev/null +++ b/scss/modules/committee.sm.scss @@ -0,0 +1,5 @@ +.committee__member__text { + text-align: start; + margin: 0; +} + diff --git a/scss/modules/committee.xs.scss b/scss/modules/committee.xs.scss new file mode 100644 index 0000000..5681bc7 --- /dev/null +++ b/scss/modules/committee.xs.scss @@ -0,0 +1,5 @@ +.committee__member__img { + margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); + width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); +} + diff --git a/scss/modules/footer.scss b/scss/modules/footer.scss index 0d1a896..9210044 100644 --- a/scss/modules/footer.scss +++ b/scss/modules/footer.scss @@ -1,8 +1,8 @@ footer { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - gap: var(--grid-gutter-width); - align-items: baseline; + display: flex; + flex-direction: column; + gap: var(--spacing-block-sm); + align-items: center; } .footer__rss-button__label { @@ -19,10 +19,10 @@ footer { } .footer__rss-button__img { - min-width: 44px; - width: calc(8 * var(--relative-eighth-rem)); + display: block; } .footer__back-to-top { grid-column: calc(var(--grid-column-count) - 2) / calc(var(--grid-column-count) + 1); -} \ No newline at end of file + margin: 0; +} diff --git a/scss/modules/footer.xs.scss b/scss/modules/footer.xs.scss new file mode 100644 index 0000000..67cab7f --- /dev/null +++ b/scss/modules/footer.xs.scss @@ -0,0 +1,7 @@ +footer { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + gap: var(--grid-gutter-width); + align-items: end; +} + diff --git a/scss/modules/index.sm.scss b/scss/modules/index.sm.scss new file mode 100644 index 0000000..a4fb988 --- /dev/null +++ b/scss/modules/index.sm.scss @@ -0,0 +1,3 @@ +@use 'committee.sm' as *; +@use 'nav.sm' as *; + diff --git a/scss/modules/index.xs.scss b/scss/modules/index.xs.scss index 9dd43c5..ef77c6d 100644 --- a/scss/modules/index.xs.scss +++ b/scss/modules/index.xs.scss @@ -1,3 +1,5 @@ +@use 'committee.xs' as *; +@use 'footer.xs' as *; @use 'link-gallery.xs' as *; @use 'nav.xs' as *; diff --git a/scss/modules/link-gallery.scss b/scss/modules/link-gallery.scss index 56949e2..d321419 100644 --- a/scss/modules/link-gallery.scss +++ b/scss/modules/link-gallery.scss @@ -2,7 +2,7 @@ display: grid; grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); gap: var(--grid-gutter-width); - padding-block: var(--margin-block-md); + padding-block: var(--spacing-block-md); --gallery-item-column-span: 1; --gallery-row-image-height: 12rem; --gallery-row-title-height: fit-content; @@ -25,13 +25,13 @@ display: grid; grid-template-columns: 1fr; grid-template-rows: var(--gallery-row-image-height) var(--gallery-row-title-height); - row-gap: var(--margin-block-sm); + row-gap: var(--spacing-block-sm); } .link-gallery--furthsettins img { box-sizing: border-box; border-radius: 50%; - border: solid calc(2 * var(--relative-eighth-rem)) var(--text-color); + border: solid var(--border-width) var(--text-color); } .link-gallery__title { diff --git a/scss/modules/link.scss b/scss/modules/link.scss index 83206d4..2f827c4 100644 --- a/scss/modules/link.scss +++ b/scss/modules/link.scss @@ -2,23 +2,19 @@ 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: dotted transparent var(--border-width); transition: color 100ms, text-decoration-color 100ms, - text-decoration-thickness 100ms, border-color 100ms; &: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)); + text-decoration-style: wavy; transition: color 300ms, text-decoration-color 300ms, - text-decoration-thickness 300ms, border-color 300ms; } diff --git a/scss/modules/nav.md.scss b/scss/modules/nav.md.scss index c3f4a18..7f0f784 100644 --- a/scss/modules/nav.md.scss +++ b/scss/modules/nav.md.scss @@ -1,11 +1,26 @@ -.nav__nav-links li:nth-child(3) { - grid-column: 5 / 8; +.nav__nav-links li { + &:nth-child(1) { + grid-column: 1 / 3; + } + + &:nth-child(2) { + grid-column: 3 / 5; + } + + &:nth-child(3) { + grid-column: 5 / 8; + } + + &:nth-child(4) { + grid-column: 1 / 3; + } + + &:nth-child(5) { + grid-column: 3 / 5; + } } -.nav__nav-links li:nth-child(4) { - grid-column: 1 / 3; +.nav__switch-language-link { + margin-inline-end: calc(var(--grid-column-width) + var(--grid-gutter-width)); } -.nav__nav-links li:nth-child(5) { - grid-column: 3 / 5; -} \ No newline at end of file diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss index 765c44f..f2f32a9 100644 --- a/scss/modules/nav.scss +++ b/scss/modules/nav.scss @@ -28,9 +28,10 @@ font-family: var(--font-serif); font-size: var(--font-size-5); font-weight: 700; + line-height: 1.15; /* This gradient is based on * - * --color-primary-60 -> --color-secondary-60 * + * colours.$primary-60 -> colours.$secondary-60 * * using Josh W Comeau's gradient generator */ width: fit-content; background-image: linear-gradient( @@ -53,7 +54,7 @@ a { text-decoration: none; - border: var(--relative-eighth-rem) dotted transparent; + border: var(--border-width) dotted transparent; transition: border-color 100ms; &:is(:focus, :focus-visible, :focus-within) { @@ -66,14 +67,9 @@ } .nav__breadcrumbs { - display: flex; - flex-wrap: wrap; - li { - min-width: max-content; - &::before { - content: '/' - } + list-style: '▸'; + list-style-position: inside; } } diff --git a/scss/modules/nav.sm.scss b/scss/modules/nav.sm.scss new file mode 100644 index 0000000..db540bd --- /dev/null +++ b/scss/modules/nav.sm.scss @@ -0,0 +1,38 @@ +.nav__breadcrumbs { + display: flex; + flex-wrap: wrap; + list-style: none; + + li { + display: inline; + min-width: max-content; + + + li::before { + content: '/'; + margin-inline: var(--margin-inline-md); + } + } +} + +.nav__nav-links li { + &:nth-child(1) { + grid-column: 1 / 3; + } + + &:nth-child(2) { + grid-column: 3 / 6; + } + + &:nth-child(3) { + grid-column: 6 / 9; + } + + &:nth-child(4) { + grid-column: 1 / 3; + } + + &:nth-child(5) { + grid-column: 3 / 5; + } +} + diff --git a/scss/modules/news-index.scss b/scss/modules/news-index.scss index 5d9bab2..b235edd 100644 --- a/scss/modules/news-index.scss +++ b/scss/modules/news-index.scss @@ -1,10 +1,10 @@ .news-index__item { display: block; box-sizing: border-box; - border: var(--relative-eighth-rem) solid var(--text-color); + border: var(--border-width) solid var(--text-color); transition: background 100ms; - padding-block: var(--margin-block-md); - padding-inline: var(--padding-inline-sm); + padding-block: var(--spacing-block-md); + padding-inline: var(--spacing-inline-sm); width: var(--width-prose); } diff --git a/scss/utils.scss b/scss/utils.scss index f8336eb..7cd2a58 100644 --- a/scss/utils.scss +++ b/scss/utils.scss @@ -2,10 +2,6 @@ font-style: italic; } -.font-weight-lighter { - font-weight: lighter; -} - li.list-style-none, .list-style-none li { list-style-type: none; } diff --git a/scss/values/_colours.scss b/scss/values/_colours.scss new file mode 100644 index 0000000..40db6e8 --- /dev/null +++ b/scss/values/_colours.scss @@ -0,0 +1,34 @@ +$primary-0: #000000; +$primary-10: #190064; +$primary-20: #2d009d; +$primary-25: #381aa8; +$primary-30: #442bb3; +$primary-35: #503abf; +$primary-40: #5c48cc; +$primary-50: #7663e7; +$primary-60: #907eff; +$primary-70: #ac9fff; +$primary-80: #c8bfff; +$primary-90: #e5deff; +$primary-95: #f4eeff; +$primary-98: #fdf8ff; +$primary-99: #fffbff; +$primary-100: #ffffff; + +$secondary-0: #000000; +$secondary-10: #00201e; +$secondary-20: #003733; +$secondary-25: #00433f; +$secondary-30: #00504b; +$secondary-35: #005d57; +$secondary-40: #006a64; +$secondary-50: #00867e; +$secondary-60: #00a299; +$secondary-70: #26bfb4; +$secondary-80: #50dbcf; +$secondary-90: #71f7ec; +$secondary-95: #b2fff6; +$secondary-98: #e4fffb; +$secondary-99: #f2fffc; +$secondary-100: #ffffff; + diff --git a/scss/values/spacing/_constants.scss b/scss/values/spacing/_constants.scss new file mode 100644 index 0000000..9a990b8 --- /dev/null +++ b/scss/values/spacing/_constants.scss @@ -0,0 +1,58 @@ +$grid-column-width-er: 32; +$grid-gutter-width-er: 4; + +$grid-padding-er: ( + 'xxl': 32, + 'xl': 26, + 'lg': 20, + 'md': 16, + 'sm': 12, + 'xs': 4, + 'initial': 1 +); + +$grid-column-count: ( + 'xxl': 12, + 'xl': 12, + 'lg': 12, + 'md': 8, + 'sm': 8, + 'xs': 4, + 'initial': 1 +); + +$grid-prose-column-count: ( + 'xxl': 8, + 'xl': 8, + 'lg': 8, + 'md': 8, + 'sm': 8, + 'xs': 4, + 'initial': 1 +); + +$grid-padding-er: ( + 'xxl': 32, + 'xl': 26, + 'lg': 20, + 'md': 16, + 'sm': 12, + 'xs': 4, + 'initial': 1 +); + +$spacing-factor: ( + 'inline': (lg: 4, md: 2, sm: 1), + 'block': (lg: 16, md: 10, sm: 5) +); + +$grid-min-total-width-absolute: ( + 'xxl': 100rem, + 'xl': 80rem, + 'lg': 64rem, + 'md': 48rem, + 'sm': 30rem, + 'xs': 100vw, + 'initial': 100vw +); + diff --git a/scss/values/spacing/_grid.scss b/scss/values/spacing/_grid.scss new file mode 100644 index 0000000..50d11c9 --- /dev/null +++ b/scss/values/spacing/_grid.scss @@ -0,0 +1,63 @@ +@use 'sass:list'; +@use 'sass:map'; + +@use 'constants'; + +@function padding($breakpoint: initial) { + @return er-to-absolute(map.get(constants.$grid-padding-er, $breakpoint), $breakpoint); +} + +@function column-width($breakpoint: initial) { + @return er-to-absolute(constants.$grid-column-width-er, $breakpoint); +} + +@function gutter-width($breakpoint: initial) { + @return er-to-absolute(constants.$grid-gutter-width-er, $breakpoint); +} + +@function column-count($breakpoint: initial) { + @return map.get(constants.$grid-column-count, $breakpoint); +} + +@function total-width-er($breakpoint) { + $padding-width: calc(2 * map.get(constants.$grid-padding-er, $breakpoint)); + $column-count: map.get(constants.$grid-column-count, $breakpoint); + $columns-width: calc($column-count * constants.$grid-column-width-er); + $gutters-width: calc(($column-count - 1) * constants.$grid-gutter-width-er); + @return $padding-width + $columns-width + $gutters-width; +} + +@function total-width-absolute($breakpoint: initial) { + /** + * In theory, the grid total width should be clamped between the min at this + * breakpoint and the min at the next breakpoint minus grid padding. In + * practice, the only time this makes a difference is at xs, so at every + * other breakpoint, we'll just return the min at the current breakpoint. + */ + + @if $breakpoint == xs { + $min-width-xs: map.get(constants.$grid-min-total-width-absolute, xs); + $min-width-sm: map.get(constants.$grid-min-total-width-absolute, sm); + $padding-sm: calc(2 * padding(sm)); + @return min($min-width-xs, calc($min-width-sm - $padding-sm)); + } + + @return map.get(constants.$grid-min-total-width-absolute, $breakpoint); +} + +/** + * Converts er units to absolute units. + * + * This doesn't really belong here, but I think it has to, because it depends + * on grid-total-width-absolute which depends on grid-padding which depends on + * this. It's fine here, it's just a recursion. But if it lived in a separate + * module you'd end up with a circular dependency. + */ +@function er-to-absolute($length-er, $breakpoint: initial) { + $absolute-per-er: calc( + total-width-absolute($breakpoint) + / total-width-er($breakpoint) + ); + @return calc($length-er * $absolute-per-er); +} + diff --git a/scss/values/spacing/_index.scss b/scss/values/spacing/_index.scss new file mode 100644 index 0000000..8f8a454 --- /dev/null +++ b/scss/values/spacing/_index.scss @@ -0,0 +1,24 @@ +/** + * 'er' (from 'eighth-rem') is a conceptual unit of length. It is determined + * by the total width of the grid, the relative eighth rem length of the grid + * padding, and the number of columns in the grid. This means you can just + * specify those values for each breakpoint, and the rest of the nitty-gritty + * griddy details happens by SCSS magic. + */ + +/** + * Breakpoints can be: + * - initial + * - xs + * - sm + * - md + * - lg + * - xl + * - xxl + */ + +@forward 'constants' show $grid-column-count, $grid-prose-column-count; +@forward 'grid' as grid-* hide er-to-absolute; +@forward 'grid' show er-to-absolute; +@forward 'spacing'; + diff --git a/scss/values/spacing/_spacing.scss b/scss/values/spacing/_spacing.scss new file mode 100644 index 0000000..4fd94e8 --- /dev/null +++ b/scss/values/spacing/_spacing.scss @@ -0,0 +1,32 @@ +@use 'sass:list'; +@use 'sass:map'; + +@use 'constants'; +@use 'grid'; + +/** + * - size: sm, md, lg + * - direction: inline, block + */ +@function spacing($direction, $size, $breakpoint: initial) { + $factor: map.get( + map.get(constants.$spacing-factor, $direction), + $size + ); + + @if list.index([xxl xl lg md sm], ($breakpoint)) { + @return grid.er-to-absolute($factor, $breakpoint); + } + @else if $breakpoint == xs { + @return clamp( + spacing($direction, $size, initial), + grid.er-to-absolute($factor, xs), + spacing($direction, $size, sm) + ); + } + @else if $breakpoint == initial { + @return calc($factor * 0.0625rem); + } + @error "Invalid breakpoint: #{$breakpoint}"; +} + diff --git a/scss/values/typography/_constants.scss b/scss/values/typography/_constants.scss new file mode 100644 index 0000000..4ea0117 --- /dev/null +++ b/scss/values/typography/_constants.scss @@ -0,0 +1,20 @@ +$base-font-size: ( + 'xxl': 1.5rem, + 'xl': 1.2rem, + 'lg': 1.1rem, + 'md': 1rem, + 'sm': 0.9rem, + 'xs': 0.8rem, + 'initial': 0.7rem, +); + +$font-size-factor: ( + '0': 1, + '1': 1.25, + '2': 1.5, + '3': 2, + '4': 2.5, + '5': 3, + '6': 3.5 +); + diff --git a/scss/values/typography/_index.scss b/scss/values/typography/_index.scss new file mode 100644 index 0000000..3aa4384 --- /dev/null +++ b/scss/values/typography/_index.scss @@ -0,0 +1,18 @@ +@use 'sass:map'; + +@use 'constants'; + +@function font-size($font-size-grade, $breakpoint: initial) { + @return calc( + map.get(constants.$base-font-size, $breakpoint) + * map.get(constants.$font-size-factor, $font-size-grade) + ); +} + +@function border-width($breakpoint: initial) { + @return calc( + map.get(constants.$base-font-size, $breakpoint) + / 8 + ); +} + diff --git a/scss/variables/colours.scss b/scss/variables/colours.scss deleted file mode 100644 index 65dd421..0000000 --- a/scss/variables/colours.scss +++ /dev/null @@ -1,21 +0,0 @@ -:root { - --text-color: var(--color-primary-98); - --text-highlight-color: var(--color-primary-10); - --background-color: var(--color-primary-10); - --background-highlight-color: var(--color-primary-90); - --special-text-color: var(--color-secondary-90); - --special-text-highlight-color: var(--color-secondary-10); -} - -:is(main, article) { - --text-color: var(--color-primary-10); - --text-highlight-color: var(--color-primary-90); - --background-color: var(--color-primary-98); - --background-highlight-color: var(--color-primary-10); - --special-text-color: var(--color-secondary-40); - --special-text-highlight-color: var(--color-secondary-90); -} - -:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)) { - --background-color: var(--color-primary-95); -} diff --git a/scss/variables/index.lg.scss b/scss/variables/index.lg.scss deleted file mode 100644 index 598c04f..0000000 --- a/scss/variables/index.lg.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'spacing.lg' as *; - diff --git a/scss/variables/index.md.scss b/scss/variables/index.md.scss deleted file mode 100644 index b2bf6ac..0000000 --- a/scss/variables/index.md.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing.md' as *; -@use 'typography.md' as *; - diff --git a/scss/variables/index.scss b/scss/variables/index.scss deleted file mode 100644 index 57403d6..0000000 --- a/scss/variables/index.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use 'colours' as *; -@use 'palette' as *; -@use 'spacing' as *; -@use 'typography' as *; - diff --git a/scss/variables/index.sm.scss b/scss/variables/index.sm.scss deleted file mode 100644 index 1ed077f..0000000 --- a/scss/variables/index.sm.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'spacing.sm' as *; - diff --git a/scss/variables/index.xl.scss b/scss/variables/index.xl.scss deleted file mode 100644 index 6e082d1..0000000 --- a/scss/variables/index.xl.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'spacing.xl' as *; - diff --git a/scss/variables/index.xs.scss b/scss/variables/index.xs.scss deleted file mode 100644 index fd7abc2..0000000 --- a/scss/variables/index.xs.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing.xs' as *; -@use 'typography.xs' as *; - diff --git a/scss/variables/index.xxl.scss b/scss/variables/index.xxl.scss deleted file mode 100644 index 8d40b0c..0000000 --- a/scss/variables/index.xxl.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'spacing.xxl' as *; - diff --git a/scss/variables/palette.scss b/scss/variables/palette.scss deleted file mode 100644 index f40bb89..0000000 --- a/scss/variables/palette.scss +++ /dev/null @@ -1,35 +0,0 @@ -:root { - --color-primary-0: #000000; - --color-primary-10: #190064; - --color-primary-20: #2d009d; - --color-primary-25: #381aa8; - --color-primary-30: #442bb3; - --color-primary-35: #503abf; - --color-primary-40: #5c48cc; - --color-primary-50: #7663e7; - --color-primary-60: #907eff; - --color-primary-70: #ac9fff; - --color-primary-80: #c8bfff; - --color-primary-90: #e5deff; - --color-primary-95: #f4eeff; - --color-primary-98: #fdf8ff; - --color-primary-99: #fffbff; - --color-primary-100: #ffffff; - - --color-secondary-0: #000000; - --color-secondary-10: #00201e; - --color-secondary-20: #003733; - --color-secondary-25: #00433f; - --color-secondary-30: #00504b; - --color-secondary-35: #005d57; - --color-secondary-40: #006a64; - --color-secondary-50: #00867e; - --color-secondary-60: #00a299; - --color-secondary-70: #26bfb4; - --color-secondary-80: #50dbcf; - --color-secondary-90: #71f7ec; - --color-secondary-95: #b2fff6; - --color-secondary-98: #e4fffb; - --color-secondary-99: #f2fffc; - --color-secondary-100: #ffffff; -} \ No newline at end of file diff --git a/scss/variables/spacing.lg.scss b/scss/variables/spacing.lg.scss deleted file mode 100644 index bc18bfd..0000000 --- a/scss/variables/spacing.lg.scss +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 64rem; - --grid-padding-relative-eighth-rem: 20; - --grid-column-count: 12; - --grid-prose-column-count: 8; -} \ No newline at end of file diff --git a/scss/variables/spacing.md.scss b/scss/variables/spacing.md.scss deleted file mode 100644 index 0028e8a..0000000 --- a/scss/variables/spacing.md.scss +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 48rem; - --grid-padding-relative-eighth-rem: 16; - --grid-column-count: 8; - --grid-prose-column-count: 8; -} \ No newline at end of file diff --git a/scss/variables/spacing.scss b/scss/variables/spacing.scss deleted file mode 100644 index a4d1d91..0000000 --- a/scss/variables/spacing.scss +++ /dev/null @@ -1,47 +0,0 @@ -:root { - --margin-inline-md: calc(2 * var(--relative-eighth-rem)); - --margin-block-lg: calc(16 * var(--relative-eighth-rem)); - --margin-block-md: calc(10 * var(--relative-eighth-rem)); - --margin-block-sm: calc(5 * var(--relative-eighth-rem)); - - --padding-inline-lg: calc(4 * var(--relative-eighth-rem)); - --padding-inline-md: calc(2 * var(--relative-eighth-rem)); - --padding-inline-sm: calc(1 * var(--relative-eighth-rem)); - --padding-block-lg: calc(12 * var(--relative-eighth-rem)); - --padding-block-md: calc(8 * var(--relative-eighth-rem)); - --padding-block-sm: calc(5 * var(--relative-eighth-rem)); - - --grid-padding: calc(var(--grid-padding-relative-eighth-rem) * var(--relative-eighth-rem)); - --grid-column-width: calc(var(--grid-column-width-relative-eighth-rem) * var(--relative-eighth-rem)); - --grid-gutter-width: calc(var(--grid-gutter-width-relative-eighth-rem) * var(--relative-eighth-rem)); - - --grid-total-relative-eighth-rem-width: calc( - var(--grid-padding-relative-eighth-rem) * 2 + - var(--grid-column-width-relative-eighth-rem) * var(--grid-column-count) + - var(--grid-gutter-width-relative-eighth-rem) * (var(--grid-column-count) - 1) - ); - --relative-eighth-rem: calc( - var(--grid-total-width) / var(--grid-total-relative-eighth-rem-width) - ); - --width-prose: calc( - var(--grid-column-width) * var(--grid-prose-column-count) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) - ); - - --grid-column-width-relative-eighth-rem: 32; - --grid-gutter-width-relative-eighth-rem: 4; - - /*********************************************************** - * Generally, we will use columns to keep things laid out * - * nicely. However, on screens narrower than xs, this gets * - * pretty much impossible. So for those screens, we use a * - * single-column layout taking up 100vw. In effect, this * - * is just default CSS layout plus a wee bit padding. From * - * xs widewards, we use multiple columns on a fixed width. * - ***********************************************************/ - - --grid-total-width: 100vw; - --grid-padding-relative-eighth-rem: 8; - --grid-column-count: 1; - --grid-prose-column-count: 1; -} diff --git a/scss/variables/spacing.sm.scss b/scss/variables/spacing.sm.scss deleted file mode 100644 index 7cdf26f..0000000 --- a/scss/variables/spacing.sm.scss +++ /dev/null @@ -1,4 +0,0 @@ -:root { - --grid-total-width: 30rem; - --grid-padding-relative-eighth-rem: 12; -} diff --git a/scss/variables/spacing.xl.scss b/scss/variables/spacing.xl.scss deleted file mode 100644 index fc8b1f3..0000000 --- a/scss/variables/spacing.xl.scss +++ /dev/null @@ -1,10 +0,0 @@ -:root { - --grid-total-width: 80rem; - --grid-padding-relative-eighth-rem: 26; - --grid-column-count: 12; - --grid-prose-column-count: 8; - --width-prose: calc( - var(--grid-column-width) * min(8, var(--grid-column-count)) + - var(--grid-gutter-width) * min(7, (var(--grid-column-count) - 1)) - ); -} \ No newline at end of file diff --git a/scss/variables/spacing.xs.scss b/scss/variables/spacing.xs.scss deleted file mode 100644 index fb7c01a..0000000 --- a/scss/variables/spacing.xs.scss +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 15rem; - --grid-padding-relative-eighth-rem: 8; - --grid-column-count: 4; - --grid-prose-column-count: 4; -} diff --git a/scss/variables/spacing.xxl.scss b/scss/variables/spacing.xxl.scss deleted file mode 100644 index 17d2f66..0000000 --- a/scss/variables/spacing.xxl.scss +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 100rem; - --grid-padding-relative-eighth-rem: 32; - --grid-column-count: 12; - --grid-prose-column-count: 8; -} \ No newline at end of file diff --git a/scss/variables/typography.md.scss b/scss/variables/typography.md.scss deleted file mode 100644 index 2c36d1d..0000000 --- a/scss/variables/typography.md.scss +++ /dev/null @@ -1,9 +0,0 @@ -:root { - --font-size-0: calc(7 * var(--relative-eighth-rem)); - --font-size-1: calc(9 * var(--relative-eighth-rem)); - --font-size-2: calc(12 * var(--relative-eighth-rem)); - --font-size-3: calc(16 * var(--relative-eighth-rem)); - --font-size-4: calc(20 * var(--relative-eighth-rem)); - --font-size-5: calc(26 * var(--relative-eighth-rem)); - --font-size-6: calc(32 * var(--relative-eighth-rem)); -} \ No newline at end of file diff --git a/scss/variables/typography.scss b/scss/variables/typography.scss deleted file mode 100644 index f8515fd..0000000 --- a/scss/variables/typography.scss +++ /dev/null @@ -1,42 +0,0 @@ -:root { - --font-size-0: calc(8 * var(--relative-eighth-rem)); - --font-size-1: calc(8 * var(--relative-eighth-rem)); - --font-size-2: calc(8 * var(--relative-eighth-rem)); - --font-size-3: calc(8 * var(--relative-eighth-rem)); - --font-size-4: calc(8 * var(--relative-eighth-rem)); - --font-size-5: calc(8 * var(--relative-eighth-rem)); - --font-size-6: calc(8 * var(--relative-eighth-rem)); - - --font-serif: - Alegreya, - -apple-system-ui-serif, - Iowan Old Style, - Apple Garamond, - Baskerville, - Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", - Times New Roman, - Droid Serif, - Times, - Source Serif Pro, - serif, - Apple Color Emoji, - Segoe UI Emoji, - Segoe UI Symbol; - - --font-sans-serif: - 'Alegreya Sans', - Lato, - -apple-system, - BlinkMacSystemFont, - avenir next, - avenir, - segoe ui, - helvetica neue, - helvetica, - Cantarell, - Ubuntu, - roboto, - noto, - arial, - sans-serif -} \ No newline at end of file diff --git a/scss/variables/typography.xs.scss b/scss/variables/typography.xs.scss deleted file mode 100644 index 6375aad..0000000 --- a/scss/variables/typography.xs.scss +++ /dev/null @@ -1,9 +0,0 @@ -:root { - --font-size-0: calc(6 * var(--relative-eighth-rem)); - --font-size-1: calc(8 * var(--relative-eighth-rem)); - --font-size-2: calc(11 * var(--relative-eighth-rem)); - --font-size-3: calc(14 * var(--relative-eighth-rem)); - --font-size-4: calc(18 * var(--relative-eighth-rem)); - --font-size-5: calc(23 * var(--relative-eighth-rem)); - --font-size-6: calc(28 * var(--relative-eighth-rem)); -} \ No newline at end of file diff --git a/src/components/CommitteeList/CommitteeListItem.astro b/src/components/CommitteeList/CommitteeListItem.astro index 9a5a55b..542d11f 100644 --- a/src/components/CommitteeList/CommitteeListItem.astro +++ b/src/components/CommitteeList/CommitteeListItem.astro @@ -43,8 +43,7 @@ const t = translate(locale); {committeeMember.name} { committeeMember.roles.length > 0 && ( - - |{' '} + {committeeMember.roles.map((role) => t(tRole, { key: CommitteeRole[role] })).join(', ')} ) diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index 3a81710..b577a46 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -6,8 +6,8 @@ const tPage = { 'en-GB': () => 'Home', }, submit: { - sco: () => 'Sangschaw apen for submeissions', - 'en-GB': () => 'Sangschaw open for submissions', + sco: () => 'Sang\u00adschaw apen for submeissions', + 'en-GB': () => 'Sang\u00adschaw open for submissions', }, 'submit-para-1': { sco: () => ` @@ -97,13 +97,9 @@ const tPage = { sco: () => 'Meet the Commattee', 'en-GB': () => 'Meet the Committee', }, - 'mair-commattee-details-soon': { - sco: () => 'Mair details comin shuin!', - 'en-GB': () => 'More details coming soon!', - }, furthsettins: { - sco: () => 'Furthsettins', - 'en-GB': () => 'Publications', + sco: () => 'Furth\u00adsettins', + 'en-GB': () => 'Public\u00adations', }, 'furthsettins-para': { sco: () => ` diff --git a/src/i18n/translations/site.ts b/src/i18n/translations/site.ts index 59a8cd4..51e4183 100644 --- a/src/i18n/translations/site.ts +++ b/src/i18n/translations/site.ts @@ -5,8 +5,9 @@ import type { TranslationsDictionary } from '$types/TranslationsDictionary'; const tSite = { title: { - sco: () => 'Scots Leid Associe', - 'en-GB': () => 'Scots Language Society', + // On very narrow screens, use \u00ad to suggest hyphenation points + sco: () => 'Scots Leid Assoc\u00adie', + 'en-GB': () => 'Scots Lang\u00aduage Soc\u00adiety', }, description: { sco: () => 'The wabsteid o the Scots Leid Associe', @@ -21,8 +22,9 @@ const tSite = { 'en-GB': () => 'Scotsoun', }, 'scots-leid-associe': { - sco: () => 'Scots Leid Associe', - 'en-GB': () => 'Scots Language Society', + // On very narrow screens, use \u00ad to suggest hyphenation points + sco: () => 'Scots Leid Assoc\u00adie', + 'en-GB': () => 'Scots Lang\u00aduage Soc\u00adiety', }, by: { sco: () => 'bi', diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro index b08f412..e8b9cf0 100644 --- a/src/pages/[locale]/index.astro +++ b/src/pages/[locale]/index.astro @@ -44,7 +44,6 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);

            -

            {t(tPage, { key: 'mair-commattee-details-soon' })}

            -- cgit v1.2.3 From 0cb6960f0c65c0d791ccdee2f5bc2e2b910cfb76 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:16:42 +0000 Subject: Uses SCSS partials (#64) --- scss/base/_dl.scss | 5 ++ scss/base/_index.scss | 4 ++ scss/base/_list.scss | 4 ++ scss/base/_theme.scss | 13 +++++ scss/base/_typography.scss | 72 +++++++++++++++++++++++ scss/base/dl.scss | 5 -- scss/base/index.scss | 4 -- scss/base/list.scss | 4 -- scss/base/theme.scss | 13 ----- scss/base/typography.scss | 72 ----------------------- scss/custom-properties/_colours.scss | 23 ++++++++ scss/custom-properties/_index.lg.scss | 3 + scss/custom-properties/_index.md.scss | 3 + scss/custom-properties/_index.scss | 3 + scss/custom-properties/_index.sm.scss | 3 + scss/custom-properties/_index.xl.scss | 3 + scss/custom-properties/_index.xs.scss | 3 + scss/custom-properties/_index.xxl.scss | 3 + scss/custom-properties/colours.scss | 23 -------- scss/custom-properties/index.lg.scss | 3 - scss/custom-properties/index.md.scss | 3 - scss/custom-properties/index.scss | 3 - scss/custom-properties/index.sm.scss | 3 - scss/custom-properties/index.xl.scss | 3 - scss/custom-properties/index.xs.scss | 3 - scss/custom-properties/index.xxl.scss | 3 - scss/custom-properties/spacing/_initial.scss | 14 +++++ scss/custom-properties/spacing/_lg.scss | 7 +++ scss/custom-properties/spacing/_md.scss | 7 +++ scss/custom-properties/spacing/_sm.scss | 7 +++ scss/custom-properties/spacing/_xl.scss | 7 +++ scss/custom-properties/spacing/_xs.scss | 7 +++ scss/custom-properties/spacing/_xxl.scss | 7 +++ scss/custom-properties/spacing/initial.scss | 14 ----- scss/custom-properties/spacing/lg.scss | 7 --- scss/custom-properties/spacing/md.scss | 7 --- scss/custom-properties/spacing/sm.scss | 7 --- scss/custom-properties/spacing/xl.scss | 7 --- scss/custom-properties/spacing/xs.scss | 7 --- scss/custom-properties/spacing/xxl.scss | 7 --- scss/custom-properties/typography/_initial.scss | 41 +++++++++++++ scss/custom-properties/typography/_lg.scss | 9 +++ scss/custom-properties/typography/_md.scss | 9 +++ scss/custom-properties/typography/_sm.scss | 9 +++ scss/custom-properties/typography/_xl.scss | 9 +++ scss/custom-properties/typography/_xs.scss | 9 +++ scss/custom-properties/typography/_xxl.scss | 9 +++ scss/custom-properties/typography/initial.scss | 41 ------------- scss/custom-properties/typography/lg.scss | 9 --- scss/custom-properties/typography/md.scss | 9 --- scss/custom-properties/typography/sm.scss | 9 --- scss/custom-properties/typography/xl.scss | 9 --- scss/custom-properties/typography/xs.scss | 9 --- scss/custom-properties/typography/xxl.scss | 9 --- scss/layout/_grid.md.scss | 8 +++ scss/layout/_grid.scss | 30 ++++++++++ scss/layout/_grid.xs.scss | 55 +++++++++++++++++ scss/layout/_index.md.scss | 2 + scss/layout/_index.scss | 3 + scss/layout/_index.xs.scss | 2 + scss/layout/_section-margins.scss | 13 +++++ scss/layout/grid.md.scss | 8 --- scss/layout/grid.scss | 30 ---------- scss/layout/grid.xs.scss | 55 ----------------- scss/layout/index.md.scss | 2 - scss/layout/index.scss | 3 - scss/layout/index.xs.scss | 2 - scss/layout/section-margins.scss | 13 ----- scss/modules/_btn.scss | 40 +++++++++++++ scss/modules/_committee.md.scss | 16 +++++ scss/modules/_committee.scss | 37 ++++++++++++ scss/modules/_committee.sm.scss | 5 ++ scss/modules/_committee.xl.scss | 15 +++++ scss/modules/_committee.xs.scss | 5 ++ scss/modules/_footer.scss | 28 +++++++++ scss/modules/_footer.xs.scss | 7 +++ scss/modules/_index.lg.scss | 2 + scss/modules/_index.md.scss | 4 ++ scss/modules/_index.scss | 11 ++++ scss/modules/_index.sm.scss | 3 + scss/modules/_index.xl.scss | 2 + scss/modules/_index.xs.scss | 5 ++ scss/modules/_link-gallery.scss | 42 +++++++++++++ scss/modules/_link-gallery.xs.scss | 21 +++++++ scss/modules/_link.scss | 27 +++++++++ scss/modules/_nav.lg.scss | 15 +++++ scss/modules/_nav.md.scss | 26 +++++++++ scss/modules/_nav.scss | 78 +++++++++++++++++++++++++ scss/modules/_nav.sm.scss | 38 ++++++++++++ scss/modules/_nav.xs.scss | 19 ++++++ scss/modules/_news-index.scss | 36 ++++++++++++ scss/modules/_product.scss | 31 ++++++++++ scss/modules/_schedule.md.scss | 16 +++++ scss/modules/_schedule.scss | 14 +++++ scss/modules/_skip-to-content.scss | 13 +++++ scss/modules/btn.scss | 40 ------------- scss/modules/committee.md.scss | 16 ----- scss/modules/committee.scss | 37 ------------ scss/modules/committee.sm.scss | 5 -- scss/modules/committee.xl.scss | 15 ----- scss/modules/committee.xs.scss | 5 -- scss/modules/footer.scss | 28 --------- scss/modules/footer.xs.scss | 7 --- scss/modules/index.lg.scss | 2 - scss/modules/index.md.scss | 4 -- scss/modules/index.scss | 11 ---- scss/modules/index.sm.scss | 3 - scss/modules/index.xl.scss | 2 - scss/modules/index.xs.scss | 5 -- scss/modules/link-gallery.scss | 42 ------------- scss/modules/link-gallery.xs.scss | 21 ------- scss/modules/link.scss | 27 --------- scss/modules/nav.lg.scss | 15 ----- scss/modules/nav.md.scss | 26 --------- scss/modules/nav.scss | 78 ------------------------- scss/modules/nav.sm.scss | 38 ------------ scss/modules/nav.xs.scss | 19 ------ scss/modules/news-index.scss | 36 ------------ scss/modules/product.scss | 31 ---------- scss/modules/schedule.md.scss | 16 ----- scss/modules/schedule.scss | 14 ----- scss/modules/skip-to-content.scss | 13 ----- 122 files changed, 962 insertions(+), 962 deletions(-) create mode 100644 scss/base/_dl.scss create mode 100644 scss/base/_index.scss create mode 100644 scss/base/_list.scss create mode 100644 scss/base/_theme.scss create mode 100644 scss/base/_typography.scss delete mode 100644 scss/base/dl.scss delete mode 100644 scss/base/index.scss delete mode 100644 scss/base/list.scss delete mode 100644 scss/base/theme.scss delete mode 100644 scss/base/typography.scss create mode 100644 scss/custom-properties/_colours.scss create mode 100644 scss/custom-properties/_index.lg.scss create mode 100644 scss/custom-properties/_index.md.scss create mode 100644 scss/custom-properties/_index.scss create mode 100644 scss/custom-properties/_index.sm.scss create mode 100644 scss/custom-properties/_index.xl.scss create mode 100644 scss/custom-properties/_index.xs.scss create mode 100644 scss/custom-properties/_index.xxl.scss delete mode 100644 scss/custom-properties/colours.scss delete mode 100644 scss/custom-properties/index.lg.scss delete mode 100644 scss/custom-properties/index.md.scss delete mode 100644 scss/custom-properties/index.scss delete mode 100644 scss/custom-properties/index.sm.scss delete mode 100644 scss/custom-properties/index.xl.scss delete mode 100644 scss/custom-properties/index.xs.scss delete mode 100644 scss/custom-properties/index.xxl.scss create mode 100644 scss/custom-properties/spacing/_initial.scss create mode 100644 scss/custom-properties/spacing/_lg.scss create mode 100644 scss/custom-properties/spacing/_md.scss create mode 100644 scss/custom-properties/spacing/_sm.scss create mode 100644 scss/custom-properties/spacing/_xl.scss create mode 100644 scss/custom-properties/spacing/_xs.scss create mode 100644 scss/custom-properties/spacing/_xxl.scss delete mode 100644 scss/custom-properties/spacing/initial.scss delete mode 100644 scss/custom-properties/spacing/lg.scss delete mode 100644 scss/custom-properties/spacing/md.scss delete mode 100644 scss/custom-properties/spacing/sm.scss delete mode 100644 scss/custom-properties/spacing/xl.scss delete mode 100644 scss/custom-properties/spacing/xs.scss delete mode 100644 scss/custom-properties/spacing/xxl.scss create mode 100644 scss/custom-properties/typography/_initial.scss create mode 100644 scss/custom-properties/typography/_lg.scss create mode 100644 scss/custom-properties/typography/_md.scss create mode 100644 scss/custom-properties/typography/_sm.scss create mode 100644 scss/custom-properties/typography/_xl.scss create mode 100644 scss/custom-properties/typography/_xs.scss create mode 100644 scss/custom-properties/typography/_xxl.scss delete mode 100644 scss/custom-properties/typography/initial.scss delete mode 100644 scss/custom-properties/typography/lg.scss delete mode 100644 scss/custom-properties/typography/md.scss delete mode 100644 scss/custom-properties/typography/sm.scss delete mode 100644 scss/custom-properties/typography/xl.scss delete mode 100644 scss/custom-properties/typography/xs.scss delete mode 100644 scss/custom-properties/typography/xxl.scss create mode 100644 scss/layout/_grid.md.scss create mode 100644 scss/layout/_grid.scss create mode 100644 scss/layout/_grid.xs.scss create mode 100644 scss/layout/_index.md.scss create mode 100644 scss/layout/_index.scss create mode 100644 scss/layout/_index.xs.scss create mode 100644 scss/layout/_section-margins.scss delete mode 100644 scss/layout/grid.md.scss delete mode 100644 scss/layout/grid.scss delete mode 100644 scss/layout/grid.xs.scss delete mode 100644 scss/layout/index.md.scss delete mode 100644 scss/layout/index.scss delete mode 100644 scss/layout/index.xs.scss delete mode 100644 scss/layout/section-margins.scss create mode 100644 scss/modules/_btn.scss create mode 100644 scss/modules/_committee.md.scss create mode 100644 scss/modules/_committee.scss create mode 100644 scss/modules/_committee.sm.scss create mode 100644 scss/modules/_committee.xl.scss create mode 100644 scss/modules/_committee.xs.scss create mode 100644 scss/modules/_footer.scss create mode 100644 scss/modules/_footer.xs.scss create mode 100644 scss/modules/_index.lg.scss create mode 100644 scss/modules/_index.md.scss create mode 100644 scss/modules/_index.scss create mode 100644 scss/modules/_index.sm.scss create mode 100644 scss/modules/_index.xl.scss create mode 100644 scss/modules/_index.xs.scss create mode 100644 scss/modules/_link-gallery.scss create mode 100644 scss/modules/_link-gallery.xs.scss create mode 100644 scss/modules/_link.scss create mode 100644 scss/modules/_nav.lg.scss create mode 100644 scss/modules/_nav.md.scss create mode 100644 scss/modules/_nav.scss create mode 100644 scss/modules/_nav.sm.scss create mode 100644 scss/modules/_nav.xs.scss create mode 100644 scss/modules/_news-index.scss create mode 100644 scss/modules/_product.scss create mode 100644 scss/modules/_schedule.md.scss create mode 100644 scss/modules/_schedule.scss create mode 100644 scss/modules/_skip-to-content.scss delete mode 100644 scss/modules/btn.scss delete mode 100644 scss/modules/committee.md.scss delete mode 100644 scss/modules/committee.scss delete mode 100644 scss/modules/committee.sm.scss delete mode 100644 scss/modules/committee.xl.scss delete mode 100644 scss/modules/committee.xs.scss delete mode 100644 scss/modules/footer.scss delete mode 100644 scss/modules/footer.xs.scss delete mode 100644 scss/modules/index.lg.scss delete mode 100644 scss/modules/index.md.scss delete mode 100644 scss/modules/index.scss delete mode 100644 scss/modules/index.sm.scss delete mode 100644 scss/modules/index.xl.scss delete mode 100644 scss/modules/index.xs.scss delete mode 100644 scss/modules/link-gallery.scss delete mode 100644 scss/modules/link-gallery.xs.scss delete mode 100644 scss/modules/link.scss delete mode 100644 scss/modules/nav.lg.scss delete mode 100644 scss/modules/nav.md.scss delete mode 100644 scss/modules/nav.scss delete mode 100644 scss/modules/nav.sm.scss delete mode 100644 scss/modules/nav.xs.scss delete mode 100644 scss/modules/news-index.scss delete mode 100644 scss/modules/product.scss delete mode 100644 scss/modules/schedule.md.scss delete mode 100644 scss/modules/schedule.scss delete mode 100644 scss/modules/skip-to-content.scss diff --git a/scss/base/_dl.scss b/scss/base/_dl.scss new file mode 100644 index 0000000..95cc836 --- /dev/null +++ b/scss/base/_dl.scss @@ -0,0 +1,5 @@ +dt { + font-weight: 700; + text-decoration: underline; + margin-top: 1rem; +} \ No newline at end of file diff --git a/scss/base/_index.scss b/scss/base/_index.scss new file mode 100644 index 0000000..f338772 --- /dev/null +++ b/scss/base/_index.scss @@ -0,0 +1,4 @@ +@use 'dl'; +@use 'list'; +@use 'theme'; +@use 'typography'; diff --git a/scss/base/_list.scss b/scss/base/_list.scss new file mode 100644 index 0000000..2fd402b --- /dev/null +++ b/scss/base/_list.scss @@ -0,0 +1,4 @@ +ol li { + list-style-type: decimal; + margin-inline-start: --spacing-inline-md; +} \ No newline at end of file diff --git a/scss/base/_theme.scss b/scss/base/_theme.scss new file mode 100644 index 0000000..f5d178c --- /dev/null +++ b/scss/base/_theme.scss @@ -0,0 +1,13 @@ +:root { + color: var(--text-color); + background-color: var(--background-color); +} + +:is(main, article) { + color: var(--text-color); + background-color: var(--background-color); +} + +:is(main, article) > section:not(:is(section, header) :is(section, header)) { + background-color: var(--background-color); +} \ No newline at end of file diff --git a/scss/base/_typography.scss b/scss/base/_typography.scss new file mode 100644 index 0000000..4dd0afb --- /dev/null +++ b/scss/base/_typography.scss @@ -0,0 +1,72 @@ +body { + font-family: var(--font-sans-serif); + font-size: var(--font-size-1); + font-weight: 400; + letter-spacing: 0.03rem; + line-height: 1.5; + word-wrap: break-word; + hyphens: auto; +} + +h1 { + font-size: var(--font-size-5); +} + +h1:not(:first-child) { + margin-block-start: var(--spacing-block-lg); +} + +h2 { + font-size: var(--font-size-4); +} + +h2:not(:first-child) { + margin-block-start: var(--spacing-block-lg); +} + +h3 { + font-size: var(--font-size-3); +} + +h3:not(:first-child) { + margin-block-start: var(--spacing-block-md); +} + +h4 { + font-size: var(--font-size-2); +} + +h4:not(:first-child) { + margin-block-start: var(--spacing-block-sm); +} + +h1, +h2, +h3, +h4 { + font-family: var(--font-serif); + font-weight: 700; + line-height: 1.15; + text-wrap: balance; +} + +.title { + font-family: var(--font-serif); + font-size: var(--font-size-6); + font-weight: 700; + margin-block-start: var(--spacing-block-sm); + text-wrap: balance; +} + +.title--small { + font-size: var(--font-size-2); + margin-block-start: 0; +} + +:is(p, ol, ul):not(:first-child) { + margin-block-start: var(--spacing-block-sm); +} + +:is(p, h1, h2, h3, h4) { + max-width: var(--width-prose); +} diff --git a/scss/base/dl.scss b/scss/base/dl.scss deleted file mode 100644 index 95cc836..0000000 --- a/scss/base/dl.scss +++ /dev/null @@ -1,5 +0,0 @@ -dt { - font-weight: 700; - text-decoration: underline; - margin-top: 1rem; -} \ No newline at end of file diff --git a/scss/base/index.scss b/scss/base/index.scss deleted file mode 100644 index f338772..0000000 --- a/scss/base/index.scss +++ /dev/null @@ -1,4 +0,0 @@ -@use 'dl'; -@use 'list'; -@use 'theme'; -@use 'typography'; diff --git a/scss/base/list.scss b/scss/base/list.scss deleted file mode 100644 index 2fd402b..0000000 --- a/scss/base/list.scss +++ /dev/null @@ -1,4 +0,0 @@ -ol li { - list-style-type: decimal; - margin-inline-start: --spacing-inline-md; -} \ No newline at end of file diff --git a/scss/base/theme.scss b/scss/base/theme.scss deleted file mode 100644 index f5d178c..0000000 --- a/scss/base/theme.scss +++ /dev/null @@ -1,13 +0,0 @@ -:root { - color: var(--text-color); - background-color: var(--background-color); -} - -:is(main, article) { - color: var(--text-color); - background-color: var(--background-color); -} - -:is(main, article) > section:not(:is(section, header) :is(section, header)) { - background-color: var(--background-color); -} \ No newline at end of file diff --git a/scss/base/typography.scss b/scss/base/typography.scss deleted file mode 100644 index 4dd0afb..0000000 --- a/scss/base/typography.scss +++ /dev/null @@ -1,72 +0,0 @@ -body { - font-family: var(--font-sans-serif); - font-size: var(--font-size-1); - font-weight: 400; - letter-spacing: 0.03rem; - line-height: 1.5; - word-wrap: break-word; - hyphens: auto; -} - -h1 { - font-size: var(--font-size-5); -} - -h1:not(:first-child) { - margin-block-start: var(--spacing-block-lg); -} - -h2 { - font-size: var(--font-size-4); -} - -h2:not(:first-child) { - margin-block-start: var(--spacing-block-lg); -} - -h3 { - font-size: var(--font-size-3); -} - -h3:not(:first-child) { - margin-block-start: var(--spacing-block-md); -} - -h4 { - font-size: var(--font-size-2); -} - -h4:not(:first-child) { - margin-block-start: var(--spacing-block-sm); -} - -h1, -h2, -h3, -h4 { - font-family: var(--font-serif); - font-weight: 700; - line-height: 1.15; - text-wrap: balance; -} - -.title { - font-family: var(--font-serif); - font-size: var(--font-size-6); - font-weight: 700; - margin-block-start: var(--spacing-block-sm); - text-wrap: balance; -} - -.title--small { - font-size: var(--font-size-2); - margin-block-start: 0; -} - -:is(p, ol, ul):not(:first-child) { - margin-block-start: var(--spacing-block-sm); -} - -:is(p, h1, h2, h3, h4) { - max-width: var(--width-prose); -} diff --git a/scss/custom-properties/_colours.scss b/scss/custom-properties/_colours.scss new file mode 100644 index 0000000..dadb50e --- /dev/null +++ b/scss/custom-properties/_colours.scss @@ -0,0 +1,23 @@ +@use '../values/colours' as colours; + +:root { + --text-color: #{colours.$primary-98}; + --text-highlight-color: #{colours.$primary-10}; + --background-color: #{colours.$primary-10}; + --background-highlight-color: #{colours.$primary-90}; + --special-text-color: #{colours.$secondary-90}; + --special-text-highlight-color: #{colours.$secondary-10}; +} + +:is(main, article) { + --text-color: #{colours.$primary-10}; + --text-highlight-color: #{colours.$primary-90}; + --background-color: #{colours.$primary-98}; + --background-highlight-color: #{colours.$primary-10}; + --special-text-color: #{colours.$secondary-40}; + --special-text-highlight-color: #{colours.$secondary-90}; +} + +:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)) { + --background-color: #{colours.$primary-95}; +} diff --git a/scss/custom-properties/_index.lg.scss b/scss/custom-properties/_index.lg.scss new file mode 100644 index 0000000..2a36586 --- /dev/null +++ b/scss/custom-properties/_index.lg.scss @@ -0,0 +1,3 @@ +@use 'spacing/lg' as *; +@use 'typography/lg' as *; + diff --git a/scss/custom-properties/_index.md.scss b/scss/custom-properties/_index.md.scss new file mode 100644 index 0000000..2367952 --- /dev/null +++ b/scss/custom-properties/_index.md.scss @@ -0,0 +1,3 @@ +@use 'spacing/md' as *; +@use 'typography/md' as *; + diff --git a/scss/custom-properties/_index.scss b/scss/custom-properties/_index.scss new file mode 100644 index 0000000..e7279b6 --- /dev/null +++ b/scss/custom-properties/_index.scss @@ -0,0 +1,3 @@ +@use 'colours' as *; +@use 'spacing/initial' as *; +@use 'typography/initial' as *; diff --git a/scss/custom-properties/_index.sm.scss b/scss/custom-properties/_index.sm.scss new file mode 100644 index 0000000..c1ddffe --- /dev/null +++ b/scss/custom-properties/_index.sm.scss @@ -0,0 +1,3 @@ +@use 'spacing/sm' as *; +@use 'typography/sm' as *; + diff --git a/scss/custom-properties/_index.xl.scss b/scss/custom-properties/_index.xl.scss new file mode 100644 index 0000000..14c55cf --- /dev/null +++ b/scss/custom-properties/_index.xl.scss @@ -0,0 +1,3 @@ +@use 'spacing/xl' as *; +@use 'typography/xl' as *; + diff --git a/scss/custom-properties/_index.xs.scss b/scss/custom-properties/_index.xs.scss new file mode 100644 index 0000000..32eb377 --- /dev/null +++ b/scss/custom-properties/_index.xs.scss @@ -0,0 +1,3 @@ +@use 'spacing/xs' as *; +@use 'typography/xs' as *; + diff --git a/scss/custom-properties/_index.xxl.scss b/scss/custom-properties/_index.xxl.scss new file mode 100644 index 0000000..8555eee --- /dev/null +++ b/scss/custom-properties/_index.xxl.scss @@ -0,0 +1,3 @@ +@use 'spacing/xxl' as *; +@use 'typography/xxl' as *; + diff --git a/scss/custom-properties/colours.scss b/scss/custom-properties/colours.scss deleted file mode 100644 index dadb50e..0000000 --- a/scss/custom-properties/colours.scss +++ /dev/null @@ -1,23 +0,0 @@ -@use '../values/colours' as colours; - -:root { - --text-color: #{colours.$primary-98}; - --text-highlight-color: #{colours.$primary-10}; - --background-color: #{colours.$primary-10}; - --background-highlight-color: #{colours.$primary-90}; - --special-text-color: #{colours.$secondary-90}; - --special-text-highlight-color: #{colours.$secondary-10}; -} - -:is(main, article) { - --text-color: #{colours.$primary-10}; - --text-highlight-color: #{colours.$primary-90}; - --background-color: #{colours.$primary-98}; - --background-highlight-color: #{colours.$primary-10}; - --special-text-color: #{colours.$secondary-40}; - --special-text-highlight-color: #{colours.$secondary-90}; -} - -:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)) { - --background-color: #{colours.$primary-95}; -} diff --git a/scss/custom-properties/index.lg.scss b/scss/custom-properties/index.lg.scss deleted file mode 100644 index 2a36586..0000000 --- a/scss/custom-properties/index.lg.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing/lg' as *; -@use 'typography/lg' as *; - diff --git a/scss/custom-properties/index.md.scss b/scss/custom-properties/index.md.scss deleted file mode 100644 index 2367952..0000000 --- a/scss/custom-properties/index.md.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing/md' as *; -@use 'typography/md' as *; - diff --git a/scss/custom-properties/index.scss b/scss/custom-properties/index.scss deleted file mode 100644 index e7279b6..0000000 --- a/scss/custom-properties/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'colours' as *; -@use 'spacing/initial' as *; -@use 'typography/initial' as *; diff --git a/scss/custom-properties/index.sm.scss b/scss/custom-properties/index.sm.scss deleted file mode 100644 index c1ddffe..0000000 --- a/scss/custom-properties/index.sm.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing/sm' as *; -@use 'typography/sm' as *; - diff --git a/scss/custom-properties/index.xl.scss b/scss/custom-properties/index.xl.scss deleted file mode 100644 index 14c55cf..0000000 --- a/scss/custom-properties/index.xl.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing/xl' as *; -@use 'typography/xl' as *; - diff --git a/scss/custom-properties/index.xs.scss b/scss/custom-properties/index.xs.scss deleted file mode 100644 index 32eb377..0000000 --- a/scss/custom-properties/index.xs.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing/xs' as *; -@use 'typography/xs' as *; - diff --git a/scss/custom-properties/index.xxl.scss b/scss/custom-properties/index.xxl.scss deleted file mode 100644 index 8555eee..0000000 --- a/scss/custom-properties/index.xxl.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'spacing/xxl' as *; -@use 'typography/xxl' as *; - diff --git a/scss/custom-properties/spacing/_initial.scss b/scss/custom-properties/spacing/_initial.scss new file mode 100644 index 0000000..a38388f --- /dev/null +++ b/scss/custom-properties/spacing/_initial.scss @@ -0,0 +1,14 @@ +@use 'sass:map'; + +@use '../../values/spacing' as spacing-values; +@use 'mixins'; + +:root { + @include mixins.spacing(); + @include mixins.grid(); + + --width-prose: calc( + var(--grid-column-width) * var(--grid-prose-column-count) + + var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + ); +} diff --git a/scss/custom-properties/spacing/_lg.scss b/scss/custom-properties/spacing/_lg.scss new file mode 100644 index 0000000..1e9b090 --- /dev/null +++ b/scss/custom-properties/spacing/_lg.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: lg); +} diff --git a/scss/custom-properties/spacing/_md.scss b/scss/custom-properties/spacing/_md.scss new file mode 100644 index 0000000..99b9352 --- /dev/null +++ b/scss/custom-properties/spacing/_md.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: md); +} diff --git a/scss/custom-properties/spacing/_sm.scss b/scss/custom-properties/spacing/_sm.scss new file mode 100644 index 0000000..0fdfcfe --- /dev/null +++ b/scss/custom-properties/spacing/_sm.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + @include mixins.spacing($breakpoint: sm); + @include mixins.grid($breakpoint: sm); +} diff --git a/scss/custom-properties/spacing/_xl.scss b/scss/custom-properties/spacing/_xl.scss new file mode 100644 index 0000000..265c6e9 --- /dev/null +++ b/scss/custom-properties/spacing/_xl.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: xl); +} diff --git a/scss/custom-properties/spacing/_xs.scss b/scss/custom-properties/spacing/_xs.scss new file mode 100644 index 0000000..13a14d6 --- /dev/null +++ b/scss/custom-properties/spacing/_xs.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + @include mixins.spacing($breakpoint: xs); + @include mixins.grid($breakpoint: xs); +} diff --git a/scss/custom-properties/spacing/_xxl.scss b/scss/custom-properties/spacing/_xxl.scss new file mode 100644 index 0000000..600f74e --- /dev/null +++ b/scss/custom-properties/spacing/_xxl.scss @@ -0,0 +1,7 @@ +@use 'mixins'; +@use '../../values/spacing' as spacing-values; + +:root { + // No need for spacing here, since it's the same as sm. + @include mixins.grid($breakpoint: xxl); +} diff --git a/scss/custom-properties/spacing/initial.scss b/scss/custom-properties/spacing/initial.scss deleted file mode 100644 index a38388f..0000000 --- a/scss/custom-properties/spacing/initial.scss +++ /dev/null @@ -1,14 +0,0 @@ -@use 'sass:map'; - -@use '../../values/spacing' as spacing-values; -@use 'mixins'; - -:root { - @include mixins.spacing(); - @include mixins.grid(); - - --width-prose: calc( - var(--grid-column-width) * var(--grid-prose-column-count) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) - ); -} diff --git a/scss/custom-properties/spacing/lg.scss b/scss/custom-properties/spacing/lg.scss deleted file mode 100644 index 1e9b090..0000000 --- a/scss/custom-properties/spacing/lg.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'mixins'; -@use '../../values/spacing' as spacing-values; - -:root { - // No need for spacing here, since it's the same as sm. - @include mixins.grid($breakpoint: lg); -} diff --git a/scss/custom-properties/spacing/md.scss b/scss/custom-properties/spacing/md.scss deleted file mode 100644 index 99b9352..0000000 --- a/scss/custom-properties/spacing/md.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'mixins'; -@use '../../values/spacing' as spacing-values; - -:root { - // No need for spacing here, since it's the same as sm. - @include mixins.grid($breakpoint: md); -} diff --git a/scss/custom-properties/spacing/sm.scss b/scss/custom-properties/spacing/sm.scss deleted file mode 100644 index 0fdfcfe..0000000 --- a/scss/custom-properties/spacing/sm.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'mixins'; -@use '../../values/spacing' as spacing-values; - -:root { - @include mixins.spacing($breakpoint: sm); - @include mixins.grid($breakpoint: sm); -} diff --git a/scss/custom-properties/spacing/xl.scss b/scss/custom-properties/spacing/xl.scss deleted file mode 100644 index 265c6e9..0000000 --- a/scss/custom-properties/spacing/xl.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'mixins'; -@use '../../values/spacing' as spacing-values; - -:root { - // No need for spacing here, since it's the same as sm. - @include mixins.grid($breakpoint: xl); -} diff --git a/scss/custom-properties/spacing/xs.scss b/scss/custom-properties/spacing/xs.scss deleted file mode 100644 index 13a14d6..0000000 --- a/scss/custom-properties/spacing/xs.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'mixins'; -@use '../../values/spacing' as spacing-values; - -:root { - @include mixins.spacing($breakpoint: xs); - @include mixins.grid($breakpoint: xs); -} diff --git a/scss/custom-properties/spacing/xxl.scss b/scss/custom-properties/spacing/xxl.scss deleted file mode 100644 index 600f74e..0000000 --- a/scss/custom-properties/spacing/xxl.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'mixins'; -@use '../../values/spacing' as spacing-values; - -:root { - // No need for spacing here, since it's the same as sm. - @include mixins.grid($breakpoint: xxl); -} diff --git a/scss/custom-properties/typography/_initial.scss b/scss/custom-properties/typography/_initial.scss new file mode 100644 index 0000000..c9d95da --- /dev/null +++ b/scss/custom-properties/typography/_initial.scss @@ -0,0 +1,41 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(); + --border-width: #{typography-values.border-width()}; + + --font-serif: + Alegreya, + -apple-system-ui-serif, + Iowan Old Style, + Apple Garamond, + Baskerville, + Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", + Times New Roman, + Droid Serif, + Times, + Source Serif Pro, + serif, + Apple Color Emoji, + Segoe UI Emoji, + Segoe UI Symbol; + + --font-sans-serif: + 'Alegreya Sans', + Lato, + -apple-system, + BlinkMacSystemFont, + avenir next, + avenir, + segoe ui, + helvetica neue, + helvetica, + Cantarell, + Ubuntu, + roboto, + noto, + arial, + sans-serif; +} diff --git a/scss/custom-properties/typography/_lg.scss b/scss/custom-properties/typography/_lg.scss new file mode 100644 index 0000000..30a3019 --- /dev/null +++ b/scss/custom-properties/typography/_lg.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(lg); + --border-width: #{typography-values.border-width(lg)}; +} + diff --git a/scss/custom-properties/typography/_md.scss b/scss/custom-properties/typography/_md.scss new file mode 100644 index 0000000..df49bdd --- /dev/null +++ b/scss/custom-properties/typography/_md.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(md); + --border-width: #{typography-values.border-width(md)}; +} + diff --git a/scss/custom-properties/typography/_sm.scss b/scss/custom-properties/typography/_sm.scss new file mode 100644 index 0000000..e1c3585 --- /dev/null +++ b/scss/custom-properties/typography/_sm.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(sm); + --border-width: #{typography-values.border-width(sm)}; +} + diff --git a/scss/custom-properties/typography/_xl.scss b/scss/custom-properties/typography/_xl.scss new file mode 100644 index 0000000..0ddba99 --- /dev/null +++ b/scss/custom-properties/typography/_xl.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(xl); + --border-width: #{typography-values.border-width(xl)}; +} + diff --git a/scss/custom-properties/typography/_xs.scss b/scss/custom-properties/typography/_xs.scss new file mode 100644 index 0000000..44d8bbb --- /dev/null +++ b/scss/custom-properties/typography/_xs.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(xs); + --border-width: #{typography-values.border-width(xs)}; +} + diff --git a/scss/custom-properties/typography/_xxl.scss b/scss/custom-properties/typography/_xxl.scss new file mode 100644 index 0000000..1a777dc --- /dev/null +++ b/scss/custom-properties/typography/_xxl.scss @@ -0,0 +1,9 @@ +@use 'mixins'; + +@use '../../values/typography' as typography-values; + +:root { + @include mixins.font-sizes(xxl); + --border-width: #{typography-values.border-width(xxl)}; +} + diff --git a/scss/custom-properties/typography/initial.scss b/scss/custom-properties/typography/initial.scss deleted file mode 100644 index c9d95da..0000000 --- a/scss/custom-properties/typography/initial.scss +++ /dev/null @@ -1,41 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(); - --border-width: #{typography-values.border-width()}; - - --font-serif: - Alegreya, - -apple-system-ui-serif, - Iowan Old Style, - Apple Garamond, - Baskerville, - Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", - Times New Roman, - Droid Serif, - Times, - Source Serif Pro, - serif, - Apple Color Emoji, - Segoe UI Emoji, - Segoe UI Symbol; - - --font-sans-serif: - 'Alegreya Sans', - Lato, - -apple-system, - BlinkMacSystemFont, - avenir next, - avenir, - segoe ui, - helvetica neue, - helvetica, - Cantarell, - Ubuntu, - roboto, - noto, - arial, - sans-serif; -} diff --git a/scss/custom-properties/typography/lg.scss b/scss/custom-properties/typography/lg.scss deleted file mode 100644 index 30a3019..0000000 --- a/scss/custom-properties/typography/lg.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(lg); - --border-width: #{typography-values.border-width(lg)}; -} - diff --git a/scss/custom-properties/typography/md.scss b/scss/custom-properties/typography/md.scss deleted file mode 100644 index df49bdd..0000000 --- a/scss/custom-properties/typography/md.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(md); - --border-width: #{typography-values.border-width(md)}; -} - diff --git a/scss/custom-properties/typography/sm.scss b/scss/custom-properties/typography/sm.scss deleted file mode 100644 index e1c3585..0000000 --- a/scss/custom-properties/typography/sm.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(sm); - --border-width: #{typography-values.border-width(sm)}; -} - diff --git a/scss/custom-properties/typography/xl.scss b/scss/custom-properties/typography/xl.scss deleted file mode 100644 index 0ddba99..0000000 --- a/scss/custom-properties/typography/xl.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(xl); - --border-width: #{typography-values.border-width(xl)}; -} - diff --git a/scss/custom-properties/typography/xs.scss b/scss/custom-properties/typography/xs.scss deleted file mode 100644 index 44d8bbb..0000000 --- a/scss/custom-properties/typography/xs.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(xs); - --border-width: #{typography-values.border-width(xs)}; -} - diff --git a/scss/custom-properties/typography/xxl.scss b/scss/custom-properties/typography/xxl.scss deleted file mode 100644 index 1a777dc..0000000 --- a/scss/custom-properties/typography/xxl.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use 'mixins'; - -@use '../../values/typography' as typography-values; - -:root { - @include mixins.font-sizes(xxl); - --border-width: #{typography-values.border-width(xxl)}; -} - diff --git a/scss/layout/_grid.md.scss b/scss/layout/_grid.md.scss new file mode 100644 index 0000000..f0c8478 --- /dev/null +++ b/scss/layout/_grid.md.scss @@ -0,0 +1,8 @@ +:is( + header, + footer, + nav, + :is(main, article) > section:not(:is(section, header) :is(section, header)) +) { + padding-inline: var(--grid-padding); +} \ No newline at end of file diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss new file mode 100644 index 0000000..25cdd95 --- /dev/null +++ b/scss/layout/_grid.scss @@ -0,0 +1,30 @@ +:is( + header, + footer, + nav, + :is(main, article) > section:not(:is(section, header) :is(section, header)) +):not(.section--full-width) { + padding-inline: calc(var(--grid-padding) + 0.5 * (100vw - var(--grid-total-width))); +} + +.grid-span-1 { + width: var(--grid-column-width); +} + +/* On screens narrower than 16rem, there is only one column. */ + +.grid-span-2 { + width: var(--grid-column-width); +} + +.grid-span-3 { + width: var(--grid-column-width); +} + +.width-prose { + width: var(--prose-width); +} + +.grid-span-full { + width: var(--grid-total-width); +} diff --git a/scss/layout/_grid.xs.scss b/scss/layout/_grid.xs.scss new file mode 100644 index 0000000..e7c6d1a --- /dev/null +++ b/scss/layout/_grid.xs.scss @@ -0,0 +1,55 @@ +.grid-span-2 { + width: calc(var(--grid-column-width) * 2 + var(--grid-gutter-width)); +} + +.grid-span-3 { + width: calc(var(--grid-column-width) * 3 + var(--grid-gutter-width) * 2); +} + +.grid-span-1.grid-end { + margin-inline-start: calc( + var(--grid-column-width) * (var(--grid-column-count) - 1) + + var(--grid-gutter-width) * (var(--grid-column-count) - 1) + ); + margin-inline-end: 0; +} + +.grid-span-2.grid-end { + margin-inline-start: calc( + var(--grid-column-width) * (var(--grid-column-count) - 2) + + var(--grid-gutter-width) * (var(--grid-column-count) - 2) + ); + margin-inline-end: 0; +} + +.grid-span-3.grid-end { + margin-inline-start: calc( + var(--grid-column-width) * (var(--grid-column-count) - 3) + + var(--grid-gutter-width) * (var(--grid-column-count) - 3) + ); + margin-inline-end: 0; +} + +.grid-span-1.grid-prose-end { + margin-inline-start: calc( + var(--grid-column-width) * (var(--grid-prose-column-count) - 1) + + var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + ); + margin-inline-end: 0; +} + +.grid-span-2.grid-prose-end { + margin-inline-start: calc( + var(--grid-column-width) * (var(--grid-prose-column-count) - 2) + + var(--grid-gutter-width) * (var(--grid-prose-column-count) - 2) + ); + margin-inline-end: 0; +} + +.grid-span-3.grid-prose-end { + margin-inline-start: calc( + var(--grid-column-width) * (var(--grid-prose-column-count) - 3) + + var(--grid-gutter-width) * (var(--grid-prose-column-count) - 3) + ); + margin-inline-end: 0; +} \ No newline at end of file diff --git a/scss/layout/_index.md.scss b/scss/layout/_index.md.scss new file mode 100644 index 0000000..c3bd183 --- /dev/null +++ b/scss/layout/_index.md.scss @@ -0,0 +1,2 @@ +@use 'grid.md'; + diff --git a/scss/layout/_index.scss b/scss/layout/_index.scss new file mode 100644 index 0000000..776613a --- /dev/null +++ b/scss/layout/_index.scss @@ -0,0 +1,3 @@ +@use 'grid'; +@use 'section-margins'; + diff --git a/scss/layout/_index.xs.scss b/scss/layout/_index.xs.scss new file mode 100644 index 0000000..6e239b4 --- /dev/null +++ b/scss/layout/_index.xs.scss @@ -0,0 +1,2 @@ +@use 'grid.xs'; + diff --git a/scss/layout/_section-margins.scss b/scss/layout/_section-margins.scss new file mode 100644 index 0000000..8105dcb --- /dev/null +++ b/scss/layout/_section-margins.scss @@ -0,0 +1,13 @@ +:is(main, article) > :is(section, header):not(:is(section, header) :is(section, header)) { + padding-block: var(--spacing-block-md); +} + +footer { + padding-block-start: var(--spacing-block-md); + padding-block-end: var(--spacing-block-lg); +} + +nav { + padding-block-start: var(--spacing-block-sm); + padding-block-end: var(--spacing-block-md); +} diff --git a/scss/layout/grid.md.scss b/scss/layout/grid.md.scss deleted file mode 100644 index f0c8478..0000000 --- a/scss/layout/grid.md.scss +++ /dev/null @@ -1,8 +0,0 @@ -:is( - header, - footer, - nav, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -) { - padding-inline: var(--grid-padding); -} \ No newline at end of file diff --git a/scss/layout/grid.scss b/scss/layout/grid.scss deleted file mode 100644 index 25cdd95..0000000 --- a/scss/layout/grid.scss +++ /dev/null @@ -1,30 +0,0 @@ -:is( - header, - footer, - nav, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -):not(.section--full-width) { - padding-inline: calc(var(--grid-padding) + 0.5 * (100vw - var(--grid-total-width))); -} - -.grid-span-1 { - width: var(--grid-column-width); -} - -/* On screens narrower than 16rem, there is only one column. */ - -.grid-span-2 { - width: var(--grid-column-width); -} - -.grid-span-3 { - width: var(--grid-column-width); -} - -.width-prose { - width: var(--prose-width); -} - -.grid-span-full { - width: var(--grid-total-width); -} diff --git a/scss/layout/grid.xs.scss b/scss/layout/grid.xs.scss deleted file mode 100644 index e7c6d1a..0000000 --- a/scss/layout/grid.xs.scss +++ /dev/null @@ -1,55 +0,0 @@ -.grid-span-2 { - width: calc(var(--grid-column-width) * 2 + var(--grid-gutter-width)); -} - -.grid-span-3 { - width: calc(var(--grid-column-width) * 3 + var(--grid-gutter-width) * 2); -} - -.grid-span-1.grid-end { - margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 1) + - var(--grid-gutter-width) * (var(--grid-column-count) - 1) - ); - margin-inline-end: 0; -} - -.grid-span-2.grid-end { - margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 2) + - var(--grid-gutter-width) * (var(--grid-column-count) - 2) - ); - margin-inline-end: 0; -} - -.grid-span-3.grid-end { - margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 3) + - var(--grid-gutter-width) * (var(--grid-column-count) - 3) - ); - margin-inline-end: 0; -} - -.grid-span-1.grid-prose-end { - margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 1) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) - ); - margin-inline-end: 0; -} - -.grid-span-2.grid-prose-end { - margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 2) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 2) - ); - margin-inline-end: 0; -} - -.grid-span-3.grid-prose-end { - margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 3) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 3) - ); - margin-inline-end: 0; -} \ No newline at end of file diff --git a/scss/layout/index.md.scss b/scss/layout/index.md.scss deleted file mode 100644 index c3bd183..0000000 --- a/scss/layout/index.md.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'grid.md'; - diff --git a/scss/layout/index.scss b/scss/layout/index.scss deleted file mode 100644 index 776613a..0000000 --- a/scss/layout/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'grid'; -@use 'section-margins'; - diff --git a/scss/layout/index.xs.scss b/scss/layout/index.xs.scss deleted file mode 100644 index 6e239b4..0000000 --- a/scss/layout/index.xs.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'grid.xs'; - diff --git a/scss/layout/section-margins.scss b/scss/layout/section-margins.scss deleted file mode 100644 index 8105dcb..0000000 --- a/scss/layout/section-margins.scss +++ /dev/null @@ -1,13 +0,0 @@ -:is(main, article) > :is(section, header):not(:is(section, header) :is(section, header)) { - padding-block: var(--spacing-block-md); -} - -footer { - padding-block-start: var(--spacing-block-md); - padding-block-end: var(--spacing-block-lg); -} - -nav { - padding-block-start: var(--spacing-block-sm); - padding-block-end: var(--spacing-block-md); -} diff --git a/scss/modules/_btn.scss b/scss/modules/_btn.scss new file mode 100644 index 0000000..6b5e543 --- /dev/null +++ b/scss/modules/_btn.scss @@ -0,0 +1,40 @@ +.btn { + display: block; + border: solid var(--border-width) var(--text-color); + font-weight: 600; + text-align: center; + margin-block-start: var(--spacing-block-sm); + padding-inline: var(--spacing-inline-md); + padding-block: var(--spacing-block-sm); + background-color: transparent; + transition: + background-color 100ms, + transform 100ms; +} + +.btn:is(:hover, :focus, :focus-visible, :focus-within, :active) { + box-shadow: none; + outline: none; + color: var(--text-highlight-color); + border-color: var(--background-highlight-color); + background-color: var(--background-highlight-color); + transition: + background-color 300ms, + transform 300ms; +} + +.btn:is(:focus, :focus-visible, :focus-within) { + border-color: var(--special-text-highlight-color); + border-style: dotted; +} + +.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/_committee.md.scss b/scss/modules/_committee.md.scss new file mode 100644 index 0000000..83ca252 --- /dev/null +++ b/scss/modules/_committee.md.scss @@ -0,0 +1,16 @@ +.committee__member { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + grid-template-rows: 1fr; + column-gap: var(--grid-gutter-width); +} + +.committee__member__img { + grid-column: 1 / 3; + margin-block: auto; + margin-inline: 0; +} + +.committee__member__text { + grid-column: 3 / calc(3 + var(--grid-prose-column-count) - 2); +} \ No newline at end of file diff --git a/scss/modules/_committee.scss b/scss/modules/_committee.scss new file mode 100644 index 0000000..f6528a3 --- /dev/null +++ b/scss/modules/_committee.scss @@ -0,0 +1,37 @@ +.committee__member { + list-style-type: none; + margin-block-start: var(--spacing-block-sm); +} + +.committee__member + .committee__member { + border-top-width: var(--border-width); + border-top-style: solid; + border-image: linear-gradient( + to right, + transparent 0%, + transparent 19.1%, + var(--text-color) 19.1%, + var(--text-color) 80.9%, + transparent 80.9%, + transparent 100% + ) 1; + margin-block-start: var(--spacing-block-md); + padding-block-start: var(--spacing-block-md); +} + +.committee__member__img { + margin-inline: 25%; + width: 50%; + border-radius: 50%; +} + +.committee__member__text { + text-align: center; + margin-block-start: var(--spacing-block-sm); +} + +.committee__member__role { + display: block; + font-weight: lighter; +} + diff --git a/scss/modules/_committee.sm.scss b/scss/modules/_committee.sm.scss new file mode 100644 index 0000000..a2b2216 --- /dev/null +++ b/scss/modules/_committee.sm.scss @@ -0,0 +1,5 @@ +.committee__member__text { + text-align: start; + margin: 0; +} + diff --git a/scss/modules/_committee.xl.scss b/scss/modules/_committee.xl.scss new file mode 100644 index 0000000..94d8429 --- /dev/null +++ b/scss/modules/_committee.xl.scss @@ -0,0 +1,15 @@ +.committee__member { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + grid-template-rows: 1fr; + column-gap: var(--grid-gutter-width); +} + +.committee__member__img { + grid-column: 1 / 3; + margin-block: auto; +} + +.committee__member__text { + grid-column: 3 / min(11, calc(var(--grid-column-count) + 1)); +} \ No newline at end of file diff --git a/scss/modules/_committee.xs.scss b/scss/modules/_committee.xs.scss new file mode 100644 index 0000000..5681bc7 --- /dev/null +++ b/scss/modules/_committee.xs.scss @@ -0,0 +1,5 @@ +.committee__member__img { + margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); + width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); +} + diff --git a/scss/modules/_footer.scss b/scss/modules/_footer.scss new file mode 100644 index 0000000..9210044 --- /dev/null +++ b/scss/modules/_footer.scss @@ -0,0 +1,28 @@ +footer { + display: flex; + flex-direction: column; + gap: var(--spacing-block-sm); + align-items: center; +} + +.footer__rss-button__label { + /* Hides the label from non-screen-readers */ + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border-width: 0; +} + +.footer__rss-button__img { + display: block; +} + +.footer__back-to-top { + grid-column: calc(var(--grid-column-count) - 2) / calc(var(--grid-column-count) + 1); + margin: 0; +} diff --git a/scss/modules/_footer.xs.scss b/scss/modules/_footer.xs.scss new file mode 100644 index 0000000..67cab7f --- /dev/null +++ b/scss/modules/_footer.xs.scss @@ -0,0 +1,7 @@ +footer { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + gap: var(--grid-gutter-width); + align-items: end; +} + diff --git a/scss/modules/_index.lg.scss b/scss/modules/_index.lg.scss new file mode 100644 index 0000000..56a6dd8 --- /dev/null +++ b/scss/modules/_index.lg.scss @@ -0,0 +1,2 @@ +@use 'nav.lg' as *; + diff --git a/scss/modules/_index.md.scss b/scss/modules/_index.md.scss new file mode 100644 index 0000000..b426b71 --- /dev/null +++ b/scss/modules/_index.md.scss @@ -0,0 +1,4 @@ +@use 'committee.md' as *; +@use 'nav.md' as *; +@use 'schedule.md' as *; + diff --git a/scss/modules/_index.scss b/scss/modules/_index.scss new file mode 100644 index 0000000..6e67241 --- /dev/null +++ b/scss/modules/_index.scss @@ -0,0 +1,11 @@ +@use 'btn' as *; +@use 'committee' as *; +@use 'footer' as *; +@use 'link' as *; +@use 'link-gallery' as *; +@use 'nav' as *; +@use 'news-index' as *; +@use 'product' as *; +@use 'schedule' as *; +@use 'skip-to-content' as *; + diff --git a/scss/modules/_index.sm.scss b/scss/modules/_index.sm.scss new file mode 100644 index 0000000..a4fb988 --- /dev/null +++ b/scss/modules/_index.sm.scss @@ -0,0 +1,3 @@ +@use 'committee.sm' as *; +@use 'nav.sm' as *; + diff --git a/scss/modules/_index.xl.scss b/scss/modules/_index.xl.scss new file mode 100644 index 0000000..17e1d8c --- /dev/null +++ b/scss/modules/_index.xl.scss @@ -0,0 +1,2 @@ +@use 'committee.xl' as *; + diff --git a/scss/modules/_index.xs.scss b/scss/modules/_index.xs.scss new file mode 100644 index 0000000..ef77c6d --- /dev/null +++ b/scss/modules/_index.xs.scss @@ -0,0 +1,5 @@ +@use 'committee.xs' as *; +@use 'footer.xs' as *; +@use 'link-gallery.xs' as *; +@use 'nav.xs' as *; + diff --git a/scss/modules/_link-gallery.scss b/scss/modules/_link-gallery.scss new file mode 100644 index 0000000..d321419 --- /dev/null +++ b/scss/modules/_link-gallery.scss @@ -0,0 +1,42 @@ +.link-gallery { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + gap: var(--grid-gutter-width); + padding-block: var(--spacing-block-md); + --gallery-item-column-span: 1; + --gallery-row-image-height: 12rem; + --gallery-row-title-height: fit-content; + text-align: center; + + li { + list-style-type: none; + grid-column: span var(--gallery-item-column-span); + } + + img { + max-width: 100%; + max-height: 100%; + margin: auto; + object-fit: contain; + } +} + +.link-gallery__container { + display: grid; + grid-template-columns: 1fr; + grid-template-rows: var(--gallery-row-image-height) var(--gallery-row-title-height); + row-gap: var(--spacing-block-sm); +} + +.link-gallery--furthsettins img { + box-sizing: border-box; + border-radius: 50%; + border: solid var(--border-width) var(--text-color); +} + +.link-gallery__title { + width: 100%; + height: min-content; + text-align: center; + margin-inline: var(--spacing-inline-xs); +} diff --git a/scss/modules/_link-gallery.xs.scss b/scss/modules/_link-gallery.xs.scss new file mode 100644 index 0000000..b2bf86c --- /dev/null +++ b/scss/modules/_link-gallery.xs.scss @@ -0,0 +1,21 @@ +.link-gallery { + grid-auto-rows: calc( + var(--gallery-row-image-height) + + var(--margin-block-sm) + + var(--gallery-row-title-height) + ); + --gallery-item-column-span: 2; + --gallery-row-title-height: 11ex; + text-align: center; +} + +.link-gallery__title { + width: 100%; + height: 9.9ex; + height: 3lh; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; +} diff --git a/scss/modules/_link.scss b/scss/modules/_link.scss new file mode 100644 index 0000000..2f827c4 --- /dev/null +++ b/scss/modules/_link.scss @@ -0,0 +1,27 @@ +a, .link { + color: var(--special-text-color); + text-decoration-line: underline; + text-decoration-color: var(--special-text-color); + border: dotted transparent var(--border-width); + transition: + color 100ms, + text-decoration-color 100ms, + border-color 100ms; + + &:is(:hover, :focus, :focus-visible, :focus-within), + .group-hover:is(:hover, :focus, :focus-visible, :focus-within) & { + text-decoration-color: currentColor; + text-decoration-style: wavy; + transition: + color 300ms, + text-decoration-color 300ms, + border-color 300ms; + } + + &:is(:focus, :focus-visible, :focus-within) { + box-shadow: none; + outline: none; + border-color: var(--special-text-color); + } +} + diff --git a/scss/modules/_nav.lg.scss b/scss/modules/_nav.lg.scss new file mode 100644 index 0000000..c47a685 --- /dev/null +++ b/scss/modules/_nav.lg.scss @@ -0,0 +1,15 @@ +.nav__bottom-row { + flex-direction: row; + justify-content: space-between; + align-items: baseline; + padding-inline: max(10%, calc((100% - var(--max-width-all-content)) / 2)); + gap: var(--spacing-inline-xs); +} + +.nav__nav-links li:nth-child(4) { + grid-column: 8 / 10; +} + +.nav__nav-links li:nth-child(5) { + grid-column: 10 / 12; +} diff --git a/scss/modules/_nav.md.scss b/scss/modules/_nav.md.scss new file mode 100644 index 0000000..7f0f784 --- /dev/null +++ b/scss/modules/_nav.md.scss @@ -0,0 +1,26 @@ +.nav__nav-links li { + &:nth-child(1) { + grid-column: 1 / 3; + } + + &:nth-child(2) { + grid-column: 3 / 5; + } + + &:nth-child(3) { + grid-column: 5 / 8; + } + + &:nth-child(4) { + grid-column: 1 / 3; + } + + &:nth-child(5) { + grid-column: 3 / 5; + } +} + +.nav__switch-language-link { + margin-inline-end: calc(var(--grid-column-width) + var(--grid-gutter-width)); +} + diff --git a/scss/modules/_nav.scss b/scss/modules/_nav.scss new file mode 100644 index 0000000..f2f32a9 --- /dev/null +++ b/scss/modules/_nav.scss @@ -0,0 +1,78 @@ +.nav { + & > :not(:last-child) { + margin-block: 0 var(--margin-block-sm); + } + + li { + list-style-type: none; + } +} + +.nav__bottom-row { + display: flex; + flex-direction: column; +} + +.nav__nav-links { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + column-gap: var(--grid-gutter-width); + + li { + list-style-type: none; + margin: 0; + } +} + +.nav__logo { + font-family: var(--font-serif); + font-size: var(--font-size-5); + font-weight: 700; + line-height: 1.15; + + /* This gradient is based on * + * colours.$primary-60 -> colours.$secondary-60 * + * using Josh W Comeau's gradient generator */ + width: fit-content; + background-image: linear-gradient( + 45deg, + hsl(248deg 100% 75%) 0%, + hsl(227deg 100% 70%) 24%, + hsl(211deg 100% 58%) 40%, + hsl(205deg 100% 50%) 51%, + hsl(202deg 100% 49%) 60%, + hsl(200deg 100% 47%) 66%, + hsl(197deg 100% 44%) 70%, + hsl(194deg 100% 41%) 73%, + hsl(190deg 100% 38%) 76%, + hsl(186deg 100% 35%) 79%, + hsl(181deg 100% 33%) 84%, + hsl(177deg 100% 32%) 100% + ); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + + a { + text-decoration: none; + border: var(--border-width) dotted transparent; + transition: border-color 100ms; + + &:is(:focus, :focus-visible, :focus-within) { + box-shadow: none; + outline: none; + border-color: var(--special-text-color); + transition: border-color 300ms; + } + } +} + +.nav__breadcrumbs { + li { + list-style: '▸'; + list-style-position: inside; + } +} + +.nav__switch-language-link { + text-align: right; +} diff --git a/scss/modules/_nav.sm.scss b/scss/modules/_nav.sm.scss new file mode 100644 index 0000000..db540bd --- /dev/null +++ b/scss/modules/_nav.sm.scss @@ -0,0 +1,38 @@ +.nav__breadcrumbs { + display: flex; + flex-wrap: wrap; + list-style: none; + + li { + display: inline; + min-width: max-content; + + + li::before { + content: '/'; + margin-inline: var(--margin-inline-md); + } + } +} + +.nav__nav-links li { + &:nth-child(1) { + grid-column: 1 / 3; + } + + &:nth-child(2) { + grid-column: 3 / 6; + } + + &:nth-child(3) { + grid-column: 6 / 9; + } + + &:nth-child(4) { + grid-column: 1 / 3; + } + + &:nth-child(5) { + grid-column: 3 / 5; + } +} + diff --git a/scss/modules/_nav.xs.scss b/scss/modules/_nav.xs.scss new file mode 100644 index 0000000..708652c --- /dev/null +++ b/scss/modules/_nav.xs.scss @@ -0,0 +1,19 @@ +.nav__nav-links li:nth-child(1) { + grid-column: 1 / 3; +} + +.nav__nav-links li:nth-child(2) { + grid-column: 3 / 5; +} + +.nav__nav-links li:nth-child(3) { + grid-column: 1 / 4; +} + +.nav__nav-links li:nth-child(4) { + grid-column: 1 / 3; +} + +.nav__nav-links li:nth-child(5) { + grid-column: 3 / 5; +} diff --git a/scss/modules/_news-index.scss b/scss/modules/_news-index.scss new file mode 100644 index 0000000..b235edd --- /dev/null +++ b/scss/modules/_news-index.scss @@ -0,0 +1,36 @@ +.news-index__item { + display: block; + box-sizing: border-box; + border: var(--border-width) solid var(--text-color); + transition: background 100ms; + padding-block: var(--spacing-block-md); + padding-inline: var(--spacing-inline-sm); + 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; +} + +.news-index__item:is(:hover, :focus, :focus-visible, :focus-within) { + outline: none; + box-shadow: none; + color: var(--text-highlight-color); + border-color: var(--background-highlight-color); + background: var(--background-highlight-color); + transition-duration: 300ms; +} + +.news-index__item:is(:hover, :focus, :focus-visible, :focus-within) .link { + color: var(--special-text-highlight-color); +} + +.news-index__item:is(:focus, :focus-visible, :focus-within) { + border-color: var(--special-text-highlight-color); + border-style: dotted; +} diff --git a/scss/modules/_product.scss b/scss/modules/_product.scss new file mode 100644 index 0000000..bc05dfd --- /dev/null +++ b/scss/modules/_product.scss @@ -0,0 +1,31 @@ +.product__header-block { + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; + gap: var(--spacing-inline-sm); +} + +.product__action-block { + display: flex; + flex-direction: column; + margin-inline: auto; + width: fit-content; + gap: var(--margin-block-sm); +} + +.product__action-block img { + max-width: 12rem; + 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/modules/_schedule.md.scss b/scss/modules/_schedule.md.scss new file mode 100644 index 0000000..9ccfb0b --- /dev/null +++ b/scss/modules/_schedule.md.scss @@ -0,0 +1,16 @@ +.schedule { + display: grid; + grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); + column-gap: var(--grid-gutter-width); +} + +.schedule dt { + grid-column: 1 / 3; + margin: 0; + text-align: end; +} + +.schedule dd { + grid-column: 3 / calc(1 + var(--grid-prose-column-count)); + text-align: start; +} diff --git a/scss/modules/_schedule.scss b/scss/modules/_schedule.scss new file mode 100644 index 0000000..40a9fee --- /dev/null +++ b/scss/modules/_schedule.scss @@ -0,0 +1,14 @@ +.schedule:not(:first-child) { + margin-block-start: var(--margin-block-sm); +} + +.schedule dt { + font-weight: 700; + margin-block-start: var(--margin-block-sm); + text-align: center; + text-decoration: none; +} + +.schedule dd { + text-align: center; +} diff --git a/scss/modules/_skip-to-content.scss b/scss/modules/_skip-to-content.scss new file mode 100644 index 0000000..a752b29 --- /dev/null +++ b/scss/modules/_skip-to-content.scss @@ -0,0 +1,13 @@ +.skip-to-content { + position: absolute; + left: var(--grid-padding); + top: -10rem; + opacity: 0; + transition: top 300ms, opacity 300ms; +} + +.skip-to-content:is(:focus, :focus-visible, :focus-within) { + top: var(--margin-block-md); + opacity: 1; + transition: top 100ms; +} \ No newline at end of file diff --git a/scss/modules/btn.scss b/scss/modules/btn.scss deleted file mode 100644 index 6b5e543..0000000 --- a/scss/modules/btn.scss +++ /dev/null @@ -1,40 +0,0 @@ -.btn { - display: block; - border: solid var(--border-width) var(--text-color); - font-weight: 600; - text-align: center; - margin-block-start: var(--spacing-block-sm); - padding-inline: var(--spacing-inline-md); - padding-block: var(--spacing-block-sm); - background-color: transparent; - transition: - background-color 100ms, - transform 100ms; -} - -.btn:is(:hover, :focus, :focus-visible, :focus-within, :active) { - box-shadow: none; - outline: none; - color: var(--text-highlight-color); - border-color: var(--background-highlight-color); - background-color: var(--background-highlight-color); - transition: - background-color 300ms, - transform 300ms; -} - -.btn:is(:focus, :focus-visible, :focus-within) { - border-color: var(--special-text-highlight-color); - border-style: dotted; -} - -.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/committee.md.scss b/scss/modules/committee.md.scss deleted file mode 100644 index 83ca252..0000000 --- a/scss/modules/committee.md.scss +++ /dev/null @@ -1,16 +0,0 @@ -.committee__member { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - grid-template-rows: 1fr; - column-gap: var(--grid-gutter-width); -} - -.committee__member__img { - grid-column: 1 / 3; - margin-block: auto; - margin-inline: 0; -} - -.committee__member__text { - grid-column: 3 / calc(3 + var(--grid-prose-column-count) - 2); -} \ No newline at end of file diff --git a/scss/modules/committee.scss b/scss/modules/committee.scss deleted file mode 100644 index f6528a3..0000000 --- a/scss/modules/committee.scss +++ /dev/null @@ -1,37 +0,0 @@ -.committee__member { - list-style-type: none; - margin-block-start: var(--spacing-block-sm); -} - -.committee__member + .committee__member { - border-top-width: var(--border-width); - border-top-style: solid; - border-image: linear-gradient( - to right, - transparent 0%, - transparent 19.1%, - var(--text-color) 19.1%, - var(--text-color) 80.9%, - transparent 80.9%, - transparent 100% - ) 1; - margin-block-start: var(--spacing-block-md); - padding-block-start: var(--spacing-block-md); -} - -.committee__member__img { - margin-inline: 25%; - width: 50%; - border-radius: 50%; -} - -.committee__member__text { - text-align: center; - margin-block-start: var(--spacing-block-sm); -} - -.committee__member__role { - display: block; - font-weight: lighter; -} - diff --git a/scss/modules/committee.sm.scss b/scss/modules/committee.sm.scss deleted file mode 100644 index a2b2216..0000000 --- a/scss/modules/committee.sm.scss +++ /dev/null @@ -1,5 +0,0 @@ -.committee__member__text { - text-align: start; - margin: 0; -} - diff --git a/scss/modules/committee.xl.scss b/scss/modules/committee.xl.scss deleted file mode 100644 index 94d8429..0000000 --- a/scss/modules/committee.xl.scss +++ /dev/null @@ -1,15 +0,0 @@ -.committee__member { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - grid-template-rows: 1fr; - column-gap: var(--grid-gutter-width); -} - -.committee__member__img { - grid-column: 1 / 3; - margin-block: auto; -} - -.committee__member__text { - grid-column: 3 / min(11, calc(var(--grid-column-count) + 1)); -} \ No newline at end of file diff --git a/scss/modules/committee.xs.scss b/scss/modules/committee.xs.scss deleted file mode 100644 index 5681bc7..0000000 --- a/scss/modules/committee.xs.scss +++ /dev/null @@ -1,5 +0,0 @@ -.committee__member__img { - margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); - width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); -} - diff --git a/scss/modules/footer.scss b/scss/modules/footer.scss deleted file mode 100644 index 9210044..0000000 --- a/scss/modules/footer.scss +++ /dev/null @@ -1,28 +0,0 @@ -footer { - display: flex; - flex-direction: column; - gap: var(--spacing-block-sm); - align-items: center; -} - -.footer__rss-button__label { - /* Hides the label from non-screen-readers */ - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - white-space: nowrap; - border-width: 0; -} - -.footer__rss-button__img { - display: block; -} - -.footer__back-to-top { - grid-column: calc(var(--grid-column-count) - 2) / calc(var(--grid-column-count) + 1); - margin: 0; -} diff --git a/scss/modules/footer.xs.scss b/scss/modules/footer.xs.scss deleted file mode 100644 index 67cab7f..0000000 --- a/scss/modules/footer.xs.scss +++ /dev/null @@ -1,7 +0,0 @@ -footer { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - gap: var(--grid-gutter-width); - align-items: end; -} - diff --git a/scss/modules/index.lg.scss b/scss/modules/index.lg.scss deleted file mode 100644 index 56a6dd8..0000000 --- a/scss/modules/index.lg.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'nav.lg' as *; - diff --git a/scss/modules/index.md.scss b/scss/modules/index.md.scss deleted file mode 100644 index b426b71..0000000 --- a/scss/modules/index.md.scss +++ /dev/null @@ -1,4 +0,0 @@ -@use 'committee.md' as *; -@use 'nav.md' as *; -@use 'schedule.md' as *; - diff --git a/scss/modules/index.scss b/scss/modules/index.scss deleted file mode 100644 index 6e67241..0000000 --- a/scss/modules/index.scss +++ /dev/null @@ -1,11 +0,0 @@ -@use 'btn' as *; -@use 'committee' as *; -@use 'footer' as *; -@use 'link' as *; -@use 'link-gallery' as *; -@use 'nav' as *; -@use 'news-index' as *; -@use 'product' as *; -@use 'schedule' as *; -@use 'skip-to-content' as *; - diff --git a/scss/modules/index.sm.scss b/scss/modules/index.sm.scss deleted file mode 100644 index a4fb988..0000000 --- a/scss/modules/index.sm.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'committee.sm' as *; -@use 'nav.sm' as *; - diff --git a/scss/modules/index.xl.scss b/scss/modules/index.xl.scss deleted file mode 100644 index 17e1d8c..0000000 --- a/scss/modules/index.xl.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'committee.xl' as *; - diff --git a/scss/modules/index.xs.scss b/scss/modules/index.xs.scss deleted file mode 100644 index ef77c6d..0000000 --- a/scss/modules/index.xs.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use 'committee.xs' as *; -@use 'footer.xs' as *; -@use 'link-gallery.xs' as *; -@use 'nav.xs' as *; - diff --git a/scss/modules/link-gallery.scss b/scss/modules/link-gallery.scss deleted file mode 100644 index d321419..0000000 --- a/scss/modules/link-gallery.scss +++ /dev/null @@ -1,42 +0,0 @@ -.link-gallery { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - gap: var(--grid-gutter-width); - padding-block: var(--spacing-block-md); - --gallery-item-column-span: 1; - --gallery-row-image-height: 12rem; - --gallery-row-title-height: fit-content; - text-align: center; - - li { - list-style-type: none; - grid-column: span var(--gallery-item-column-span); - } - - img { - max-width: 100%; - max-height: 100%; - margin: auto; - object-fit: contain; - } -} - -.link-gallery__container { - display: grid; - grid-template-columns: 1fr; - grid-template-rows: var(--gallery-row-image-height) var(--gallery-row-title-height); - row-gap: var(--spacing-block-sm); -} - -.link-gallery--furthsettins img { - box-sizing: border-box; - border-radius: 50%; - border: solid var(--border-width) var(--text-color); -} - -.link-gallery__title { - width: 100%; - height: min-content; - text-align: center; - margin-inline: var(--spacing-inline-xs); -} diff --git a/scss/modules/link-gallery.xs.scss b/scss/modules/link-gallery.xs.scss deleted file mode 100644 index b2bf86c..0000000 --- a/scss/modules/link-gallery.xs.scss +++ /dev/null @@ -1,21 +0,0 @@ -.link-gallery { - grid-auto-rows: calc( - var(--gallery-row-image-height) + - var(--margin-block-sm) + - var(--gallery-row-title-height) - ); - --gallery-item-column-span: 2; - --gallery-row-title-height: 11ex; - text-align: center; -} - -.link-gallery__title { - width: 100%; - height: 9.9ex; - height: 3lh; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - overflow: hidden; -} diff --git a/scss/modules/link.scss b/scss/modules/link.scss deleted file mode 100644 index 2f827c4..0000000 --- a/scss/modules/link.scss +++ /dev/null @@ -1,27 +0,0 @@ -a, .link { - color: var(--special-text-color); - text-decoration-line: underline; - text-decoration-color: var(--special-text-color); - border: dotted transparent var(--border-width); - transition: - color 100ms, - text-decoration-color 100ms, - border-color 100ms; - - &:is(:hover, :focus, :focus-visible, :focus-within), - .group-hover:is(:hover, :focus, :focus-visible, :focus-within) & { - text-decoration-color: currentColor; - text-decoration-style: wavy; - transition: - color 300ms, - text-decoration-color 300ms, - border-color 300ms; - } - - &:is(:focus, :focus-visible, :focus-within) { - box-shadow: none; - outline: none; - border-color: var(--special-text-color); - } -} - diff --git a/scss/modules/nav.lg.scss b/scss/modules/nav.lg.scss deleted file mode 100644 index c47a685..0000000 --- a/scss/modules/nav.lg.scss +++ /dev/null @@ -1,15 +0,0 @@ -.nav__bottom-row { - flex-direction: row; - justify-content: space-between; - align-items: baseline; - padding-inline: max(10%, calc((100% - var(--max-width-all-content)) / 2)); - gap: var(--spacing-inline-xs); -} - -.nav__nav-links li:nth-child(4) { - grid-column: 8 / 10; -} - -.nav__nav-links li:nth-child(5) { - grid-column: 10 / 12; -} diff --git a/scss/modules/nav.md.scss b/scss/modules/nav.md.scss deleted file mode 100644 index 7f0f784..0000000 --- a/scss/modules/nav.md.scss +++ /dev/null @@ -1,26 +0,0 @@ -.nav__nav-links li { - &:nth-child(1) { - grid-column: 1 / 3; - } - - &:nth-child(2) { - grid-column: 3 / 5; - } - - &:nth-child(3) { - grid-column: 5 / 8; - } - - &:nth-child(4) { - grid-column: 1 / 3; - } - - &:nth-child(5) { - grid-column: 3 / 5; - } -} - -.nav__switch-language-link { - margin-inline-end: calc(var(--grid-column-width) + var(--grid-gutter-width)); -} - diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss deleted file mode 100644 index f2f32a9..0000000 --- a/scss/modules/nav.scss +++ /dev/null @@ -1,78 +0,0 @@ -.nav { - & > :not(:last-child) { - margin-block: 0 var(--margin-block-sm); - } - - li { - list-style-type: none; - } -} - -.nav__bottom-row { - display: flex; - flex-direction: column; -} - -.nav__nav-links { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - column-gap: var(--grid-gutter-width); - - li { - list-style-type: none; - margin: 0; - } -} - -.nav__logo { - font-family: var(--font-serif); - font-size: var(--font-size-5); - font-weight: 700; - line-height: 1.15; - - /* This gradient is based on * - * colours.$primary-60 -> colours.$secondary-60 * - * using Josh W Comeau's gradient generator */ - width: fit-content; - background-image: linear-gradient( - 45deg, - hsl(248deg 100% 75%) 0%, - hsl(227deg 100% 70%) 24%, - hsl(211deg 100% 58%) 40%, - hsl(205deg 100% 50%) 51%, - hsl(202deg 100% 49%) 60%, - hsl(200deg 100% 47%) 66%, - hsl(197deg 100% 44%) 70%, - hsl(194deg 100% 41%) 73%, - hsl(190deg 100% 38%) 76%, - hsl(186deg 100% 35%) 79%, - hsl(181deg 100% 33%) 84%, - hsl(177deg 100% 32%) 100% - ); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - - a { - text-decoration: none; - border: var(--border-width) dotted transparent; - transition: border-color 100ms; - - &:is(:focus, :focus-visible, :focus-within) { - box-shadow: none; - outline: none; - border-color: var(--special-text-color); - transition: border-color 300ms; - } - } -} - -.nav__breadcrumbs { - li { - list-style: '▸'; - list-style-position: inside; - } -} - -.nav__switch-language-link { - text-align: right; -} diff --git a/scss/modules/nav.sm.scss b/scss/modules/nav.sm.scss deleted file mode 100644 index db540bd..0000000 --- a/scss/modules/nav.sm.scss +++ /dev/null @@ -1,38 +0,0 @@ -.nav__breadcrumbs { - display: flex; - flex-wrap: wrap; - list-style: none; - - li { - display: inline; - min-width: max-content; - - + li::before { - content: '/'; - margin-inline: var(--margin-inline-md); - } - } -} - -.nav__nav-links li { - &:nth-child(1) { - grid-column: 1 / 3; - } - - &:nth-child(2) { - grid-column: 3 / 6; - } - - &:nth-child(3) { - grid-column: 6 / 9; - } - - &:nth-child(4) { - grid-column: 1 / 3; - } - - &:nth-child(5) { - grid-column: 3 / 5; - } -} - diff --git a/scss/modules/nav.xs.scss b/scss/modules/nav.xs.scss deleted file mode 100644 index 708652c..0000000 --- a/scss/modules/nav.xs.scss +++ /dev/null @@ -1,19 +0,0 @@ -.nav__nav-links li:nth-child(1) { - grid-column: 1 / 3; -} - -.nav__nav-links li:nth-child(2) { - grid-column: 3 / 5; -} - -.nav__nav-links li:nth-child(3) { - grid-column: 1 / 4; -} - -.nav__nav-links li:nth-child(4) { - grid-column: 1 / 3; -} - -.nav__nav-links li:nth-child(5) { - grid-column: 3 / 5; -} diff --git a/scss/modules/news-index.scss b/scss/modules/news-index.scss deleted file mode 100644 index b235edd..0000000 --- a/scss/modules/news-index.scss +++ /dev/null @@ -1,36 +0,0 @@ -.news-index__item { - display: block; - box-sizing: border-box; - border: var(--border-width) solid var(--text-color); - transition: background 100ms; - padding-block: var(--spacing-block-md); - padding-inline: var(--spacing-inline-sm); - 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; -} - -.news-index__item:is(:hover, :focus, :focus-visible, :focus-within) { - outline: none; - box-shadow: none; - color: var(--text-highlight-color); - border-color: var(--background-highlight-color); - background: var(--background-highlight-color); - transition-duration: 300ms; -} - -.news-index__item:is(:hover, :focus, :focus-visible, :focus-within) .link { - color: var(--special-text-highlight-color); -} - -.news-index__item:is(:focus, :focus-visible, :focus-within) { - border-color: var(--special-text-highlight-color); - border-style: dotted; -} diff --git a/scss/modules/product.scss b/scss/modules/product.scss deleted file mode 100644 index bc05dfd..0000000 --- a/scss/modules/product.scss +++ /dev/null @@ -1,31 +0,0 @@ -.product__header-block { - display: flex; - flex-wrap: wrap; - justify-content: space-evenly; - gap: var(--spacing-inline-sm); -} - -.product__action-block { - display: flex; - flex-direction: column; - margin-inline: auto; - width: fit-content; - gap: var(--margin-block-sm); -} - -.product__action-block img { - max-width: 12rem; - 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/modules/schedule.md.scss b/scss/modules/schedule.md.scss deleted file mode 100644 index 9ccfb0b..0000000 --- a/scss/modules/schedule.md.scss +++ /dev/null @@ -1,16 +0,0 @@ -.schedule { - display: grid; - grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); - column-gap: var(--grid-gutter-width); -} - -.schedule dt { - grid-column: 1 / 3; - margin: 0; - text-align: end; -} - -.schedule dd { - grid-column: 3 / calc(1 + var(--grid-prose-column-count)); - text-align: start; -} diff --git a/scss/modules/schedule.scss b/scss/modules/schedule.scss deleted file mode 100644 index 40a9fee..0000000 --- a/scss/modules/schedule.scss +++ /dev/null @@ -1,14 +0,0 @@ -.schedule:not(:first-child) { - margin-block-start: var(--margin-block-sm); -} - -.schedule dt { - font-weight: 700; - margin-block-start: var(--margin-block-sm); - text-align: center; - text-decoration: none; -} - -.schedule dd { - text-align: center; -} diff --git a/scss/modules/skip-to-content.scss b/scss/modules/skip-to-content.scss deleted file mode 100644 index a752b29..0000000 --- a/scss/modules/skip-to-content.scss +++ /dev/null @@ -1,13 +0,0 @@ -.skip-to-content { - position: absolute; - left: var(--grid-padding); - top: -10rem; - opacity: 0; - transition: top 300ms, opacity 300ms; -} - -.skip-to-content:is(:focus, :focus-visible, :focus-within) { - top: var(--margin-block-md); - opacity: 1; - transition: top 100ms; -} \ No newline at end of file -- cgit v1.2.3