fix post footer

4 files changed, 72 insertions, 85 deletions

diff --git a/layouts/partials/plugin/icon.html b/layouts/partials/plugin/icon.html
index 5bc2a11..86eec52 100644
--- a/layouts/partials/plugin/icon.html
+++ b/layouts/partials/plugin/icon.html
@@ -1,5 +1,5 @@
 {{- with .Class -}}
-    <i class="{{ . }}"></i>
+    <span class="{{ . }}"></span>
 {{- else -}}
     {{- $src := .Src -}}
     {{- with .Simpleicons -}}
@@ -9,5 +9,5 @@
     {{- if (urls.Parse $src).Host | not -}}
         {{- $src = (resources.Get $src | minify).RelPermalink -}}
     {{- end -}}
-    <i data-svg-src="{{ $src }}"></i>
+    <span data-svg-src="{{ $src }}"></span>
 {{- end -}}
diff --git a/layouts/partials/plugin/share.html b/layouts/partials/plugin/share.html
index b32ff0f..4d837b2 100644
--- a/layouts/partials/plugin/share.html
+++ b/layouts/partials/plugin/share.html
@@ -1,5 +1,4 @@
 {{- $share := (.Scratch.Get "params").share | default dict -}}
-
 {{- if $share.enable -}}
     {{- /* 000: Telegram */ -}}
     {{- if $share.Telegram -}}
@@ -12,11 +11,11 @@
 
     {{- /* 001: Twitter */ -}}
     {{- if $share.Twitter -}}
-<div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-twitter" href="javascript:void(0);" title="{{ T `shareOn` }} Twitter" data-sharer="twitter" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Site.Params.Social.Twitter }} data-via="{{ . }}"{{ end }}{{ with .Params.tags }} data-hashtags="{{ delimit . `,` }}"{{ end }}>
             {{- dict "Class" "svg-social-icon icon-twitter" | partial "plugin/icon.html" -}}
         </a>
-</div>
+    </div>
     {{- end -}}
 
     {{- /* 002: Facebook */ -}}
@@ -30,83 +29,83 @@
 
     {{- /* 003: Linkedin */ -}}
     {{- if $share.Linkedin -}}
-        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-linkedin" href="javascript:void(0);" title="{{ T `shareOn` }} Linkedin" data-sharer="linkedin" data-url="{{ .Permalink }}">
             {{- dict "Class" "svg-social-icon icon-linkedin" | partial "plugin/icon.html" -}}
         </a>
-        </div>
+    </div>
     {{- end -}}
 
     {{- /* 004: WhatsApp */ -}}
     {{- if $share.Whatsapp -}}
-            <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-whatsapp" href="javascript:void(0);" title="{{ T `shareOn` }} WhatsApp" data-sharer="whatsapp" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-web>
             {{- dict "Class" "svg-social-icon icon-whatsapp" | partial "plugin/icon.html" -}}
         </a>
-            </div>
+    </div>
     {{- end -}}
 
     {{- /* 005: Viber */ -}}
     {{- if $share.Viber -}}
-                <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-viber" href="javascript:void(0);" title="{{ T `shareOn` }} Viber" data-sharer="viber" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-viber" | partial "plugin/icon.html" -}}
         </a>
-                </div>
+    </div>
     {{- end -}}
 
     {{- /* 006: Pinterest */ -}}
     {{- if $share.Pinterest -}}
-                    <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-pinterest" href="javascript:void(0);" title="{{ T `shareOn` }} Pinterest" data-sharer="pinterest" data-url="{{ .Permalink }}"{{ with .Description }} data-description="{{ . }}"{{ end }}{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}>
             {{- dict "Class" "svg-social-icon icon-pinterest" | partial "plugin/icon.html" -}}
         </a>
-                    </div>
+    </div>
     {{- end -}}
 
     {{- /* 007: Tumblr */ -}}
     {{- if $share.Tumblr -}}
-                        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-tumblr" href="javascript:void(0);" title="{{ T `shareOn` }} Tumblr" data-sharer="tumblr" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Description }} data-caption="{{ . }}"{{ end }}{{ with .Params.tags }} data-tags="{{ delimit . `,` }}"{{ end }}>
             {{- dict "Class" "svg-social-icon icon-tumblr" | partial "plugin/icon.html" -}}
         </a>
-                        </div>
+    </div>
     {{- end -}}
 
     {{- /* 009: Reddit */ -}}
     {{- if $share.Reddit -}}
