Skip to content

Commit

Permalink
Merge branch 'main' into his-tables-caption
Browse files Browse the repository at this point in the history
  • Loading branch information
MewenLeHo authored May 24, 2023
2 parents 2256dd0 + 61b41da commit 52b9ca9
Show file tree
Hide file tree
Showing 20 changed files with 349 additions and 219 deletions.
6 changes: 4 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,14 @@
"unicorn/no-null": "off",
"unicorn/no-typeof-undefined": "off",
"unicorn/no-unused-properties": "error",
"unicorn/numeric-separators-style": "off",
"unicorn/prefer-array-flat": "off",
"unicorn/prefer-at": "off",
"unicorn/prefer-dom-node-dataset": "off",
"unicorn/prefer-module": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prefer-spread": "off",
"unicorn/prefer-string-replace-all": "off",
"unicorn/prevent-abbreviations": "off"
},
"overrides": [
Expand Down Expand Up @@ -189,8 +192,7 @@
},
"rules": {
"no-new": "off",
"unicorn/no-array-for-each": "off",
"unicorn/numeric-separators-style": "off"
"unicorn/no-array-for-each": "off"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
- then, if bumping a minor or major version:
- [ ] Manually change `version_short` in `package.json`
- [ ] Add docs version to `site/data/docs-versions.yml`
- [ ] Manually change `docs_version` in `config.yml` and other references to the previous version
- [ ] Manually change `docs_version` in `hugo.yml` and other references to the previous version
- [ ] Update redirects in docs frontmatter (`site/content/docs/_index.html`?)
- [ ] Move `site/content/docs/5.x` to `site/content/docs/5.x+1`
- [ ] Increment `site/static/docs/{version}` version
Expand Down
4 changes: 2 additions & 2 deletions build/generate-sri.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ const sh = require('shelljs')

sh.config.fatal = true

const configFile = path.join(__dirname, '../config.yml')
const configFile = path.join(__dirname, '../hugo.yml')

// Array of objects which holds the files to generate SRI hashes for.
// `file` is the path from the root folder
// `configPropertyName` is the config.yml variable's name of the file
// `configPropertyName` is the hugo.yml variable's name of the file
const files = [
{
file: 'dist/css/boosted.min.css',
Expand Down
File renamed without changes.
Loading

0 comments on commit 52b9ca9

Please # to comment.