From 86c2fb49dc44155969ddaef3aa943756dc346bae Mon Sep 17 00:00:00 2001 From: Tom Richards Date: Sun, 4 Dec 2016 23:25:52 -0500 Subject: [PATCH 1/5] Fix link to Discourse.org homepage in noscript section (#699) --- _includes/comments-providers/discourse.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html index 1d772381..aca62cc8 100644 --- a/_includes/comments-providers/discourse.html +++ b/_includes/comments-providers/discourse.html @@ -9,5 +9,5 @@ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d); })(); - -{% endif %} \ No newline at end of file + +{% endif %} From cc1f09c54c19946a705157e07abf85f4c2a4e2ac Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 12 Dec 2016 14:49:53 -0500 Subject: [PATCH 2/5] Fix padding issue with pagination buttons - Close #694 --- _sass/_navigation.scss | 1 + docs/_sass/_navigation.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss index a5b30144..a5da695d 100644 --- a/_sass/_navigation.scss +++ b/_sass/_navigation.scss @@ -75,6 +75,7 @@ margin-left: -1px; a { + display: block; margin-bottom: 0.25em; padding: 0.5em 1em; font-family: $sans-serif; diff --git a/docs/_sass/_navigation.scss b/docs/_sass/_navigation.scss index a5b30144..a5da695d 100644 --- a/docs/_sass/_navigation.scss +++ b/docs/_sass/_navigation.scss @@ -75,6 +75,7 @@ margin-left: -1px; a { + display: block; margin-bottom: 0.25em; padding: 0.5em 1em; font-family: $sans-serif; From 2215ee5c0624087a010229a35eae44b2d9b76598 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 12 Dec 2016 15:21:10 -0500 Subject: [PATCH 3/5] Add include for adding custom author profile links to sidebar --- _includes/author-profile-custom-links.html | 7 + _includes/author-profile.html | 236 +++++++++++------- docs/_docs/10-layouts.md | 31 ++- .../author-profile-custom-links.html | 7 + docs/_includes/author-profile.html | 230 ++++++++++------- 5 files changed, 310 insertions(+), 201 deletions(-) create mode 100644 _includes/author-profile-custom-links.html create mode 100644 docs/_includes/author-profile-custom-links.html diff --git a/_includes/author-profile-custom-links.html b/_includes/author-profile-custom-links.html new file mode 100644 index 00000000..3560e258 --- /dev/null +++ b/_includes/author-profile-custom-links.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 6b849a3f..bb822345 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -30,162 +30,204 @@ diff --git a/docs/_docs/10-layouts.md b/docs/_docs/10-layouts.md index 7e4b789b..2409d61b 100644 --- a/docs/_docs/10-layouts.md +++ b/docs/_docs/10-layouts.md @@ -7,7 +7,7 @@ single_layout_gallery: alt: "single layout with header example" - image_path: /assets/images/mm-layout-single-meta.png alt: "single layout with comments and related posts" -modified: 2016-10-06T23:02:37-04:00 +modified: 2016-12-12T15:20:20-05:00 --- {% include toc icon="columns" title="Included Layouts" %} @@ -333,16 +333,19 @@ defaults: The theme comes pre-built with a selection of links for the most common social media networks. These are all optional and can be [assigned in `_config.yml`]({{ "/docs/configuration/" | absolute_url }}). -To add more links you'll need to crack open [`_includes/author-profile.html`](https://github.com/mmistakes/minimal-mistakes/blob/master/_includes/author-profile.html) and make some edits. +To add more links you'll need to crack open [`_includes/author-profile-custom-links.html`](https://github.com/mmistakes/minimal-mistakes/blob/master/_includes/author-profile-custom-links.html) and add the appropriate `
  • ` markup shown below. -Inside of `
      ` you'll find `
    • ` elements wrapped in Liquid conditionals. These represent each of the possible links you can currently add to the sidebar. +**Please note:** Links added here will appear after the ones in [`_includes/author-profile.html`](https://github.com/mmistakes/minimal-mistakes/blob/master/_includes/author-profile.html). If you'd like to change the order of appearance you'll need to edit that file directly. +{: .notice--info} -#### Example of Twitter link +#### Social network link example ```html -{% raw %}{% if author.twitter %} -
    • Twitter
      • -{% endif %}{% endraw %} +
    • + + Awesome Social Network + +
      • ``` To add a new link you'll need three things: @@ -351,7 +354,7 @@ To add a new link you'll need three things: 2. [Font Awesome icon](http://fontawesome.io/icons/) (`fa-` class) 3. Label for the link -It's up to you if you want to wrap it in a `{% raw %}{% if %} ... {% endif %}{% endraw %}`conditional and add variables to `_config.yml`. If you don't plan to change it then hard-coding the strings is perfectly acceptable. +It's up to you if you want to wrap it in a `{% raw %}{% if %} ... {% endif %}{% endraw %}`conditional and add a variable to `_config.yml`. If you don't plan to change it then hard-coding the string is perfectly acceptable. Let's run through how you'd add a new link that points to a Reddit profile. Starting with the three things from above: @@ -362,13 +365,21 @@ Let's run through how you'd add a new link that points to a Reddit profile. Star And plug them into the appropriate locations: ```html -
    • [3]
      • +
    • + + [3] + +
      • ``` To end up with: ```html -
    • Reddit
      • +
    • + + Reddit + +
      • ``` ![Reddit link in author profile]({{ "/assets/images/mm-author-profile-reddit-gs.png" | absolute_url }}) diff --git a/docs/_includes/author-profile-custom-links.html b/docs/_includes/author-profile-custom-links.html new file mode 100644 index 00000000..3560e258 --- /dev/null +++ b/docs/_includes/author-profile-custom-links.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/docs/_includes/author-profile.html b/docs/_includes/author-profile.html index f6637c8f..bb822345 100644 --- a/docs/_includes/author-profile.html +++ b/docs/_includes/author-profile.html @@ -30,16 +30,14 @@ From 66a07a67f895cc1fd85b77b895c0b287005a8664 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 12 Dec 2016 15:27:00 -0500 Subject: [PATCH 4/5] Update CHANGELOG and history --- CHANGELOG.md | 11 +++++++++++ docs/_docs/18-history.md | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 131c4233..f2a90932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [4.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.1.0) + +### Enhancements + +- Add Jekyll include for adding [custom author profile links](https://github.com/mmistakes/minimal-mistakes/blob/master/_includes/author-profile-custom-links.html) to sidebar + +### Bug Fixes + +- Fix link to Discourse.org homepage in `noscript` section [#699](https://github.com/mmistakes/minimal-mistakes/pull/699) +- Fix padding issue with pagination buttons [#694](https://github.com/mmistakes/minimal-mistakes/issues/694) + ## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10) ### Bug Fixes diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index e6cd23da..473284c5 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,9 +4,20 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -modified: 2016-12-01T15:44:03-05:00 +modified: 2016-12-12T15:26:47-05:00 --- +## [4.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.1.0) + +### Enhancements + +- Add Jekyll include for adding [custom author profile links](https://github.com/mmistakes/minimal-mistakes/blob/master/_includes/author-profile-custom-links.html) to sidebar + +### Bug Fixes + +- Fix link to Discourse.org homepage in `noscript` section [#699](https://github.com/mmistakes/minimal-mistakes/pull/699) +- Fix padding issue with pagination buttons [#694](https://github.com/mmistakes/minimal-mistakes/issues/694) + ## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10) ### Bug Fixes From 89d602c3f3629b9af9a9917a49318d00bad60c1b Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 12 Dec 2016 15:28:30 -0500 Subject: [PATCH 5/5] Bump version to 4.1.0 --- docs/_pages/home.md | 2 +- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_pages/home.md b/docs/_pages/home.md index af38ea1b..c42a032b 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -7,7 +7,7 @@ header: cta_label: " Install Now" cta_url: "/docs/quick-start-guide/" caption: -excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
      Latest release v4.0.10

      {::nomarkdown} {:/nomarkdown}' +excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
      Latest release v4.1.0

      {::nomarkdown} {:/nomarkdown}' feature_row: - image_path: /assets/images/mm-customizable-feature.png alt: "customizable" diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index 96dcbe7c..44716e38 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/minimal-mistakes-jekyll.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "minimal-mistakes-jekyll" - spec.version = "4.0.10" + spec.version = "4.1.0" spec.authors = ["Michael Rose"] spec.summary = %q{A flexible two-column Jekyll theme.} diff --git a/package.json b/package.json index bae2cd98..81a93899 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "4.0.10", + "version": "4.1.0", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",