feat(style): adjust style of header, tags and dynamic-to-top button

8 files changed, 40 insertions, 44 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 80eac99..aeff9cf 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -56,7 +56,7 @@
 
         {{- /* Dynamic to top button */ -}}
         <a href="#" class="dynamic-to-top animated faster" id="dynamic-to-top">
-            <span>&nbsp;</span>
+            <i class="fas fa-chevron-up fa-fw"></i>
         </a>
 
         {{- /* Load JavaScript scripts and CSS */ -}}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 7bb78d9..60c3a91 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -29,15 +29,14 @@
         </span>
 
         {{- with .Params.categories -}}
-            &nbsp;<span class="post-category">
+            &nbsp;
+            <span class="post-category">
                 {{- T "included" -}}
-                {{- range . -}}
-                    &nbsp;
-                    <span>
-                        <a href="{{ `/categories/` | relLangURL }}{{ urlize .}}">
-                            <i class="far fa-folder fa-fw"></i>{{ . | humanize }}
-                        </a>
-                    </span>
+                {{- range $index, $value := . -}}
+                    {{- if gt $index 0 }}&nbsp;{{ end -}}
+                    <a href="{{ `/categories/` | relLangURL }}{{ urlize $value }}">
+                        <i class="far fa-folder fa-fw"></i>{{ $value | humanize }}
+                    </a>
                 {{- end -}}
             </span>
         {{- end -}}
@@ -57,12 +56,10 @@
         <a href="{{ .RelPermalink }}">{{ T "readMore" }}</a>
         {{- with .Params.tags -}}
             <div class="post-tags">
-                {{- range . -}}
-                    &nbsp;<span>
-                        <a href="{{ `/tags/` | relLangURL }}{{ urlize .}}">
-                            <i class="fas fa-tag fa-fw"></i>{{ . }}
-                        </a>
-                    </span>
+                <i class="fas fa-tags fa-fw"></i>&nbsp;
+                {{- range $index, $value := . -}}
+                    {{- if gt $index 0 }},&nbsp;{{ end -}}
+                    <a href="{{ `/tags/` | relLangURL }}{{ urlize $value }}">{{ $value }}</a>
                 {{- end -}}
             </div>
         {{- end -}}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 22bdd65..d6c72e4 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -2,7 +2,7 @@
     <div class="copyright">
         {{- /* Hugo and LoveIt */ -}}
         <div class="copyright-line">
-            {{- printf (T "poweredBySome") `<a href="https://gohugo.io/" target="_blank" rel="external nofollow noopener noreffer">Hugo</a>` | safeHTML }} | {{ T "theme" }} - <a href="https://github.com/dillonzq/LoveIt" target="_blank" rel="external nofollow noopener noreffer">LoveIt<i class="far fa-heart fa-fw"></i></a>
+            {{- printf (T "poweredBySome") `<a href="https://gohugo.io/" target="_blank" rel="external nofollow noopener noreffer">Hugo</a>` | safeHTML }} | {{ T "theme" }} - <a href="https://github.com/dillonzq/LoveIt" target="_blank" rel="external nofollow noopener noreffer"><i class="far fa-heart fa-fw"></i> LoveIt</a>
         </div>
 
         <div class="copyright-line">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 036a2ba..1e4b0c8 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,15 +8,19 @@
         </div>
         <div class="menu">
             {{- range .Site.Menus.main -}}
-                <a class="menu-item{{ if $.IsMenuCurrent "main" . | or ($.HasMenuCurrent "main" .) | or (.URL | relLangURL | string | eq $.RelPermalink ) }} active{{ end }}" href="{{ .URL | relLangURL }}"{{ with .Title }} title="{{ . }}"{{ end }}>
+                <a class="menu-item{{ if $.IsMenuCurrent "main" . | or ($.HasMenuCurrent "main" .) | or (.URL | relLangURL | string | eq $.RelPermalink ) }} active{{ end }}" href="{{ .URL | relLangURL }}"{{ with .Title }} title="{{ . }}"{{ end }} rel="noopener noreffer"{{ if strings.HasPrefix .URL "http" }} target="_blank"{{ end }}>
                     {{- .Pre | safeHTML }}{{ .Name -}}
                 </a>
             {{- end -}}
+            <span class="menu-item">|</span>
+            <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
+                <i class="fas fa-adjust fa-fw"></i>
+            </a>
             {{- if .Site.IsMultiLingual -}}
-                &nbsp;|&nbsp;
                 <a href="javascript:void(0);" class="menu-item" title="{{ T "selectLanguage" }}">
