Update from master after a long time

.gitattributes

@@ -1,6 +1,10 @@
-assets/fonts/* linguist-vendored
-assets/js/main.min.js linguist-vendored
-assets/js/lunr/* linguist-vendored
-assets/js/plugins/* linguist-vendored
-assets/js/vendor/* linguist-vendored
+assets/fonts/*                  linguist-vendored
+assets/js/main.min.js           linguist-vendored
+assets/js/lunr/*                linguist-vendored
+assets/js/plugins/*             linguist-vendored
+assets/js/vendor/*              linguist-vendored
 _sass/minimal-mistakes/vendor/* linguist-vendored
+CHANGELOG.md                    text merge=union
+docs/_docs/18-history.md        text merge=union
+
+*.md                            text

.github/CONTRIBUTING.md

@@ -1,11 +1,8 @@
 # Contributing
 
-Having trouble working with the theme? Found a typo in the documentation? 
-Interested in adding a feature or [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.
+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.
+
+For help with using the theme or general Jekyll support questions, please use the [Jekyll Talk forums](https://talk.jekyllrb.com/).
 
 Minimal Mistakes has been designed as a base for you to customize and fit your 
 site's unique needs. Please keep this in mind when requesting features and/or 

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: mmistakes
+custom: ['https://www.paypal.me/mmistakes']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,7 +14,7 @@ about: "Is something not working as expected?"
     for solutions and to avoid duplication.
   - Ask for help at http://talk.jekyllrb.com/
 
-  After exhausting these suggestions use the format below.
+  If none of the above solved your problem, you can continue below.
 -->
 
 ## Environment
@@ -25,15 +25,15 @@ about: "Is something not working as expected?"
 
   Issues without a link to a public repository or ZIP file will likely go ignored.
   Being able to see your actual files is necessary to troubleshoot, as most 
-  issues stem from invalid/missing YAML Front Matter, a mis-configured _config.sys 
+  issues stem from invalid/missing YAML Front Matter, a mis-configured _config.yml 
   file, or problematic site content. 
 -->
 
 - Minimal Mistakes version:
 - Ruby gem or remote theme version:
 - Jekyll version:
 - Git repository URL:
-- GitHub Pages hosted (if yes provide URL to site):
+- Hosted on GitHub Pages (if yes provide URL to site):
 - Operating system:
 
 ## Expected behavior
@@ -46,7 +46,7 @@ about: "Is something not working as expected?"
 ## Steps to reproduce the behavior
 
 <!--
-  Describe the steps you took for this problem to exist. Such as: you installed
+  Describe the steps you took for this problem to come up. Such as: you installed
   the theme, customized _config.yml, added your own posts, and started up a 
   Jekyll server locally.
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,81 @@
+name: Bug Report
+description: There is something wrong with the theme. 99% of the time you should select Support below.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a new issue please:
+
+        - Verify you have the latest versions of Jekyll and Minimal Mistakes
+          installed by running `bundle update`.
+        - Thoroughly read the theme's documentation at
+          https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/
+        - Search all issues at https://github.com/mmistakes/minimal-mistakes/issues
+          for solutions and to avoid duplication.
+        - Ask for help at https://talk.jekyllrb.com/
+
+        If none of the above solved your problem, you can continue below.
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: What happened?
+      description: |
+        Please include theme version, Jekyll version, public git repository, whether
+        you are hosting with GitHub Pages, and the operating system you tested with.
+
+        Issues without a link to a public repository or ZIP file will likely go ignored.
+        Being able to see your actual files is necessary to troubleshoot, as most
+        issues stem from invalid/missing YAML Front Matter, a mis-configured _config.yml
+        file, or problematic site content.
+      value: |-
+        - Minimal Mistakes version:
+        - Ruby gem or remote theme version:
+        - Jekyll version:
+        - Git repository URL:
+        - Hosted on GitHub Pages (if yes provide URL to site):
+        - Operating system:
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: |
+        Please describe the expected behavior and the actual result you got.
+      placeholder: >
+        What is it you expected to happen? This should be a description of how the
+        functionality you tried to use is supposed to work.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce the behavior
+      description: |
+        Describe the steps you took for this problem to come up. Such as: you installed
+        the theme, customized _config.yml, added your own posts, and started up a
+        Jekyll server locally.
+
+        If an error occurred on GitHub Pages when pushing, please test a local version
+        following these setup instructions:
+        https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/
+
+        Then provide a complete log by running `bundle exec jekyll build --trace --verbose`
+        and include this output in the filed issue.
+
+        Screenshots can also be included if they help illustrate a behavior.
+    validations:
+      required: true
+
+  - type: textarea
+    id: other
+    attributes:
+      label: Other
+      description: |
+        Please provide a code repository, gist, code snippet, sample files,
+        screenshots, or anything else you think will aid in reproducing the issue.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/documentation.yml

@@ -0,0 +1,25 @@
+name: Documentation
+description: Found a typo or something that needs clarification?
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to open an issue and help make the docs better.
+
+  - type: textarea
+    id: motivation
+    attributes:
+      label: Motivation
+      description: |
+        Why should we update our docs?
+    validations:
+      required: true
+
+  - type: textarea
+    id: suggestion
+    attributes:
+      label: Suggestion
+      description: |
+        What should we do instead?
+    validations:
+      required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,4 +23,8 @@
 
 <!--
   Is this related to any GitHub issue(s)?
--->
+-->
+
+<!--
+  Please confirm that you want to submit this Pull Request to Minimal Mistakes, the free Jekyll theme by Michael Rose, by deleting this comment block.
+-->

.github/workflows/bad-pr.yml

@@ -0,0 +1,27 @@
+name: Cleanup bad PR
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+jobs:
+  close-pr:
+    runs-on: ubuntu-latest
+    if: "contains(github.event.pull_request.body, 'by deleting this comment block') || github.event.pull_request.body == ''"
+    steps:
+      - uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: 'Type: Invalid'
+      - uses: superbrothers/close-pull-request@v3
+        with:
+          # Optional. Post an issue comment just before closing a pull request.
+          comment: |
+            **You have created a Pull Request to the wrong repository.** This is the repository for [Minimal Mistakes][1], the free Jekyll theme. See [GitHub Docs: About pull requests][2] if you need help.
+
+              [1]: https://mmistakes.github.io/minimal-mistakes/
+              [2]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
+      - uses: sudo-bot/action-pull-request-lock@v1.0.5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          number: ${{ github.event.pull_request.number }}
+          lock-reason: spam

.gitignore

@@ -1,8 +1,28 @@
-*.gem
+# Vim
+*~
+*.sw[p_]
+
+# Sublime Text
 *.sublime-project
 *.sublime-workspace
+
+# Ruby Gem
+*.gem
 .bundle
+Gemfile.lock
+**/vendor/bundle
+
+# Node.js and NPM
+node_modules
+npm-debug.log*
+package-lock.json
+codekit-config.json
+
+# macOS
 .DS_Store
+
+# Jekyll generated files
+.jekyll-cache
 .jekyll-metadata
 .sass-cache
 _asset_bundler_cache