-                            <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-reddit" href="javascript:void(0);" title="{{ T `shareOn` }} Reddit" data-sharer="reddit" data-url="{{ .Permalink }}">
             {{- dict "Class" "svg-social-icon icon-reddit" | partial "plugin/icon.html" -}}
         </a>
-                            </div>
+    </div>
     {{- end -}}
 
     {{- /* 010: VK */ -}}
     {{- if $share.VK -}}
-                                <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-vk" href="javascript:void(0);" title="{{ T `shareOn` }} VK" data-sharer="vk" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Description }} data-caption="{{ . }}"{{ end }}{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}>
             {{- dict "Class" "svg-social-icon icon-vk" | partial "plugin/icon.html" -}}
         </a>
-                                </div>
+    </div>
     {{- end -}}
 
     {{- /* 011: Buffer */ -}}
     {{- if $share.Buffer -}}
-                                    <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-buffer" href="javascript:void(0);" title="{{ T `shareOn` }} Buffer" data-sharer="buffer" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Site.Params.Social.Twitter }} data-via="{{ . }}"{{ end }}{{ with .Params.featuredImage }} data-picture="{{ . }}"{{ end }}>
             {{- dict "Class" "svg-social-icon icon-buffer" | partial "plugin/icon.html" -}}
         </a>
-                                    </div>
+    </div>
     {{- end -}}
 
     {{- /* 012: Xing */ -}}
     {{- if $share.Xing -}}
-                                        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-xing" href="javascript:void(0);" title="{{ T `shareOn` }} Xing" data-sharer="xing" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-xing" | partial "plugin/icon.html" -}}
         </a>
-                                        </div>
+    </div>
     {{- end -}}
 
     {{- /* 013: Line */ -}}
@@ -138,125 +137,127 @@
 
     {{- /* 016: Digg */ -}}
     {{- if $share.Digg -}}
-        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-digg" href="javascript:void(0);" title="{{ T `shareOn` }} Digg" data-sharer="digg" data-url="{{ .Permalink }}">
             {{- dict "Class" "svg-social-icon icon-digg" | partial "plugin/icon.html" -}}
         </a>
-        </div>
+    </div>
     {{- end -}}
 
     {{- /* 017: StumbleUpon */ -}}
     {{- if $share.Stumbleupon -}}
-            <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-stumbleupon" href="javascript:void(0);" title="{{ T `shareOn` }} StumbleUpon" data-sharer="stumbleupon" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-stumbleupon" | partial "plugin/icon.html" -}}
         </a>
-            </div>
+    </div>
     {{- end -}}
 
     {{- /* 018: Flipboard */ -}}
     {{- if $share.Flipboard -}}
-                <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-flipboard" href="javascript:void(0);" title="{{ T `shareOn` }} Flipboard" data-sharer="flipboard" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-flipboard" | partial "plugin/icon.html" -}}
         </a>
-                </div>
+    </div>
     {{- end -}}
 
     {{- /* 019: 微博 */ -}}
     {{- if $share.Weibo -}}
-                    <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-weibo" href="javascript:void(0);" title="{{ T `shareOn` }} 微博" data-sharer="weibo" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}{{ with .Site.Params.Social.Weibo }} data-ralateuid="{{ . }}"{{ end }}>
             {{- dict "Class" "svg-social-icon icon-weibo" | partial "plugin/icon.html" -}}
         </a>
-                    </div>
+    </div>
     {{- end -}}
 
     {{- /* 020: 人人 */ -}}
     {{- if $share.Renren -}}
-                        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-renren" href="javascript:void(0);" title="{{ T `shareOn` }} 人人" data-sharer="renren" data-url="{{ .Permalink }}">
             {{- dict "Class" "svg-social-icon icon-renren" | partial "plugin/icon.html" -}}
         </a>
-                        </div>
+    </div>
     {{- end -}}
 
     {{- /* 021: Myspace */ -}}
     {{- if $share.Myspace -}}
-                            <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-myspace" href="javascript:void(0);" title="{{ T `shareOn` }} Myspace" data-sharer="myspace" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
             {{- dict "Simpleicons" "myspace" "Prefix" (.Scratch.Get "cdn" | default dict).simpleIconsPrefix | partial "plugin/icon.html" -}}
         </a>
-                            </div>
+    </div>
     {{- end -}}
 
     {{- /* 022: Blogger */ -}}
     {{- if $share.Blogger -}}
