diff options
| -rw-r--r-- | README.md | 159 | ||||
| -rw-r--r-- | scss/modules/btn.scss | 7 | ||||
| -rw-r--r-- | scss/modules/link.scss | 16 | ||||
| -rw-r--r-- | src/i18n/translations/pages/home.ts | 4 |
4 files changed, 41 insertions, 145 deletions
@@ -11,136 +11,45 @@ git clone https://github.com/Sycamost/lallans-wabsteid-astro.git \ && npm run dev ``` -## Writing a news post - -Skills required: +## All you need to edit the website -* Can edit text files. +* 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/)!) -* (Optional) Can open a command line terminal. (Here’s - [a great guide for beginners at MDN](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Understanding_client-side_tools/Command_line)) - -Prerequisites: - -(You can either choose to use a command-line terminal or GitHub Desktop, an app -with a graphical user interface. If you haven't used a command-line terminal -before, it's probably a little easier to use GitHub Desktop, but either approach -will work.) - -* Has [installed Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git). -* Has [signed up for GitHub](https://docs.github.com/en/get-started/signing-up-for-github/signing-up-for-a-new-github-account). -* If using a command line terminal: has configured an - [SSH key with GitHub](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account). -* If **not** using a command line terminal: has [installed GitHub Desktop](https://desktop.github.com/). - -### Getting the code - -You will need to fork the repository, and then clone your fork. - -A fork is your personal copy of the repository, hosted online on GitHub.com. To -make a change to the website, you must make your own fork, make the changes to -your fork, and then request for your changes to be copied back into the original, -or "upstream," repository. - -To make a fork, follow -[GitHub's guide to making a fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo). - -Once you've made a fork, it will be hosted online, most likely at -`https://github.com/YOUR_GITHUB_USERNAME/lallans-wabsteid-astro`. The next thing -you need to do is clone the repository. - -A clone is a local copy of a repository hosted online. In order to make changes -to the code, you need to have a copy of the code on your own computer for you to -edit. "Cloning" is essentially the same as "downloading." - -If you're using a command-line terminal, you can follow -[GitHub's guide to cloning a remote repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository). -Or, if you already know how what you're doing, you can navigate to the directory -where you want your local repository to reside, and enter: - -```bash -git clone https://github.com/Sycamost/lallans-wabsteid-astro -``` - -If you're using GitHub Desktop, follow -[GitHub's guide to cloning a repo with GitHub Desktop](https://docs.github.com/en/desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop). - -Once the cloning is finished, you should now have a clone - a local copy - of -the code. You're ready to start making changes! - -### Making changes to the code - -You can make changes to the code using any text editor, such as Notepad on Windows -or TextEdit on Mac. Word processors, such as Microsoft Word, Openoffice Writer or -Pages, may work but are not suitable and I don't recommend them. For a better -experience, you might want to install an IDE, which is a text editor specially -designed for editing code. Popular choices include: -[Visual Studio Code](https://code.visualstudio.com/download) and -[Sublime Text](https://www.sublimetext.com/download). - -Once you've made some changes and saved them, you need to "commit" them. -This means telling Git to include those changes when you upload them back -to your forked repository. It's a little bit like saving your work, for Git. +* 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. -If you're using a command line, a great way to do this is by navigating to the -root directory of your local clone and enter this command: - -```bash -git add . -git diff --staged -``` - -The first command adds all changes in the whole directory, and the second command -shows you what you just added. - -Once you're happy with those changes, commit them with the following command: - -```bash -git commit -m "A brief description of your changes" -``` - -Make sure to provide a short (ideally fewer than 80 characters) description inside -quote marks. - -If you're using GitHub Desktop, you can follow -[GitHub's guide to making a commit](https://docs.github.com/en/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop). - -### Adding a news post - -The simplest way to add a news post is to duplicate an existing one, and -edit it to reflect the new content. - -To duplicate an existing one, you need to duplicate both the Scots and the English -version of a news article. Go to `src/content/news/sco` and duplicate a file in -that folder, then go to `src/content/news/en-GB` and do the same. The new files -should be named according to the existing pattern, which begins with the date of -the news article in `YYYY-MM-DD` format. Make sure to keep the `.mdx` file extension. - -Then, edit your duplicated files to contain the content for the new news article -and commit them. - -### Uploading the new news articles - -Once you've committed your new article in both Scots and English, you'll need -to first upload it back to your fork, and then ask for your fork's changes to -be included in the upstream repository. - -To upload, or, in Git terms, "push," your changes to your fork, if you're using -a command-line terminal, simply enter `git push`. If you're using GitHub Desktop, -click the button which says "Push origin." - -Then, once you've pushed to your fork, you need to request for your fork's changes -to be included in the upstream repository. In GitHub terms, this request is called -a Pull Request. - -To do this, [follow GitHub's guide to making a Pull Request from a fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork). -Importantly, you should target the base repository of `Sycamost/lallans-wabsteid-astro` -and the base branch of `dev`. +## Writing a news post -Once you've done that, it's down to an owner of the upstream repository to approve -your Pull Request. Once they've done that, your new news article will appear on -the website. +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 + 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 + 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 + (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 diff --git a/scss/modules/btn.scss b/scss/modules/btn.scss index 142463c..1d52b9c 100644 --- a/scss/modules/btn.scss +++ b/scss/modules/btn.scss @@ -3,7 +3,7 @@ box-sizing: border-box; color: var(--text-color); border: solid var(--relative-eighth-rem) var(--text-color); - font-weight: 500; + font-weight: 600; text-align: center; margin-block-start: var(--margin-block-sm); padding-inline: var(--padding-inline-md); @@ -11,7 +11,6 @@ background-color: transparent; transition: background-color 100ms, - font-weight 100ms, transform 100ms; } @@ -21,10 +20,8 @@ color: var(--text-highlight-color); border-color: var(--background-highlight-color); background-color: var(--background-highlight-color); - font-weight: 700; transition: background-color 300ms, - font-weight 300ms, transform 300ms; } @@ -35,4 +32,4 @@ .btn:active { transform: scale(1.1, 1.1); -}
\ No newline at end of file +} diff --git a/scss/modules/link.scss b/scss/modules/link.scss index d225e9d..dfcabcf 100644 --- a/scss/modules/link.scss +++ b/scss/modules/link.scss @@ -10,28 +10,18 @@ color 100ms, text-decoration-color 100ms, text-decoration-thickness 100ms, - text-underline-offset 100ms, - border-color 100ms, - text-shadow 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(4 * var(--relative-eighth-rem)); - text-underline-offset: calc(3 * var(--relative-eighth-rem)); - text-shadow: - 0 1px 0 currentColor, - 1px 0 0 currentColor, - 1px 0 0 currentColor, - 0 1px 0 currentColor; + text-decoration-thickness: calc(3 * var(--relative-eighth-rem)); transition: color 300ms, text-decoration-color 300ms, text-decoration-thickness 300ms, - text-underline-offset 300ms, - border-color 300ms, - text-shadow 300ms; + border-color 300ms; } .link:focus, .link:focus-visible { diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index 09071ff..8ad6810 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -10,8 +10,8 @@ const tPage = { 'en-GB': () => 'Submit to Lallans', }, 'submit-para-1': { - sco: () => 'We ar acceptin submeissions til Lallans 102!', - 'en-GB': () => 'We are accepting submissions to Lallans 102!', + sco: () => 'We ar acceptin submeissions til Lallans 103!', + 'en-GB': () => 'We are accepting submissions to Lallans 103!', }, 'submit-para-2': { sco: () => ` |