From 3caacbee611936252f62a52d8da9d544ed9fddda Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 2 Dec 2021 21:18:18 +0800
Subject: [PATCH] Improve mobile title display

Also fixed the 404 page title on mobile screens
---
 _config.yml           |  1 -
 _includes/topbar.html |  2 +-
 _layouts/page.html    | 10 +++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/_config.yml b/_config.yml
index a58e0a7..8c7eec5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -136,7 +136,6 @@ defaults:
     values:
       layout: page
       permalink: /:title/
-      dynamic_title: true    # Hide title in mobile screens.
 
 sass:
   style: compressed
diff --git a/_includes/topbar.html b/_includes/topbar.html
index 051b12b..039434d 100644
--- a/_includes/topbar.html
+++ b/_includes/topbar.html
@@ -50,7 +50,7 @@
     <div id="topbar-title">
       {% if page.layout == 'home' %}
         {{- site.data.locales[lang].title | default: site.title -}}
-      {% elsif page.collection == 'tabs' %}
+      {% elsif page.collection == 'tabs' or page.dynamic_title %}
         {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
         {{- site.data.locales[lang].tabs[tab_key] | default: page.title -}}
       {% else %}
diff --git a/_layouts/page.html b/_layouts/page.html
index 8298b4a..77c1d1b 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -9,14 +9,10 @@ layout: default
   <!-- core -->
   <div id="core-wrapper" class="col-12 col-lg-11 col-xl-8">
     <div class="post pl-1 pr-1 pl-sm-2 pr-sm-2 pl-md-4 pr-md-4">
-    {% if page.dynamic_title %}
+    {% if page.dynamic_title or page.collection == 'tabs' %}
       <h1 class="dynamic-title">
-        {% if page.collection == 'tabs' %}
-          {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
-          {{- site.data.locales[lang].tabs[tab_key] | default: page.title -}}
-        {% else %}
-          {{- page.title -}}
-        {% endif %}
+        {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
+        {{- site.data.locales[lang].tabs[tab_key] | default: page.title -}}
       </h1>
       <div class="post-content">
         {% include refactor-content.html content=content %}