-                                <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-blogger" href="javascript:void(0);" title="{{ T `shareOn` }} Blogger" data-sharer="blogger" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
             {{- dict "Class" "svg-social-icon icon-blogger" | partial "plugin/icon.html" -}}
         </a>
-                                </div>
+    </div>
     {{- end -}}
 
     {{- /* 023: 百度 */ -}}
     {{- if $share.Baidu -}}
-                                    <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-baidu" href="javascript:void(0);" title="{{ T `shareOn` }} 百度" data-sharer="baidu" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Simpleicons" "baidu" "Prefix" (.Scratch.Get "cdn" | default dict).simpleIconsPrefix | partial "plugin/icon.html" -}}
         </a>
-                                    </div>
+    </div>
     {{- end -}}
 
     {{- /* 024: OK.RU */ -}}
     {{- if $share.Odnoklassniki -}}
-                                        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-ok" href="javascript:void(0);" title="{{ T `shareOn` }} OK.RU" data-sharer="okru" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-odnoklassniki" | partial "plugin/icon.html" -}}
         </a>
-                                        </div>
+    </div>
     {{- end -}}
 
     {{- /* 025: Evernote */ -}}
     {{- if $share.Evernote -}}
-                                            <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-evernote" href="javascript:void(0);" title="{{ T `shareOn` }} Evernote" data-sharer="evernote" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-evernote" | partial "plugin/icon.html" -}}
         </a>
-                                            </div>
+    </div>
     {{- end -}}
 
     {{- /* 026: Skype */ -}}
     {{- if $share.Skype -}}
-                                                <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-skype" href="javascript:void(0);" title="{{ T `shareOn` }} Skype" data-sharer="skype" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
             {{- dict "Class" "svg-social-icon icon-skype" | partial "plugin/icon.html" -}}
         </a>
-                                                </div>
+    </div>
     {{- end -}}
 
     {{- /* 027: Trello */ -}}
     {{- if $share.Trello -}}
-                                                    <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-trello" href="javascript:void(0);" title="{{ T `shareOn` }} Trello" data-sharer="trello" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
             {{- dict "Class" "svg-social-icon icon-trello" | partial "plugin/icon.html" -}}
         </a>
-                                                    </div>
+    </div>
     {{- end -}}
 
     {{- /* 028: Mix */ -}}
     {{- if $share.Mix -}}
-                                                        <div class="share-link">
+    <div class="share-link">
         <a class="share-icon share-mix" href="//mix.com/add?url={{ .Permalink }}&amp;description={{ .Title }}" target="_blank" title="{{ T `shareOn` }} Mix">
             {{- dict "Class" "svg-social-icon icon-mix" | partial "plugin/icon.html" -}}
         </a>
-                                                        </div>
+    </div>
     {{- end -}}
 
     {{- /* 029: Hacker News */ -}}
     {{- if $share.Hackernews -}}
+    <div class="share-link">
     <a class="share-icon share-hackernews" href="javascript:void(0);" title="{{ T `shareOn` }} Hacker News" data-sharer="hackernews" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
         {{- dict "Class" "svg-social-icon icon-hacker-news" | partial "plugin/icon.html" -}}
     </a>
