refactor: optimize the basic layouts

_layouts/default.html

@@ -8,14 +8,8 @@ layout: compress
 
 {% include lang.html %}
 
-{% capture prefer_mode %}
+{% if site.theme_mode %}
-  {% if site.theme_mode %}
+  {% capture prefer_mode %}data-mode="{{ site.theme_mode }}"{% endcapture %}
-    data-mode="{{ site.theme_mode }}"
-  {% endif %}
-{% endcapture %}
-
-{% if layout.tail_includes %}
-  {% assign has_tail = true %}
 {% endif %}
 
 <!-- `site.alt_lang` can specify a language different from the UI -->
@@ -30,11 +24,12 @@ layout: compress
         {% include topbar.html lang=lang %}
 
         <div class="row flex-grow-1">
-          <main
+          <main aria-label="Main Content" class="col-12 col-lg-11 col-xl-9 px-md-4">
-            aria-label="Main Content"
+            {% if layout.refactor or layout.layout == 'default' %}
-            class="col-12 col-lg-11 col-xl-9 px-md-4{% unless has_tail %} pb-5{% endunless %}"
+              {% include refactor-content.html content=content lang=lang %}
-          >
+            {% else %}
               {{ content }}
+            {% endif %}
           </main>
 
           <!-- panel -->
@@ -54,12 +49,10 @@ layout: compress
         <div class="row">
           <!-- tail -->
           <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 px-md-4">
-            {% if has_tail %}
             {% for _include in layout.tail_includes %}
               {% assign _include_path = _include | append: '.html' %}
               {% include {{ _include_path }} lang=lang %}
             {% endfor %}
-            {% endif %}
 
             {% include_cached footer.html lang=lang %}
           </div>

_layouts/home.html

@@ -1,5 +1,6 @@
 ---
 layout: default
+refactor: true
 ---
 
 {% include lang.html %}
@@ -39,8 +40,7 @@ layout: default
   {% endfor %}
 {% endif %}
 
-{% capture _content %}
+<div id="post-list" class="flex-grow-1 px-xl-1">
-<div id="post-list" class="flex-grow-1 pe-xl-2">
   {% for post in posts %}
     <article class="card-wrapper card">
       <a href="{{ post.url | relative_url }}" class="post-preview row g-0 flex-md-row-reverse">
@@ -54,8 +54,14 @@ layout: default
 
           {% assign alt = post.image.alt | xml_escape | default: 'Preview Image' %}
 
+          {% assign lqip = null %}
+
+          {% if post.image.lqip %}
+            {% capture lqip %}lqip="{{ post.image.lqip }}"{% endcapture %}
+          {% endif %}
+
           <div class="col-md-5">
-            <img src="{{ src }}" alt="{{ alt }}" {% if post.image.lqip %}lqip="{{ post.image.lqip }}"{% endif %}>
+            <img src="{{ src }}" alt="{{ alt }}" {{ lqip }}>
           </div>
 
           {% assign card_body_col = '7' %}
@@ -106,9 +112,6 @@ layout: default
   {% endfor %}
 </div>
 <!-- #post-list -->
-{% endcapture %}
-
-{% include refactor-content.html content=_content lang=lang %}
 
 {% if paginator.total_pages > 1 %}
   {% include post-paginator.html %}

_layouts/page.html

@@ -4,14 +4,6 @@ layout: default
 
 {% include lang.html %}
 
-{% capture _content %}
-  {% if layout.refactor or page.layout == 'page' %}
-    {% include refactor-content.html content=content lang=lang %}
-  {% else %}
-    {{ content }}
-  {% endif %}
-{% endcapture %}
-
 <article class="px-1">
   {% if page.layout == 'page' or page.collection == 'tabs' %}
     {% assign tab_key = page.title | downcase %}
@@ -20,9 +12,9 @@ layout: default
       {{ title }}
     </h1>
     <div class="content">
-      {{ _content }}
+      {{ content }}
     </div>
   {% else %}
-    {{ _content }}
+    {{ content }}
   {% endif %}
 </article>

_layouts/post.html

@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: default
 refactor: true
 panel_includes:
   - toc
@@ -11,7 +11,8 @@ tail_includes:
 
 {% include lang.html %}
 
-<header>
+<article class="px-1">
+  <header>
     <h1 data-toc-skip>{{ page.title }}</h1>
 
     <div class="post-meta text-muted">
@@ -34,14 +35,12 @@ tail_includes:
         {% capture class %}class="preview-img{% if page.image.no_bg %}{{ ' no-bg' }}{% endif %}"{% endcapture %}
         {% capture alt %}alt="{{ page.image.alt | xml_escape | default: "Preview Image" }}"{% endcapture %}
 
-      {% capture lqip %}
         {% if page.image.lqip %}
-        lqip="{{ page.image.lqip }}"
+          {%- capture lqip -%}lqip="{{ page.image.lqip }}"{%- endcapture -%}
         {% endif %}
-    {% endcapture %}
 
         <div class="mt-3 mb-3">
-        <img {{ src }} {{ class }} {{ alt }} w="1200" h="630" {{ lqip | strip }}>
+          <img {{ src }} {{ class }} {{ alt }} w="1200" h="630" {{ lqip }}>
           {%- if page.image.alt -%}
             <figcaption class="text-center pt-2 pb-2">{{ page.image.alt }}</figcaption>
           {%- endif -%}
@@ -77,13 +76,13 @@ tail_includes:
       <!-- .d-flex -->
     </div>
     <!-- .post-meta -->
-</header>
+  </header>
 
-<div class="content">
+  <div class="content">
     {{ content }}
-</div>
+  </div>
 
-<div class="post-tail-wrapper text-muted">
+  <div class="post-tail-wrapper text-muted">
     <!-- categories -->
     {% if page.categories.size > 0 %}
       <div class="post-meta mb-3">
@@ -131,5 +130,6 @@ tail_includes:
       {% include post-sharing.html lang=lang %}
     </div>
     <!-- .post-tail-bottom -->
-</div>
+  </div>
-<!-- div.post-tail-wrapper -->
+  <!-- div.post-tail-wrapper -->
+</article>

_sass/addon/commons.scss

@@ -148,7 +148,6 @@ footer {
   }
 
   p {
-    line-height: 1.75;
     text-align: center;
     margin-bottom: 0;
   }
@@ -820,9 +819,11 @@ $btn-mb: 0.5rem;
     padding-right: 1rem;
     margin-bottom: 1.5rem;
 
+    $btn-size: 1.75rem;
+
     %button {
-      width: 1.75rem;
+      width: $btn-size;
-      height: 1.75rem;
+      height: $btn-size;
       margin-bottom: $btn-mb; // multi line gap
       border-radius: 50%;
       color: var(--sidebar-btn-color);
@@ -849,7 +850,7 @@ $btn-mb: 0.5rem;
     }
 
     i {
-      line-height: 1.75rem;
+      line-height: $btn-size;
     }
 
     .mode-toggle {
@@ -1129,10 +1130,6 @@ search {
   > :not(script) {
     margin-top: 3rem;
   }
-
-  > :only-child {
-    margin-top: 0;
-  }
 }
 
 /* --- button back-to-top --- */