From 2bbfda79ad2e5627bb22a069d04067db5cddc3bb Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Wed, 28 Jun 2023 20:21:30 +0800
Subject: [PATCH] refactor(layout): improve margin bottom of the core block
 (#1116)

Improvement of commit 73af591
---
 _includes/post-paginator.html |  2 +-
 _layouts/category.html        |  2 +-
 _layouts/home.html            | 13 ++-----------
 _layouts/page.html            |  8 ++++++--
 _layouts/tag.html             |  2 +-
 _layouts/tags.html            |  2 +-
 _sass/addon/commons.scss      |  4 ----
 7 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/_includes/post-paginator.html b/_includes/post-paginator.html
index c432d1b..668b49f 100644
--- a/_includes/post-paginator.html
+++ b/_includes/post-paginator.html
@@ -1,6 +1,6 @@
 <!-- The paginator for post list on HomgPage. -->
 
-<ul class="pagination align-items-center mt-4 mb-5 ps-lg-2">
+<ul class="pagination align-items-center mt-4 mb-1 ps-lg-2">
   <!-- left arrow -->
   {% if paginator.previous_page %}
     {% assign prev_url = paginator.previous_page_path | relative_url %}
diff --git a/_layouts/category.html b/_layouts/category.html
index 81ea070..84fa487 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -5,7 +5,7 @@ layout: page
 
 {% include lang.html %}
 
-<div id="page-category" class="mb-5">
+<div id="page-category">
   <h1 class="ps-lg-2">
     <i class="far fa-folder-open fa-fw text-muted"></i>
     {{ page.title }}
diff --git a/_layouts/home.html b/_layouts/home.html
index ccc08f2..4cda9e4 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -40,16 +40,7 @@ refactor: true
   {% endfor %}
 {% endif %}
 
-{% if paginator.total_pages > 1 %}
-  {% assign has_paginator = true %}
-{% endif %}
-
-<div
-  id="post-list"
-  {% unless has_paginator %}
-    class="mb-5"
-  {% endunless %}
->
+<div id="post-list">
   {% for post in posts %}
     <a href="{{ post.url | relative_url }}" class="card-wrapper">
       <div class="card post-preview flex-md-row-reverse">
@@ -114,6 +105,6 @@ refactor: true
 </div>
 <!-- #post-list -->
 
-{% if has_paginator %}
+{% if paginator.total_pages > 1 %}
   {% include post-paginator.html %}
 {% endif %}
diff --git a/_layouts/page.html b/_layouts/page.html
index 9899308..148f873 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,7 +5,11 @@ layout: default
 {% include lang.html %}
 {% include origin-type.html %}
 
-<div class="row">
+{% if layout.tail_includes %}
+  {% assign has_tail = true %}
+{% endif %}
+
+<div class="row{% unless has_tail %} mb-5{% endunless %}">
   <!-- core -->
   <div id="core-wrapper" class="col-12 col-lg-11 col-xl-9 pe-xl-4">
     {% capture padding %}
@@ -52,7 +56,7 @@ layout: default
 </div>
 
 <!-- tail -->
-{% if layout.tail_includes %}
+{% if has_tail %}
   <div class="row">
     <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 px-3 pe-xl-4 mt-5">
       {% for _include in layout.tail_includes %}
diff --git a/_layouts/tag.html b/_layouts/tag.html
index 118c4e9..3b90b8c 100644
--- a/_layouts/tag.html
+++ b/_layouts/tag.html
@@ -5,7 +5,7 @@ layout: page
 
 {% include lang.html %}
 
-<div id="page-tag" class="mb-5">
+<div id="page-tag">
   <h1 class="ps-lg-2">
     <i class="fa fa-tag fa-fw text-muted"></i>
     {{ page.title }}
diff --git a/_layouts/tags.html b/_layouts/tags.html
index cf8cc76..7800ca0 100644
--- a/_layouts/tags.html
+++ b/_layouts/tags.html
@@ -3,7 +3,7 @@ layout: page
 # All the Tags of posts.
 ---
 
-<div id="tags" class="d-flex flex-wrap mx-xl-2 mb-5">
+<div id="tags" class="d-flex flex-wrap mx-xl-2">
   {% assign tags = '' | split: '' %}
   {% for t in site.tags %}
     {% assign tags = tags | push: t[0] %}
diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss
index fd48b8d..67a40a2 100644
--- a/_sass/addon/commons.scss
+++ b/_sass/addon/commons.scss
@@ -1213,10 +1213,6 @@ $btn-mb: 0.5rem;
   }
 
   #core-wrapper {
-    min-height: calc(
-      100vh - #{$topbar-height} - #{$footer-height-mobile}
-    ) !important;
-
     .post-content {
       > blockquote[class^='prompt-'] {
         @include ml-mr(-1.25rem);