fix(layout): restore the margin bottom of the main area (cotes2020#1047)

gudtldn · Jul 26, 2024 · ccfc928 · ccfc928
1 parent 1d3888c
commit ccfc928
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git 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 my-4 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/page.html b/_layouts/page.html
@@ -5,7 +5,11 @@
 {% 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 @@ <h1 class="dynamic-title">
 </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/_sass/addon/commons.scss b/_sass/addon/commons.scss
@@ -1113,10 +1113,6 @@ $btn-mb: 0.5rem;
       @extend %no-bottom-border;
     }
   }
-
-  @at-root .row:only-child > #{&} {
-    padding-bottom: 3rem;
-  }
 }
 
 #mask {

diff --git a/_sass/layout/home.scss b/_sass/layout/home.scss
@@ -5,10 +5,6 @@
 #post-list {
   margin-top: 2rem;
 
-  &:only-child {
-    margin-bottom: 3.75rem;
-  }
-
   a.card-wrapper {
     display: block;