-                    <i class="fas fa-language fa-fw"></i>&nbsp;
-                    <select class="language-select" onchange="location = this.value;">
+                    {{- .Language.LanguageName -}}
+                    <i class="fas fa-chevron-right fa-fw"></i>
+                    <select class="language-select" id="language-select-desktop" onchange="location = this.value;">
                         {{- range .Page.AllTranslations -}}
                             {{- $translation := . -}}
                             {{- range $.Site.Languages -}}
@@ -32,9 +36,6 @@
                     </select>
                 </a>
             {{- end -}}
-            <a href="javascript:void(0);" class="theme-switch" title="{{ T "switchTheme" }}">
-                <i class="fas fa-adjust fa-fw "></i>
-            </a>
         </div>
     </div>
 </header>
@@ -55,13 +56,17 @@
         <div class="menu" id="menu-mobile">
             {{- $currentPage := . -}}
             {{- range .Site.Menus.main -}}
-                <a class="menu-item" href="{{ .URL | relLangURL }}" title="{{ .Title }}">
+                <a class="menu-item" href="{{ .URL | relLangURL }}" title="{{ .Title }}" rel="noopener noreffer"{{ if strings.HasPrefix .URL "http" }} target="_blank"{{ end }}>
                     {{- .Pre | safeHTML }}{{ .Name -}}
                 </a>
             {{- end -}}
+            <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
+                <i class="fas fa-adjust fa-fw"></i>
+            </a>
             {{- if .Site.IsMultiLingual -}}
                 <a href="javascript:void(0);" class="menu-item" title="{{ T "selectLanguage" }}">
-                    <i class="fas fa-language fa-fw"></i>&nbsp;
+                    {{- .Language.LanguageName -}}
+                    <i class="fas fa-chevron-right fa-fw"></i>
                     <select class="language-select" onchange="location = this.value;">
                         {{- range .Page.AllTranslations -}}
                             {{- $translation := . -}}
@@ -78,9 +83,6 @@
                     </select>
                 </a>
             {{- end -}}
-            <a href="javascript:void(0);" class="theme-switch" title="{{ T "switchTheme" }}">
-                <i class="fas fa-adjust fa-fw"></i>
-            </a>
         </div>
     </div>
 </header>
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index 18d7d7f..1d62c15 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -44,12 +44,10 @@
     <div class="post-info-more">
         <section>
             {{- with .Params.tags -}}
-                {{- range . -}}
-                    <span>
-                        <a href="{{ `/tags/` | relLangURL }}{{ urlize .}}">
-                            <i class="fas fa-tag fa-fw"></i>{{ . }}
-                        </a>
-                    </span>&nbsp;
+                <i class="fas fa-tags fa-fw"></i>&nbsp;
+                {{- range $index, $value := . -}}
+                    {{- if gt $index 0 }},&nbsp;{{ end -}}
+                    <a href="{{ `/tags/` | relLangURL }}{{ urlize $value }}">{{ $value }}</a>
                 {{- end -}}
             {{- end -}}
         </section>
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 4456e7d..f3f8b01 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -17,15 +17,14 @@
                 </span>
 
                 {{- with .Params.categories -}}
-                    &nbsp;<span class="post-category">
+                    &nbsp;
+                    <span class="post-category">
                         {{- T "included" -}}
-                        {{- range . -}}
-                            &nbsp;
-                            <span>
-                                <a href="{{ `/categories/` | relLangURL }}{{ urlize .}}">
-                                    <i class="far fa-folder fa-fw"></i>{{ . | humanize }}
-                                </a>
-                            </span>
+                        {{- range $index, $value := . -}}
+                            {{- if gt $index 0 }}&nbsp;{{ end -}}
+                            <a href="{{ `/categories/` | relLangURL }}{{ urlize $value }}">
+                                <i class="far fa-folder fa-fw"></i>{{ $value | humanize }}
+                            </a>
                         {{- end -}}
                     </span>
                 {{- end -}}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 0c309e2..34bd9d6 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -1,5 +1,5 @@
 {{- define "title" -}}
-    {{- .Title | humanize }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}}
+    {{- .Title }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}}
 {{- end -}}
 
 {{- define "content" -}}
diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html
index 5baf66e..83f7b63 100644
--- a/layouts/taxonomy/terms.html
+++ b/layouts/taxonomy/terms.html
@@ -1,5 +1,5 @@
 {{- define "title" -}}
-    {{- T "all" }}{{ T .Data.Plural | default (humanize .Data.Plural) }} | {{ .Site.Title -}}
+    {{- .Title | default (T .Data.Plural) | default (humanize .Data.Plural) }} | {{ .Site.Title -}}
 {{- end -}}
 
 {{- define "content" -}}