From 758f07cadc0b39fbe574450cafcb680a8e721e93 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Thu, 30 Mar 2017 22:32:10 +0200
Subject: [PATCH] Fixed incorrectly set site url, if given
---
material/partials/header.html | 4 ++--
src/partials/header.html | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/material/partials/header.html b/material/partials/header.html
index ce671b39..d43b2edd 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -3,11 +3,11 @@
<div class="md-flex">
<div class="md-flex__cell md-flex__cell--shrink">
{% if config.extra.logo %}
- <a href="{{ nav.homepage.url }}" title="{{ config.site_name }}" class="md-logo md-header-nav__button">
+ <a href="{{ config.site_url | default(nav.homepage.url, true) }}" title="{{ config.site_name }}" class="md-logo md-header-nav__button">
<img src="{{ base_url }}/{{ config.extra.logo }}" width="24" height="24">
</a>
{% else %}
- <a href="{{ nav.homepage.url }}" title="{{ config.site_name }}" class="md-icon md-icon--home md-header-nav__button">
+ <a href="{{ config.site_url | default(nav.homepage.url, true) }}" title="{{ config.site_name }}" class="md-icon md-icon--home md-header-nav__button">
</a>
{% endif %}
</div>
diff --git a/src/partials/header.html b/src/partials/header.html
index 3b849f37..523529ff 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -30,13 +30,15 @@
<!-- Link to home -->
<div class="md-flex__cell md-flex__cell--shrink">
{% if config.extra.logo %}
- <a href="{{ nav.homepage.url }}" title="{{ config.site_name }}"
+ <a href="{{ config.site_url | default(nav.homepage.url, true) }}"
+ title="{{ config.site_name }}"
class="md-logo md-header-nav__button">
<img src="{{ base_url }}/{{ config.extra.logo }}"
width="24" height="24" />
</a>
{% else %}
- <a href="{{ nav.homepage.url }}" title="{{ config.site_name }}"
+ <a href="{{ config.site_url | default(nav.homepage.url, true) }}"
+ title="{{ config.site_name }}"
class="md-icon md-icon--home md-header-nav__button">
</a>
{% endif %}
--
GitLab