Skip to content

Commit c0e3e61

Browse files
committed
Merge branch 'master' into production
2 parents 7cc36c5 + e107a2e commit c0e3e61

File tree

99 files changed

+1618
-1594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1618
-1594
lines changed

.commitlintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"rules": {
3-
"body-max-line-length": [0, "always"]
3+
"body-max-line-length": [
4+
0,
5+
"always"
6+
]
47
}
58
}

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ root = true
22

33
[*]
44
charset = utf-8
5-
# 2 space indentation
65
indent_style = space
76
indent_size = 2
87
trim_trailing_whitespace = true
98
# Unix-style newlines with a newline ending every file
109
end_of_line = lf
1110
insert_final_newline = true
11+
12+
13+
[*.js]
14+
indent_size = 4

.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.h
7070
For answers to common questions about this code of conduct, see
7171
<https://www.contributor-covenant.org/faq>
7272

73-
[homepage]: https://www.contributor-covenant.org
73+
[homepage]: https://www.contributor-covenant.org

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ko_fi: coteschung
2-
custom: https://cotes.gitee.io/alipay-wechat-donation
2+
custom: https://sponsor.cotes.page

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
## Description
22

3-
<!--
3+
<!--
44
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
55
66
e.g. Fixes #(issue)
77
-->
88

99
## Type of change
1010

11-
<!--
11+
<!--
1212
Please select the desired item checkbox and change it to "[x]", then delete options that are not relevant.
1313
-->
1414
- [ ] Bug fix (non-breaking change which fixes an issue)
@@ -18,7 +18,7 @@ Please select the desired item checkbox and change it to "[x]", then delete opti
1818

1919
## How has this been tested
2020

21-
<!--
21+
<!--
2222
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
2323
-->
2424

.github/workflows/pages-deploy.yml.hook

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Build and deploy"
1+
name: "Build and Deploy"
22
on:
33
push:
44
branches:
@@ -8,7 +8,7 @@ on:
88
- .gitignore
99
- README.md
1010
- LICENSE
11-
11+
1212
# Allows you to run this workflow manually from the Actions tab
1313
workflow_dispatch:
1414

@@ -60,7 +60,6 @@ jobs:
6060
path: "_site${{ steps.pages.outputs.base_path }}"
6161

6262
deploy:
63-
name: "Deploy site"
6463
environment:
6564
name: github-pages
6665
url: ${{ steps.deployment.outputs.page_url }}

.github/workflows/style-lint.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 'Style Lint'
2+
3+
on:
4+
push:
5+
paths:
6+
- '_sass/**.scss'
7+
pull_request:
8+
paths:
9+
- '_sass/**.scss'
10+
11+
jobs:
12+
stylelint:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v3
18+
19+
- name: Setup Node
20+
uses: actions/setup-node@v3
21+
- run: npm i
22+
- run: npm test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
!.husky
88
!.commitlintrc.json
99
!.versionrc.json
10+
!.stylelintrc.json
1011

1112
# bundler cache
1213
_site

.nojekyll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-

.stylelintrc.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"extends": "stylelint-config-standard-scss",
3+
"rules": {
4+
"no-descending-specificity": null,
5+
"shorthand-property-no-redundant-values": null,
6+
"at-rule-no-vendor-prefix": null,
7+
"property-no-vendor-prefix": null,
8+
"selector-no-vendor-prefix": null,
9+
"value-no-vendor-prefix": null,
10+
"color-function-notation": "legacy",
11+
"alpha-value-notation": "number",
12+
"selector-not-notation": "simple",
13+
"color-hex-length": "long",
14+
"declaration-block-single-line-max-declarations": 3,
15+
"font-family-no-missing-generic-family-keyword": [
16+
true,
17+
{
18+
"ignoreFontFamilies": ["Font Awesome 5 Free"]
19+
}
20+
]
21+
}
22+
}

0 commit comments

Comments
 (0)