From 0b13dadaacc964ad275794f457ec587069b890e9 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Thu, 8 Apr 2021 21:35:11 +0300
Subject: use relative_url instead of site.baseurl

---
 _includes/common/header.html    | 6 +++---
 _includes/common/navbar.html    | 4 ++--
 _includes/common/paginator.html | 8 ++++----
 _includes/common/sidebar.html   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to '_includes')

diff --git a/_includes/common/header.html b/_includes/common/header.html
index d95c0a0..8abe740 100644
--- a/_includes/common/header.html
+++ b/_includes/common/header.html
@@ -13,12 +13,12 @@
 
     {% include common/bootstrap_css.html %}
 
-    <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/common/footer.css">
-    <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/common/misc.css">
+    <link rel="stylesheet" href="{{ '/assets/css/common/footer.css' | relative_url }}">
+    <link rel="stylesheet" href="{{ '/assets/css/common/misc.css' | relative_url }}">
 
     {% if page.custom_css %}
       {% for css in page.custom_css %}
-        <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/{{ css }}"/>
+        <link rel="stylesheet" href="{{ '/assets/css/' | relative_url }}{{ css }}"/>
       {% endfor %}
     {% endif %}
 
diff --git a/_includes/common/navbar.html b/_includes/common/navbar.html
index 6cf0e74..8ec0812 100644
--- a/_includes/common/navbar.html
+++ b/_includes/common/navbar.html
@@ -21,9 +21,9 @@
           {% endif %}
           {% if node.groups contains 'navbar' %}
             {% if page.url == node.url %}
-              <li class="active"><a href="{{ site.baseurl }}{{ node.url }}" class="active">{{ node.navbar_link }}</a></li>
+              <li class="active"><a href="{{ node.url | relative_url }}" class="active">{{ node.navbar_link }}</a></li>
             {% else %}
-              <li><a href="{{ site.baseurl }}{{ node.url }}">{{ node.navbar_link }}</a></li>
+              <li><a href="{{ node.url | relative_url }}">{{ node.navbar_link }}</a></li>
             {% endif %}
           {% endif %}
         {% endfor %}
diff --git a/_includes/common/paginator.html b/_includes/common/paginator.html
index 659ea87..471383c 100644
--- a/_includes/common/paginator.html
+++ b/_includes/common/paginator.html
@@ -14,7 +14,7 @@
   {% endif %}
 <ul class="pagination">
   {% if paginator.previous_page %}
-    <li><a href="{{ site.baseurl }}{{ paginator.previous_page_path }}"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
+    <li><a href="{{ paginator.previous_page_path | relative_url }}"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
   {% else %}
     <li class="disabled"><a href="#"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
   {% endif %}
@@ -22,13 +22,13 @@
     {% if page_number == paginator.page %}
       <li class="active"><a href="#">{{ page_number }}</a></li>
     {% elsif page_number == 1 %}
-      <li><a href="{{ site.baseurl }}{{ page1_url }}">{{ page_number }}</a></li>
+      <li><a href="{{ page1_url | relative_url }}">{{ page_number }}</a></li>
     {% else %}
-      <li><a href="{{ site.baseurl }}{{ site.paginate_path | replace: ':num', page_number }}">{{ page_number }}</a></li>
+      <li><a href="{{ site.paginate_path | replace: ':num', page_number | relative_url }}">{{ page_number }}</a></li>
     {% endif %}
   {% endfor %}
   {% if paginator.next_page %}
-    <li><a href="{{ site.baseurl }}{{ paginator.next_page_path }}">Next&nbsp;<span class="glyphicon glyphicon-chevron-right"></span></a></li>
+    <li><a href="{{ paginator.next_page_path | relative_url }}">Next&nbsp;<span class="glyphicon glyphicon-chevron-right"></span></a></li>
   {% else %}
     <li class="disabled"><a href="#">Next&nbsp;<span class="glyphicon glyphicon-chevron-right"></span></a></li>
   {% endif %}
diff --git a/_includes/common/sidebar.html b/_includes/common/sidebar.html
index 76cced0..923eb04 100644
--- a/_includes/common/sidebar.html
+++ b/_includes/common/sidebar.html
@@ -14,7 +14,7 @@
     {% else %}
     <div class="list-group wide-enough">
       {% for post in site.posts limit: 5 %}
-      <a class="list-group-item" href="{{ site.baseurl }}{{ post.url }}">
+      <a class="list-group-item" href="{{ post.url | relative_url }}">
         <span class="badge"><span class="glyphicon glyphicon-time"></span>&nbsp;{{ post.date | date: '%-d %b %Y' }}</span>
         <span class="glyphicon glyphicon-file"></span>&nbsp;{{ post.title }}
       </a>
-- 
cgit v1.2.3