From 9389636a6a53153d5b931554af5a85521197ec6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?iBug=20=E2=99=A6?= Date: Thu, 30 Jan 2020 01:48:13 +0800 Subject: [PATCH] Regression for mmistakes#2332 (#2385) * Regression for mmistakes#2332 There's already a `relative_url` in place, shouldn't stack up another * Update CHANGELOG and history --- CHANGELOG.md | 6 ++++++ _includes/masthead.html | 6 +----- docs/_docs/18-history.md | 8 +++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bcf21fe7999..246d833d72a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Unreleased + +### Bug Fixes + +- Fix repeated site base path for masthead logo. [#2385](https://github.com/mmistakes/minimal-mistakes/pull/2385) + ## [4.18.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.18.1) ### Bug Fixes diff --git a/_includes/masthead.html b/_includes/masthead.html index 15be93211423..28fb6fe2fe00 100644 --- a/_includes/masthead.html +++ b/_includes/masthead.html @@ -1,8 +1,4 @@ -{% if site.logo contains "://" %} - {% capture logo_path %}{{ site.logo }}{% endcapture %} -{% else %} - {% capture logo_path %}{{ site.logo | relative_url }}{% endcapture %} -{% endif %} +{% capture logo_path %}{{ site.logo }}{% endcapture %}
diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index fea24e50b7ab..7323d7976269 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,10 +5,16 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2020-01-25T11:15:45-05:00 +last_modified_at: 2020-01-29T17:42:20+08:00 toc: false --- +## Unreleased + +### Bug Fixes + +- Fix repeated site base path for masthead logo. [#2385](https://github.com/mmistakes/minimal-mistakes/pull/2385) + ## [4.18.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.18.1) ### Bug Fixes