Merge pull request #5 from amzrk2/dev

Merge v1.2.0 dev branch

6 files changed, 25 insertions, 21 deletions

diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index a5cd49a..a1a40fd 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1 +1 @@
-<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
\ No newline at end of file
+<a href="{{ .Destination | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
\ No newline at end of file
diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index dab458f..e3ee3e5 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -23,12 +23,12 @@
 <ul id="pagination">
     {{ if ne $paginator.PageNumber 1 }}
     <li class="pag-first">
-        <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a>
+        <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></a>
     </li>
     {{ end }}
     {{ if $paginator.HasPrev }}
     <li class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a>
+        <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
     </li>
     {{ end }}
 
@@ -60,12 +60,12 @@
 
     {{ if $paginator.HasNext }}
     <li class="pag-next">
-        <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a>
+        <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
     </li>
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
     <li class="pag-last">
-        <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a>
+        <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
     </li>
     {{ end }}
 </ul>
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a1eb732..6df6ad6 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -15,9 +15,14 @@
             <div class="col-md-3 col-12 float-left" id="sidebar">
                 {{ partial "sidebar.html" . }}
             </div>
-            <div id="container-progress">
-                <div id="progress"></div>
+            {{ if .Site.Params.playerURL }}
+            <div id="aplayer"></div>
+            {{ end }}
+            {{ if .Site.Params.scrollTop }}
+            <div id="scroll-top">
+                <i class="fas fa-chevron-up"></i>
             </div>
+            {{ end }}
         </div>
     </main>
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 567e577..a2d3b47 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -13,7 +13,7 @@
         {{ .Summary }}
     </div>
     <div id="post-exlink">
-        <a href="{{ .Permalink }}#">&gt; READ MORE ...</a>
+        <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
     </div>
 </div>
 {{ end }}
@@ -26,12 +26,12 @@
 <ul id="pagination">
     {{ if ne $paginator.PageNumber 1 }}
     <li class="pag-first">
-        <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a>
+        <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a>
     </li>
     {{ end }}
     {{ if $paginator.HasPrev }}
     <li class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a>
+        <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a>
     </li>
     {{ end }}
 
@@ -63,12 +63,12 @@
 
     {{ if $paginator.HasNext }}
     <li class="pag-next">
-        <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a>
+        <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
     </li>
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
     <li class="pag-last">
-        <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a>
+        <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
     </li>
     {{ end }}
 </ul>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 04d016c..6056021 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,6 +6,9 @@
     <div id="post-meta">
         {{ partial "post-meta.html" . }}
     </div>
+    {{ with .Params.playerURL }}
+    <div id="post-aplayer"></div>
+    {{ end }}
     <div class="markdown-body" id="post-content">
         {{ .Content }}
     </div>
@@ -17,10 +20,6 @@
     </blockquote>
 </div>
 {{ end }}
-{{ if .Site.Params.utterancesComment }}
 {{ partial "comment-utterances.html" . }}
-{{ end }}
-{{ if .Site.Params.disqusComment }}
 {{ partial "comment-disqus.html" . }}
-{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index dd15f58..6a0d4d2 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -16,7 +16,7 @@
         {{ .Summary }}
     </div>
     <div id="post-exlink">
-        <a href="{{ .Permalink }}#">&gt; READ MORE ...</a>
+        <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
     </div>
 </div>
 {{ end }}
@@ -29,12 +29,12 @@
 <ul id="pagination">
     {{ if ne $paginator.PageNumber 1 }}
     <li class="pag-first">
-        <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a>
+        <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></a>
     </li>
     {{ end }}
     {{ if $paginator.HasPrev }}
     <li class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a>
+        <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
     </li>
     {{ end }}
 
@@ -66,12 +66,12 @@
 
     {{ if $paginator.HasNext }}
     <li class="pag-next">
-        <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a>
+        <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
     </li>
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
     <li class="pag-last">
-        <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a>
+        <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
     </li>
     {{ end }}
 </ul>