+    </div>
     {{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index 9cc7f11..05625f1 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -8,22 +8,29 @@
 </div>
 {{ end }}
 
-<div class="post-footer" id="post-footer">
-    {{- if and (or .PrevInSection .NextInSection) $params.showPostNav -}}
-    <div class="post-navigation">
-        {{- if .PrevInSection -}}
-        <div class="post-nav-box nav-box-prev">
-            <a class="nav-box" href="{{ .PrevInSection.RelPermalink }}"><span class="nav-icon"><svg aria-hidden="true" data-prefix="fas" data-icon="chevron-circle-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg=""><path fill="currentColor" d="M256 504C119 504 8 393 8 256S119 8 256 8s248 111 248 248-111 248-248 248zM142.1 273l135.5 135.5c9.4 9.4 24.6 9.4 33.9 0l17-17c9.4-9.4 9.4-24.6 0-33.9L226.9 256l101.6-101.6c9.4-9.4 9.4-24.6 0-33.9l-17-17c-9.4-9.4-24.6-9.4-33.9 0L142.1 239c-9.4 9.4-9.4 24.6 0 34z"></path></svg></span><div style="text-align: right;padding-left: 10px"><div class="nav-text-h">{{ T "navNext" }}</div><span class="nav-text">{{ .PrevInSection.Title }}</span></div></a>
-        </div>
-        {{- end -}}
-        {{ if .NextInSection }}
-        <div class="post-nav-box nav-box-next">
-            <a class="nav-box" href="{{ .NextInSection.RelPermalink }}"><div style="padding-right: 10px"><div class="nav-text-h">{{ T "navNext" }}</div><span class="nav-text">{{ .NextInSection.Title }}</span></div><span class="nav-icon"><svg aria-hidden="true" data-prefix="fas" data-icon="chevron-circle-right" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg=""><path fill="currentColor" d="M256 8c137 0 248 111 248 248S393 504 256 504 8 393 8 256 119 8 256 8zm113.9 231L234.4 103.5c-9.4-9.4-24.6-9.4-33.9 0l-17 17c-9.4 9.4-9.4 24.6 0 33.9L285.1 256 183.5 357.6c-9.4 9.4-9.4 24.6 0 33.9l17 17c9.4 9.4 24.6 9.4 33.9 0L369.9 273c9.4-9.4 9.4-24.6 0-34z"></path></svg></span></a>
-        </div>
-        {{- end -}}
+<div class="post-share">
+    {{- partial "plugin/share.html" . -}}
+</div>
+
+{{- $authorName := $params.author | default .Site.Author.name | default " " -}}
+{{ $author := "" }}
+{{- $authorPath := print "data/authors/" $authorName ".json" -}}
+{{ if (fileExists $authorPath) -}}
+{{ $author = index .Site.Data.authors $authorName }}
+{{ end }}
+{{ if eq ($params.authorHidden | default false) false  }}
+{{- if and (not (eq $authorName " ")) (not (eq $pageTheme "hero")) -}}
+{{- with $author -}}
+<div class="footer-post-author">
+    <div class="author-avatar"><a href="{{ with .link }} {{- . | safeHTML -}}{{ end }}" target="_blank"><img alt="{{ .about }}" src="{{ with .avatar }} {{- . | safeHTML -}}{{ end }}"></a></div>
+    <div class="author-info">
+        <div class="name"><a href="{{ with .link }} {{- . | safeHTML -}}{{ end }}" target="_blank">{{ .full_name }}</a></div>
+        <div class="number-posts">{{ .about }}</span></div>
     </div>
-    {{- end -}}
 </div>
+{{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{- with .Params.tags -}}
 <div class="post-tags">
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index b59d88c..6470780 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -58,7 +58,6 @@
         </div>
     {{- end -}}
 
-
     {{- /* Featured image */ -}}
     {{- $image := $params.featuredimage -}}
     {{- $pageImageHidden := $params.hiddenFeaturedImage -}}
@@ -221,20 +220,6 @@
             {{- end -}}
             {{- end -}}
 
-            {{ if eq ($params.authorHidden | default false) false  }}
-            {{- if and (not (eq $authorName " ")) (not (eq $pageTheme "hero")) -}}
-            {{- with $author -}}
-            <div class="footer-post-author">
-                <div class="author-avatar"><a href="{{ with .link }} {{- . | safeHTML -}}{{ end }}" target="_blank"><img alt="{{ .about }}" src="{{ with .avatar }} {{- . | safeHTML -}}{{ end }}"></a></div>
-                <div class="author-info">
-                    <div class="name"><a href="{{ with .link }} {{- . | safeHTML -}}{{ end }}" target="_blank">{{ .full_name }}</a></div>
-                    <div class="number-posts">{{ .about }}</span></div>
-                </div>
-            </div>
-            {{- end -}}
-            {{- end -}}
-            {{- end -}}
-
             {{- /* Static TOC */ -}}
             {{- if ne $toc.enable false -}}
             <div class="details toc" id="toc-static"  data-kept="{{ if $toc.keepStatic }}true{{ end }}">
@@ -278,12 +263,6 @@
     <div id="toc-final"></div>
     </article>
 
-
-    <div class="{{ if $toc.keepStatic }} post-share {{ else }} post-share post-share-toc {{ end }}">
-        {{- partial "plugin/share.html" . -}}
-    </div>
-
-
     {{- $comment := .Site.Params.Comment  -}}
     {{- if ($params.comment.enable | default $comment.enable) -}}
     <div class="page single comments content-block-position">