fix: whitespace problem in site-info in footer

reuixiy · Nov 18, 2019 · f471af6 · f471af6
1 parent aa106a7
commit f471af6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/config-examples/en-us/config.toml b/config-examples/en-us/config.toml
@@ -1022,6 +1022,8 @@ uglyURLs = false
 
     displaySiteCreatedYear = true
 
+    # Leave it empty("") if you don’t want
+    # the icon
     iconBetweenYearAndAuthor = "heart"
     iconColor = "#f06292"
     # Enable heartbeat animation?

diff --git a/config-examples/zh-cn/config.toml b/config-examples/zh-cn/config.toml
@@ -733,10 +733,10 @@ uglyURLs = false
     ######################################
     ## 字体
 
-    # 说明：任何一项留空，浏览器都会回退到主体字
-    #      体 `fontFamilyBody`，故没必要全部
-    #      设置。此外，如果你的品牌栏用的 SVG，
-    #      则可留空品牌栏字体。
+    # 说明：任何一项留空（""），浏览器都会回退到
+    #      主体字体 `fontFamilyBody`，故没必
+    #      要全部设置。此外，如果你的品牌栏用的
+    #      SVG，则可留空（""）品牌栏字体。
 
     # 品牌栏
     fontFamilySiteBrand = ""
@@ -765,7 +765,7 @@ uglyURLs = false
     #      采用网络字体。MemE 主题目前仅支持
     #      Google Fonts 的链接，请前往
     #      https://fonts.google.com/ 获取。
-    #      此项留空，则不会采用网络字体。
+    #      此项留空（""），则不会采用网络字体。
 
     ######################################
     ## 字号（单位：px）
@@ -993,7 +993,7 @@ uglyURLs = false
     # 是否显示站点的创建年份
     displaySiteCreatedYear = true
 
-    # 年份与作者之间的图标
+    # 年份与作者之间的图标，留空（""）则无
     iconBetweenYearAndAuthor = "heart"
     # 图标颜色
     iconColor = "#f06292"
@@ -1049,4 +1049,4 @@ uglyURLs = false
     # 视频地址
     fofVideoWebm = ""
     fofVideoMp4 = ""
-    # 说明：视频地址可留空
+    # 说明：视频地址可留空（""）
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -2,7 +2,7 @@
     <footer id="footer" class="footer">
         <div class="footer-inner">
             {{ if .Site.Params.displayCopyrightSymbol }}
-                {{ .Scratch.Set "siteInfoCopyright" "©" }}
+                {{ .Scratch.Set "siteInfoCopyright" "©&nbsp;" }}
             {{ else }}
                 {{ .Scratch.Set "siteInfoCopyright" "" }}
             {{ end }}
@@ -15,12 +15,14 @@
             {{ end }}
             {{ $siteInfoCreatedYear := .Scratch.Get "siteInfoCreatedYear" }}
 
-            {{ with .Site.Params.iconBetweenYearAndAuthor | default "heart" }}
-                {{ $.Scratch.Set "siteInfoIcon" (index $.Site.Data.SVG .) }}
+            {{ with .Site.Params.iconBetweenYearAndAuthor }}
+                {{ $.Scratch.Set "siteInfoIcon" (replace (index $.Site.Data.SVG .) "icon" "icon footer-icon") }}
+            {{ else }}
+                {{ $.Scratch.Set "siteInfoIcon" "&nbsp;" }}
             {{ end }}
-            {{ $siteInfoIcon := (replace (.Scratch.Get "siteInfoIcon") "icon" "icon footer-icon") }}
+            {{ $siteInfoIcon := .Scratch.Get "siteInfoIcon" }}
 
-            <div class="site-info">{{ printf `%s %s%s%s` $siteInfoCopyright $siteInfoCreatedYear $siteInfoIcon .Site.Author.name | safeHTML }}</div>
+            <div class="site-info">{{ printf `%s%s%s%s` $siteInfoCopyright $siteInfoCreatedYear $siteInfoIcon .Site.Author.name | safeHTML }}</div>
 
             {{ if .Site.Params.displayPoweredBy }}
                 <div class="powered-by">{{ printf `Powered by [Hugo](https://github.com/gohugoio/hugo) | Theme is [MemE](https://github.com/reuixiy/hugo-theme-meme)` | markdownify | safeHTML }}</div>