Skip to content

Commit 9c0e753

Browse files
danggaidanggai
committed
Merge remote-tracking branch 'root_project/master'
* root_project/master: (317 commits) Update CHANGELOG and history Automatically close invalid PRs using GitHub Actions (mmistakes#3313) Update CHANGELOG and history Add missing comma (mmistakes#3318) Update CHANGELOG and history ✏ fix typo (mmistakes#3232) Update CHANGELOG and history Fix keybase class (mmistakes#3221) Update CHANGELOG and history Update CHANGELOG and history Update Brazilian Portuguese translation (mmistakes#3204) feat: Sort comments by date ascending (mmistakes#3184) Link clarifying adding plugins (mmistakes#3181) Making verbiage consistent w/current _config.yml (mmistakes#3180) Fix broken link & Add Baidu site verification (mmistakes#3139) Added optional label attribute (mmistakes#3128) Delete stale.yml Delete stale.yml Use GitHub issue templates (mmistakes#3133) Update CHANGELOG and history ... # Conflicts: # _config.yml # _includes/archive-single.html # _sass/minimal-mistakes/_base.scss # _sass/minimal-mistakes/skins/_neon.scss
2 parents bce9689 + 2632ff6 commit 9c0e753

File tree

143 files changed

+3606
-1597
lines changed

Some content is hidden

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

143 files changed

+3606
-1597
lines changed

‎.gitattributes

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
assets/fonts/* linguist-vendored
2-
assets/js/main.min.js linguist-vendored
3-
assets/js/lunr/* linguist-vendored
4-
assets/js/plugins/* linguist-vendored
5-
assets/js/vendor/* linguist-vendored
1+
assets/fonts/* linguist-vendored
2+
assets/js/main.min.js linguist-vendored
3+
assets/js/lunr/* linguist-vendored
4+
assets/js/plugins/* linguist-vendored
5+
assets/js/vendor/* linguist-vendored
66
_sass/minimal-mistakes/vendor/* linguist-vendored
7+
CHANGELOG.md text merge=union
8+
docs/_docs/18-history.md text merge=union
9+
10+
*.md text

‎.github/CONTRIBUTING.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# Contributing
22

3-
Having trouble working with the theme? Found a typo in the documentation?
4-
Interested in adding a feature or [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)?
5-
Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new)
6-
or [pull request](https://help.github.com/articles/using-pull-requests/).
7-
If this is your first pull request, it may be helpful to read up on the
8-
[GitHub Flow](https://guides.github.com/introduction/flow/) first.
3+
Found a typo in the documentation or interested in [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)? Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new) or [pull request](https://help.github.com/articles/using-pull-requests/). If this is your first pull request, it may be helpful to read up on the [GitHub Flow](https://guides.github.com/introduction/flow/) first.
4+
5+
For help with using the theme or general Jekyll support questions, please use the [Jekyll Talk forums](https://talk.jekyllrb.com/).
96

107
Minimal Mistakes has been designed as a base for you to customize and fit your
118
site's unique needs. Please keep this in mind when requesting features and/or

‎.github/FUNDING.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
custom: https://www.paypal.me/mmistakes
1+
github: mmistakes
2+
custom: ['https://www.paypal.me/mmistakes']

‎.github/ISSUE_TEMPLATE/bug_report.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ about: "Is something not working as expected?"
1414
for solutions and to avoid duplication.
1515
- Ask for help at http://talk.jekyllrb.com/
1616
17-
After exhausting these suggestions use the format below.
17+
If none of the above solved your problem, you can continue below.
1818
-->
1919

2020
## Environment
@@ -25,15 +25,15 @@ about: "Is something not working as expected?"
2525
2626
Issues without a link to a public repository or ZIP file will likely go ignored.
2727
Being able to see your actual files is necessary to troubleshoot, as most
28-
issues stem from invalid/missing YAML Front Matter, a mis-configured _config.sys
28+
issues stem from invalid/missing YAML Front Matter, a mis-configured _config.yml
2929
file, or problematic site content.
3030
-->
3131

3232
- Minimal Mistakes version:
3333
- Ruby gem or remote theme version:
3434
- Jekyll version:
3535
- Git repository URL:
36-
- GitHub Pages hosted (if yes provide URL to site):
36+
- Hosted on GitHub Pages (if yes provide URL to site):
3737
- Operating system:
3838

3939
## Expected behavior
@@ -46,7 +46,7 @@ about: "Is something not working as expected?"
4646
## Steps to reproduce the behavior
4747

4848
<!--
49-
Describe the steps you took for this problem to exist. Such as: you installed
49+
Describe the steps you took for this problem to come up. Such as: you installed
5050
the theme, customized _config.yml, added your own posts, and started up a
5151
Jekyll server locally.
5252

‎.github/ISSUE_TEMPLATE/bug_report.yml

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Bug Report
2+
description: There is something wrong with the theme. 99% of the time you should select Support below.
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Before opening a new issue please:
8+
9+
- Verify you have the latest versions of Jekyll and Minimal Mistakes
10+
installed by running `bundle update`.
11+
- Thoroughly read the theme's documentation at
12+
https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/
13+
- Search all issues at https://github.com/mmistakes/minimal-mistakes/issues
14+
for solutions and to avoid duplication.
15+
- Ask for help at https://talk.jekyllrb.com/
16+
17+
If none of the above solved your problem, you can continue below.
18+
19+
- type: textarea
20+
id: environment
21+
attributes:
22+
label: What happened?
23+
description: |
24+
Please include theme version, Jekyll version, public git repository, whether
25+
you are hosting with GitHub Pages, and the operating system you tested with.
26+
27+
Issues without a link to a public repository or ZIP file will likely go ignored.
28+
Being able to see your actual files is necessary to troubleshoot, as most
29+
issues stem from invalid/missing YAML Front Matter, a mis-configured _config.yml
30+
file, or problematic site content.
31+
value: |-
32+
- Minimal Mistakes version:
33+
- Ruby gem or remote theme version:
34+
- Jekyll version:
35+
- Git repository URL:
36+
- Hosted on GitHub Pages (if yes provide URL to site):
37+
- Operating system:
38+
validations:
39+
required: true
40+
41+
- type: textarea
42+
id: expected-behavior
43+
attributes:
44+
label: Expected behavior
45+
description: |
46+
Please describe the expected behavior and the actual result you got.
47+
placeholder: >
48+
What is it you expected to happen? This should be a description of how the
49+
functionality you tried to use is supposed to work.
50+
validations:
51+
required: true
52+
53+
- type: textarea
54+
id: steps-to-reproduce
55+
attributes:
56+
label: Steps to reproduce the behavior
57+
description: |
58+
Describe the steps you took for this problem to come up. Such as: you installed
59+
the theme, customized _config.yml, added your own posts, and started up a
60+
Jekyll server locally.
61+
62+
If an error occurred on GitHub Pages when pushing, please test a local version
63+
following these setup instructions:
64+
https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/
65+
66+
Then provide a complete log by running `bundle exec jekyll build --trace --verbose`
67+
and include this output in the filed issue.
68+
69+
Screenshots can also be included if they help illustrate a behavior.
70+
validations:
71+
required: true
72+
73+
- type: textarea
74+
id: other
75+
attributes:
76+
label: Other
77+
description: |
78+
Please provide a code repository, gist, code snippet, sample files,
79+
screenshots, or anything else you think will aid in reproducing the issue.
80+
validations:
81+
required: false

‎.github/ISSUE_TEMPLATE/config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Support
4+
url: https://github.com/mmistakes/minimal-mistakes/discussions
5+
about: Please post your support questions in the Discussions section.

‎.github/ISSUE_TEMPLATE/documentation.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Documentation
2+
description: Found a typo or something that needs clarification?
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Thanks for taking the time to open an issue and help make the docs better.
8+
9+
- type: textarea
10+
id: motivation
11+
attributes:
12+
label: Motivation
13+
description: |
14+
Why should we update our docs?
15+
validations:
16+
required: true
17+
18+
- type: textarea
19+
id: suggestion
20+
attributes:
21+
label: Suggestion
22+
description: |
23+
What should we do instead?
24+
validations:
25+
required: true

‎.github/ISSUE_TEMPLATE/feature_request.md

-32
This file was deleted.

‎.github/ISSUE_TEMPLATE/support.md

-22
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@
2323

2424
<!--
2525
Is this related to any GitHub issue(s)?
26-
-->
26+
-->
27+
28+
<!--
29+
Please delete this comment if you confirm that you want to submit this Pull Request.
30+
CHECK_PR_DID_NOT_CONFIRM
31+
-->

‎.github/stale.yml

-21
This file was deleted.

‎.github/workflows/bad-pr.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Cleanup bad PR
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened]
6+
7+
jobs:
8+
close-pr:
9+
runs-on: ubuntu-latest
10+
if: "contains(github.event.pull_request.body, 'CHECK_PR_DID_NOT_CONFIRM') || github.event.pull_request.body == ''"
11+
steps:
12+
- uses: actions-ecosystem/action-add-labels@v1
13+
with:
14+
labels: 'Type: Invalid'
15+
- uses: superbrothers/close-pull-request@v3
16+
with:
17+
# Optional. Post an issue comment just before closing a pull request.
18+
comment: "This PR is not valid for inclusion. Please check again if you're submitting improvements for *the theme*."

‎.gitignore

+20-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
1-
*.gem
1+
# Vim
2+
*~
3+
*.sw[p_]
4+
5+
# Sublime Text
26
*.sublime-project
37
*.sublime-workspace
8+
9+
# Ruby Gem
10+
*.gem
411
.bundle
12+
Gemfile.lock
13+
**/vendor/bundle
14+
15+
# Node.js and NPM
16+
node_modules
17+
npm-debug.log*
18+
package-lock.json
19+
codekit-config.json
20+
21+
# macOS
522
.DS_Store
23+
24+
# Jekyll generated files
625
.jekyll-cache
726
.jekyll-metadata
827
.sass-cache
928
_asset_bundler_cache
1029
_site
11-
codekit-config.json
12-
example/_site
13-
Gemfile.lock
14-
node_modules
15-
npm-debug.log*
16-
vendor/bundle

0 commit comments

Comments
 (0)