From af74703d2ec7a72aea26de7d009166866f99e55f Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 7 Dec 2017 18:09:56 -0500 Subject: [PATCH 1/6] Remove default layout --- docs/_layouts/default.html | 46 -------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 docs/_layouts/default.html diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html deleted file mode 100644 index 396dcb9f..00000000 --- a/docs/_layouts/default.html +++ /dev/null @@ -1,46 +0,0 @@ ---- ---- - - - - - - {% include head.html %} - {% include head/custom.html %} - - - - - {% include browser-upgrade.html %} - {% include masthead.html %} - - {{ content }} - - -
- -
- - -
-
- {% include footer/custom.html %} - {% include footer.html %} -
-
- - {% include scripts.html %} - - - \ No newline at end of file From c2a4381d61038bb5f53a0e418d3f7e34dedfaee2 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 7 Dec 2017 18:14:30 -0500 Subject: [PATCH 2/6] Add AdSense back to demo site --- docs/_layouts/default.html | 54 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 docs/_layouts/default.html diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html new file mode 100644 index 00000000..ff5ad647 --- /dev/null +++ b/docs/_layouts/default.html @@ -0,0 +1,54 @@ +--- +--- + + + + + + {% include head.html %} + {% include head/custom.html %} + + + + + {% include browser-upgrade.html %} + {% include masthead.html %} + +
+ {{ content }} + + +
+ +
+ +
+ + {% if site.search == true %} +
+ {% include search_form.html %} +
+ {% endif %} + +
+
+ {% include footer/custom.html %} + {% include footer.html %} +
+
+ + {% include scripts.html %} + + + \ No newline at end of file From 4668761456ef751e6f63f5e211197e9919d9b2f9 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 7 Dec 2017 19:06:53 -0500 Subject: [PATCH 3/6] Remove beta note --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 146b2d11..c03c4a83 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,6 @@ To update the theme run `bundle update`. - jekyll-remote-theme ``` -**Note:** [jekyll-remote-theme](https://github.com/benbalter/jekyll-remote-theme) is currently in beta on GitHub Pages. In my tests it works as advertised, with the occasional failure due to missing `_includes` and `_layouts` --- your results may vary. - ## Usage For detailed instructions on how to configure, customize, add/migrate content, and more read the [theme's documentation](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/). From 11d67b6fa1916ec6d22da64e8b79ce8caef4b894 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 7 Dec 2017 19:10:30 -0500 Subject: [PATCH 4/6] Move zh-HK fix under Bug Fixes in CHANGELOG --- CHANGELOG.md | 2 +- docs/_docs/18-history.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a27afd9..6a663983 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ * Add optional `description` key to masthead links for clarifying their purpose with the `title` attribute. [#1380](https://github.com/mmistakes/minimal-mistakes/pull/1380) * Incorporate site search into masthead. [#1383](https://github.com/mmistakes/minimal-mistakes/pull/1383) * Update gem dependencies. [#1388](https://github.com/mmistakes/minimal-mistakes/pull/1388) -* Fix zh-HK UI text to point to Traditional Chinese. [#1374](https://github.com/mmistakes/minimal-mistakes/issues/1374) [#1389](https://github.com/mmistakes/minimal-mistakes/pull/1389) ### Bug Fixes @@ -19,6 +18,7 @@ * Rename Naver verification `naver_site_verification` to be consistent with other site variables. * Fix button class in "Post with Table Of Contents" demo content. [#1368](https://github.com/mmistakes/minimal-mistakes/pull/1368) * Fix capitalization of WordPress in documentation. [#1381](https://github.com/mmistakes/minimal-mistakes/pull/1381) +* Fix zh-HK UI text to point to Traditional Chinese. [#1374](https://github.com/mmistakes/minimal-mistakes/issues/1374) [#1389](https://github.com/mmistakes/minimal-mistakes/pull/1389) ## [4.7.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.7.1) diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index 731e6c64..a650f0b1 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,7 +4,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2017-12-07T10:28:26-05:00 +last_modified_at: 2017-12-07T19:10:10-05:00 toc: true --- @@ -20,7 +20,6 @@ toc: true * Add optional `description` key to masthead links for clarifying their purpose with the `title` attribute. [#1380](https://github.com/mmistakes/minimal-mistakes/pull/1380) * Incorporate site search into masthead. [#1383](https://github.com/mmistakes/minimal-mistakes/pull/1383) * Update gem dependencies. [#1388](https://github.com/mmistakes/minimal-mistakes/pull/1388) -* Fix zh-HK UI text to point to Traditional Chinese. [#1374](https://github.com/mmistakes/minimal-mistakes/issues/1374) [#1389](https://github.com/mmistakes/minimal-mistakes/pull/1389) ### Bug Fixes @@ -29,6 +28,7 @@ toc: true * Rename Naver verification `naver_site_verification` to be consistent with other site variables. * Fix button class in "Post with Table Of Contents" demo content. [#1368](https://github.com/mmistakes/minimal-mistakes/pull/1368) * Fix capitalization of WordPress in documentation. [#1381](https://github.com/mmistakes/minimal-mistakes/pull/1381) +* Fix zh-HK UI text to point to Traditional Chinese. [#1374](https://github.com/mmistakes/minimal-mistakes/issues/1374) [#1389](https://github.com/mmistakes/minimal-mistakes/pull/1389) ## [4.7.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.7.1) From 5490b6f46a21d715f14766b8b73bf4d60c0b145c Mon Sep 17 00:00:00 2001 From: Staticman Date: Sat, 9 Dec 2017 17:52:04 +0000 Subject: [PATCH 5/6] New comment (#1392) --- .../comment-1512840683260.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docs/_data/comments/layout-header-overlay-image/comment-1512840683260.yml diff --git a/docs/_data/comments/layout-header-overlay-image/comment-1512840683260.yml b/docs/_data/comments/layout-header-overlay-image/comment-1512840683260.yml new file mode 100644 index 00000000..7a2e2f5b --- /dev/null +++ b/docs/_data/comments/layout-header-overlay-image/comment-1512840683260.yml @@ -0,0 +1,10 @@ +_id: c6489fc0-dd06-11e7-be15-a3469e549c00 +message: >- + Have you think about adding an "height"-limit feature to the tos, allowing + users to use very heigh images, and not struggling with custom CSS and + classes?:-) +name: Tobias Nordahl Kristensen +email: 86a84379052b26c55c912dc27ddd8647 +url: '' +hidden: '' +date: '2017-12-09T17:31:23.259Z' From 9ca57649c1fcfb64f90729cdb42fba404e428309 Mon Sep 17 00:00:00 2001 From: Andrew Newhouse Date: Mon, 11 Dec 2017 12:37:10 -0500 Subject: [PATCH 6/6] Feature: Adding linkback functionality Author avatar & Name (#1386) * adding linkback funct to author avatar & nm * rm author_class; change linkback var to home; updating config docs --- _includes/author-profile.html | 23 ++++++++++++++++++++--- _sass/minimal-mistakes/_sidebar.scss | 5 +++++ docs/_docs/05-configuration.md | 1 + 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 55ddae20..99191b6b 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -9,15 +9,32 @@ {% if author.avatar %}
{% if author.avatar contains "://" %} - {{ author.name }} + {% assign author_src = author.avatar %} {% else %} - {{ author.name }} + {% assign author_src = author.avatar | absolute_url %} + {% endif %} + + {% if author.home %} + {% if author.home contains "://" %} + {% assign author_link = author.home %} + {% else %} + {% assign author_link = author.home | absolute_url %} + {% endif %} + + {{ author.name }} + + {% else %} + {{ author.name }} {% endif %}
{% endif %}
-

{{ author.name }}

+ {% if author.home %} +

{{ author.name }}

 + {% else %} +

{{ author.name }}

+ {% endif %} {% if author.bio %}

{{ author.bio }} diff --git a/_sass/minimal-mistakes/_sidebar.scss b/_sass/minimal-mistakes/_sidebar.scss index 8e7d70b5..1b389bd3 100644 --- a/_sass/minimal-mistakes/_sidebar.scss +++ b/_sass/minimal-mistakes/_sidebar.scss @@ -128,6 +128,11 @@ padding-left: 0; padding-right: 0; } + + a { + color: inherit; + text-decoration: none; + } } .author__name { diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md index c59bb836..3e071924 100644 --- a/docs/_docs/05-configuration.md +++ b/docs/_docs/05-configuration.md @@ -646,6 +646,7 @@ author: bio : "My awesome biography constrained to a sentence or two goes here." email : # optional uri : "http://your-site.com" + home : # null (default), "absolute or relative url to link to author home" ``` Social media links are all optional, include the ones you want visible. In most cases you just need to add the username. If you're unsure double check `_includes/author-profile.html` to see how the URL is constructed.