forked from mmistakes/minimal-mistakes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into master
# By Michael Rose (426) and others # Via Michael Rose (24) and GitHub (2) * upstream/master: (612 commits) Fix dead link to "CI services" Jekyll (mmistakes#2692) Bump theme version Release 4.20.2 💎 Fix broken link in documentation Fix typo Bump copyright year Update CHANGELOG and history Refactor page meta (mmistakes#2641) Update CHANGELOG and history Added article:author used by Pinterest (mmistakes#2670) Update CHANGELOG and history Removed duplicated CSS definitions (mmistakes#2666) Change "fa" to "fas" for Font Awesome 5 (mmistakes#2649) Update CHANGELOG and history Fix `entries_layout: grid` Close mmistakes#2639 Update remote_theme version Release 4.20.1 💎 Fix grid `entries_layout` in home.html Fix grammar Update remote_theme ... # Conflicts: # _includes/scripts.html # docs/Gemfile # docs/_config.yml # docs/_data/authors.yml # docs/_docs/01-quick-start-guide.md # docs/_docs/02-structure.md # docs/_docs/03-installation.md # docs/_docs/04-upgrading.md # docs/_docs/05-configuration.md # docs/_docs/06-overriding-theme-defaults.md # docs/_docs/07-navigation.md # docs/_docs/08-ui-text.md # docs/_docs/09-authors.md # docs/_docs/10-layouts.md # docs/_docs/13-collections.md # docs/_docs/14-helpers.md # docs/_docs/15-utility-classes.md # docs/_docs/16-stylesheets.md # docs/_docs/17-javascript.md # docs/_docs/18-history.md # docs/_docs/19-contributing.md # docs/_layouts/default.html # docs/_pages/404.md # docs/_pages/about.md # docs/_pages/home.md # docs/_pages/page-archive.html # docs/_pages/recipes-archive.md # docs/_pages/splash-page.md # docs/_posts/2009-05-15-edge-case-nested-and-mixed-lists.md # docs/_posts/2010-02-05-post-notice.md # docs/_posts/2010-08-05-post-header-overlay-image-og-override.md # docs/_posts/2010-08-05-post-image-linked.md # docs/_posts/2010-08-06-post-image-linked-caption.md # docs/_posts/2010-09-09-post-gallery.md # docs/_posts/2012-01-02-layout-comments.md # docs/_posts/2012-01-03-layout-table-of-contents-post.md # docs/_posts/2012-03-15-layout-author-override.md # docs/_posts/2012-03-15-layout-header-image-external.md # docs/_posts/2012-03-15-layout-header-overlay-image.md # docs/_posts/2012-03-15-layout-more-tag.md # docs/_posts/2012-03-15-layout-sidebar-custom.md # docs/_posts/2013-01-10-markup-image-alignment.md # docs/_posts/2016-02-24-welcome-to-jekyll.md # docs/_posts/2016-09-21-gemified-theme-alpha.md # test/Gemfile # test/_config.yml # test/_data/authors.yml # test/_data/navigation.yml # test/_pages/archive-layout-with-content.md # test/_pages/category-archive.md # test/_pages/collection-archive.html # test/_pages/page-archive.html # test/_pages/sitemap.md # test/_pages/splash-page.md # test/_pages/tag-archive.md # test/_posts/2009-05-15-edge-case-nested-and-mixed-lists.md # test/_posts/2009-06-01-edge-case-many-tags.md # test/_posts/2010-02-05-post-notice.md # test/_posts/2010-08-05-post-header-overlay-image-og-override.md # test/_posts/2010-08-05-post-image-linked.md # test/_posts/2010-08-06-post-image-linked-caption.md # test/_posts/2010-08-07-post-image-caption.md # test/_posts/2010-09-09-post-gallery.md # test/_posts/2012-01-03-layout-table-of-contents-post.md # test/_posts/2012-03-15-layout-author-override.md # test/_posts/2012-03-15-layout-header-image-external.md # test/_posts/2012-03-15-layout-header-overlay-image.md # test/_posts/2012-03-15-layout-more-tag.md # test/_posts/2012-03-15-layout-sidebar-custom.md # test/_posts/2016-02-24-welcome-to-jekyll.md # test/index.html
- Loading branch information
Showing
216 changed files
with
25,277 additions
and
1,237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,26 @@ | ||
# 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. | ||
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. | ||
|
||
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 submitting pull requests. If it's not something that most people will use, I probably won't consider it. When in doubt ask. | ||
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 | ||
submitting pull requests. If it's not something that most people will use, I | ||
probably won't consider it. When in doubt ask. | ||
|
||
This goes for author sidebar links and "share button" additions -- I have no intention of merging in every possibly option, the essentials are there to get you started :smile:. | ||
This goes for author sidebar links and "share button" additions -- I have no | ||
intention of merging in every possibly option, the essentials are there to get | ||
you started :smile:. | ||
|
||
## Pull Requests | ||
|
||
When submitting a pull request: | ||
|
||
1. Clone the repo. | ||
2. Create a branch off of `master` and give it a meaningful name (e.g. `my-awesome-new-feature`) and describe the feature or fix. | ||
3. Open a pull request on GitHub. | ||
2. Create a branch off of `master` and give it a meaningful name (e.g. | ||
`my-awesome-new-feature`) and describe the feature or fix. | ||
3. Open a pull request on GitHub. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
custom: https://www.paypal.me/mmistakes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- | ||
name: "Documentation" | ||
about: "Found a typo or something that needs clarification?" | ||
--- | ||
|
||
<!-- Thanks for taking the time to open an issue and help make the docs better --> | ||
|
||
## Motivation | ||
|
||
<!-- Why should we update our docs? --> | ||
|
||
<!-- What should we do instead? --> | ||
|
||
## Suggestion | ||
|
||
<!-- What should we do instead? --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--- | ||
name: "Enhancement / Feature Request" | ||
about: "What would make this theme better?" | ||
--- | ||
|
||
<!-- | ||
Before opening a new issue please search all issues at | ||
https://github.com/mmistakes/minimal-mistakes/issues to avoid duplication. | ||
--> | ||
|
||
## Summary | ||
|
||
<!-- | ||
A short explanation of the enhancement or feature. | ||
--> | ||
|
||
## Motivation | ||
|
||
<!-- | ||
Why do you want to see this feature in the theme? | ||
What use cases does it support? | ||
NOTE: This theme has been designed as a base for you to customize and fit | ||
your site's unique needs. If a feature is not something most people will use, | ||
it likely won't be considered. When in doubt ask. | ||
--> | ||
|
||
## Drawbacks | ||
|
||
<!-- | ||
Why should this enhancement or feature **not** be considered? | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- | ||
name: "Question" | ||
about: "Having trouble working with the theme?" | ||
--- | ||
|
||
<!-- | ||
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 http://talk.jekyllrb.com/ | ||
After exhausting these suggestions ask your question below. | ||
NOTE: Please provide a code repository, gist, code snippet, sample files, or | ||
screenshots to triage your issue. | ||
--> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<!-- | ||
Thanks for creating a Pull Request! Before you submit, please make sure | ||
you've done the following: | ||
- Read the contributing document at https://github.com/mmistakes/minimal-mistakes#contributing | ||
--> | ||
|
||
<!-- | ||
Choose one of the following by uncommenting it: | ||
--> | ||
|
||
<!-- This is a bug fix. --> | ||
<!-- This is an enhancement or feature. --> | ||
<!-- This is a documentation change. --> | ||
|
||
## Summary | ||
|
||
<!-- | ||
Provide a description of what your pull request changes. | ||
--> | ||
|
||
## Context | ||
|
||
<!-- | ||
Is this related to any GitHub issue(s)? | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,29 @@ | ||
*.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 | ||
_site | ||
codekit-config.json | ||
example/_site | ||
Gemfile.lock | ||
node_modules | ||
npm-debug.log* |
Oops, something went wrong.