Skip to content

Commit fa8a2a0

Browse files
cotes2020cotes2020
committed
Merge branch 'master' into production
2 parents 87a12be + 7b7e69a commit fa8a2a0

Some content is hidden

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

56 files changed

+854
-735
lines changed

‎.github/DISCUSSION_TEMPLATE/general.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
body:
2+
- type: checkboxes
3+
attributes:
4+
label: Checklist
5+
description: Following the guidelines can make you more likely to get responses.
6+
options:
7+
- label: >-
8+
I have read and accepted the
9+
[contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md).
10+
required: true
11+
12+
- type: dropdown
13+
attributes:
14+
label: What is the topic?
15+
options:
16+
- Sharing tips and tricks
17+
- Just chatting
18+
validations:
19+
required: true
20+
21+
- type: textarea
22+
attributes:
23+
label: Description
24+
description: Please describe in detail what you want to share.
25+
validations:
26+
required: true

‎.github/DISCUSSION_TEMPLATE/q-a.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
body:
2+
- type: checkboxes
3+
attributes:
4+
label: Checklist
5+
description: Following the guidelines can make you more likely to get responses.
6+
options:
7+
- label: >-
8+
I have read and accepted the
9+
[contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md).
10+
required: true
11+
12+
- type: dropdown
13+
id: download
14+
attributes:
15+
label: How did you create the site?
16+
options:
17+
- Generated from `chirpy-starter`
18+
- Built from `jekyll-theme-chirpy`
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
attributes:
24+
label: Description
25+
description: Please describe your need in detail.
26+
validations:
27+
required: true
28+
29+
- type: textarea
30+
attributes:
31+
label: Operations you have already tried
32+
description: Describe the effort you went through.
33+
validations:
34+
required: true
35+
36+
- type: textarea
37+
attributes:
38+
label: Anything else?
39+
description: |
40+
Links? References? Or logs? Anything that will give us more context about the issue you are encountering!

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Bug Report
2+
description: Create a report to help us improve
3+
body:
4+
- type: checkboxes
5+
attributes:
6+
label: Checklist
7+
description: Following the guidelines can make you more likely to get responses.
8+
options:
9+
- label: >-
10+
I have read and accepted the
11+
[contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md).
12+
required: true
13+
14+
- type: dropdown
15+
id: download
16+
attributes:
17+
label: How did you create the site?
18+
options:
19+
- Generated from `chirpy-starter`
20+
- Built from `jekyll-theme-chirpy`
21+
validations:
22+
required: true
23+
24+
- type: textarea
25+
attributes:
26+
label: Describe the bug
27+
description: A clear and concise description of what the bug is.
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
attributes:
33+
label: Steps To Reproduce
34+
description: Steps to reproduce the behavior.
35+
placeholder: |
36+
1. In this environment...
37+
2. With this config...
38+
3. Run '...'
39+
4. See error...
40+
validations:
41+
required: true
42+
43+
- type: textarea
44+
attributes:
45+
label: Expected Behavior
46+
description: A concise description of what you expected to happen.
47+
validations:
48+
required: true
49+
50+
- type: textarea
51+
attributes:
52+
label: Environment
53+
value: |
54+
- Ruby: <!-- run `ruby -v` -->
55+
- Jekyll: <!-- run `bundle exec jekyll -v` -->
56+
- Chirpy: <!-- run `bundle info jekyll-theme-chirpy` -->
57+
validations:
58+
required: true
59+
60+
- type: textarea
61+
attributes:
62+
label: Anything else?
63+
description: |
64+
Links? References? Or logs? Anything that will give us more context about the issue you are encountering!

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Feature Request
2+
description: Suggest an idea for this project
3+
labels:
4+
- enhancement
5+
body:
6+
- type: checkboxes
7+
attributes:
8+
label: Checklist
9+
description: Following the guidelines can make you more likely to get responses.
10+
options:
11+
- label: >-
12+
I have read and accepted the
13+
[contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md).
14+
required: true
15+
16+
- type: textarea
17+
attributes:
18+
label: Is your feature request related to a problem? Please describe
19+
description: A clear and concise description of what the problem is.
20+
validations:
21+
required: true
22+
23+
- type: textarea
24+
attributes:
25+
label: Describe the solution you'd like
26+
description: A clear and concise description of what you want to happen.
27+
validations:
28+
required: true
29+
30+
- type: textarea
31+
attributes:
32+
label: Describe alternatives you've considered
33+
description: A clear and concise description of any alternative solutions or features you've considered.
34+
35+
- type: textarea
36+
attributes:
37+
label: Additional context
38+
description: Add any other context or screenshots about the feature request here.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
1-
## Description
2-
3-
<!--
4-
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.
5-
-->
6-
71
## Type of change
8-
9-
<!--
10-
Please select the desired item checkbox and change it to "[x]", then delete options that are not relevant.
11-
-->
2+
<!-- Please select the desired item checkbox and change it from `[ ]` to `[x]` and then delete the irrelevant options. -->
123
- [ ] Bug fix (non-breaking change which fixes an issue)
134
- [ ] New feature (non-breaking change which adds functionality)
145
- [ ] Improvement (refactoring and improving code)
156
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
167
- [ ] Documentation update
178

18-
## Additional context
19-
20-
<!-- e.g. Fixes #(issue) -->
21-
22-
## How has this been tested
23-
9+
## Description
2410
<!--
25-
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
11+
Please include a summary of the change and which issue is fixed.
12+
Please also include relevant motivation and context.
13+
List any dependencies that are required for this change.
2614
-->
2715

28-
- [ ] I have run `bash ./tools/test` (at the root of the project) locally and passed
29-
- [ ] I have tested this feature in the browser
16+
## Additional context
17+
<!-- e.g. Fixes #(issue) -->

‎.stylelintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"scss/operator-no-newline-after": null,
1616
"rule-empty-line-before": [
1717
"always",
18-
{ "ignore": ["after-comment", "first-nested", "inside-block"] }
18+
{ "ignore": ["after-comment", "first-nested"] }
1919
],
2020
"value-keyword-case": ["lower", { "ignoreProperties": ["/^\\$/"] }],
2121
"media-feature-range-notation": "prefix"

‎Gemfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,3 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
2121
# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
2222
# do not have a Java counterpart.
2323
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
24-
25-
# Lock jekyll-sass-converter to 2.x on Linux-musl
26-
if RUBY_PLATFORM =~ /linux-musl/
27-
gem "jekyll-sass-converter", "~> 2.0"
28-
end

0 commit comments

Comments
 (0)