-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR: - removes the newsletter mentions on the website as well as the popup, as the newsletter initiative isn't something we're planning to move forward with this year - fixes the duplicated 'tutoring' card on the main page and the services page. These have been replaced with a locker rental card and a Cube menu card respectively. - (hopefully) fixes the Prettier Action version. It looks like Prettier released `3.0.0` around the time the Action stopped working, so I'm going to pin the version to `2.8.8`, the previous non-major version. Force-merging since these issues have been around for a while and I'd like to resolve them ASAP.
- Loading branch information
Showing
9 changed files
with
14 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,8 @@ jobs: | |
- name: Prettify code | ||
uses: creyD/[email protected] | ||
with: | ||
prettier_version: "2.8.8" | ||
prettier_options: --write **/*.+(js|html|css|json|md|yaml|yml) | ||
prettier_plugins: prettier-plugin-go-template | ||
prettier_plugins: "prettier-plugin-go-template" | ||
github_token: ${{ secrets.GH_TOKEN }} | ||
only_changed: True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,23 @@ | ||
{ | ||
"plugins": ["prettier-plugin-go-template"], | ||
"trailingComma": "none", | ||
"overrides": [ | ||
{ | ||
"files": [ | ||
"*.html" | ||
], | ||
"files": ["*.html"], | ||
"options": { | ||
"parser": "go-template", | ||
"goTemplateBracketSpacing": true, | ||
"bracketSameLine": true | ||
} | ||
}, | ||
{ | ||
"files": [ | ||
"*.js" | ||
], | ||
"files": ["*.js"], | ||
"options": { | ||
"trailingComma": "none", | ||
"tabWidth": 2, | ||
"printWidth": 120 | ||
} | ||
} | ||
] | ||
} | ||
} | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters