feat: new index and style update

archetypes/default.md

@@ -4,13 +4,19 @@ date: {{ .Date }}
 lastmod: {{ .Date }}
 draft: true
 description: ""
+show_in_homepage: true
+show_description: false
+
 tags: []
 categories: []
 
 featured_image: ""
+featured_image_preview: ""
 
 comment: true
 toc: false
 autoCollapseToc: true
 math: false
 ---
+
+<!--more-->

assets/css/_page/_home.scss

@@ -1,5 +1,4 @@
 /** Home **/
-
 .intro {
   transform: translateY(25vh);
   text-align: center;

assets/css/_page/_home_post.scss

@@ -1,65 +0,0 @@
-.post-warp {
-  .intro {
-    transform: translateY(0);
-    margin: 2em 0 5em 0;
-
-    .avatar {
-      img {
-        width: 96px;
-      }
-    }
-  }
-
-  .post {
-    margin-bottom: 4em;
-    border-bottom: 1px dashed #ddd;
-
-    .post-content {
-      padding-top: .5em;
-    }
-
-    .post-footer {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .post-meta {
-        a {
-          color: rgba(85, 85, 85, 0.52941) !important;
-
-          .dark-theme & {
-            color: $global-font-secondary-color-dark !important;
-          }
-
-          &:hover {
-            color: $global-font-secondary-color !important;
-
-            .dark-theme & {
-              color: $global-font-secondary-color-dark !important;
-            }
-          }
-        }
-      }
-
-      .post-tags {
-        span {
-          a {
-            color: rgba(85, 85, 85, 0.52941) !important;
-
-            .dark-theme & {
-              color: $global-font-secondary-color-dark !important;
-            }
-
-            &:hover {
-              color: $global-font-secondary-color !important;
-
-              .dark-theme & {
-                color: $global-font-secondary-color-dark !important;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

assets/css/_page/_index.scss

@@ -0,0 +1,22 @@
+@import "_home";
+
+.post-warp {
+  position: relative;
+  width: 100%;
+  max-width: 780px;
+  margin: 0 auto;
+  padding-top: 2rem;
+
+  @import "_post";
+  @import "_posts";
+}
+
+.archive {
+  .post-title {
+    text-align: right;
+    padding-bottom: 2em;
+  }
+
+  @import "_terms";
+  @import "_tags";
+}

assets/css/_page/_post.scss

@@ -1,12 +1,4 @@
 /** Post **/
-
-.post-warp {
-  position: relative;
-  width: 100%;
-  max-width: 780px;
-  margin: 0 auto;
-  padding-top: 2rem;
-
 .post-header {
   .post-title {
     margin: 0 !important;
@@ -42,6 +34,10 @@
       }
     }
   }
+
+  .author {
+    font-size: 1.2em;
+  }
 }
 
 .post-toc {
@@ -89,6 +85,14 @@
   }
 }
 
+.featured_image {
+  display: block;
+  max-width: 100%;
+  height: auto;
+  margin: 0 auto;
+  overflow: hidden;
+}
+
 .post-content {
   h2,
   h3,
@@ -192,19 +196,12 @@
 
   img {
     display: block;
-      max-width: 80%;
+    max-width: 100%;
     height: auto;
     margin: 0 auto;
     overflow: hidden;
   }
 
-    .featured_image {
-      width: 100% !important;
-      max-width: 100% !important;
-      height: auto !important;
-      margin: 0 !important;
-    }
-
   blockquote {
     font-size: 1rem;
     display: block;
@@ -367,6 +364,7 @@
   margin: .5em 0 .5em 0;
 }
 
+.post-footer {
   .post-info {
     margin-top: 3rem;
     border-bottom: 1px solid $global-border-color;
@@ -419,6 +417,7 @@
       transform: translateX(4px);
     }
   }
+}
 
 .post-comment {
   padding: 3em 0;
@@ -443,4 +442,3 @@
 .float-right {
   float: right;
 }
-}

assets/css/_page/_posts.scss

@@ -0,0 +1,128 @@
+.intro {
+  transform: translateY(0);
+  padding: 2em 0 2em 0;
+
+  .avatar {
+    img {
+      width: 96px;
+    }
+  }
+}
+
+.post {
+  padding-top: 0.8em;
+  padding-bottom: 0.8em;
+  color: $global-font-color;
+  border-top: 1px dashed $global-border-color;
+  border-bottom: 1px dashed $global-border-color;
+
+  .dark-theme & {
+    color: $global-font-color-dark;
+    border-bottom: 1px dashed $global-border-color-dark;
+  }
+
+  .featured_image_preview {
+    width: 100%;
+    padding: 30% 0 0;
+    position: relative;
+    margin-bottom: 1em;
+
+    img {
+      position: absolute;
+      width: 100%; height: 100%;
+      left: 0; top: 0;
+      object-fit: cover;
+    }
+  }
+
+  .post-list-title {
+    font-size: 1.6em;
+  }
+
+  .post-meta {
+    font-size: 14px !important;
+    a {
+      color: $global-font-secondary-color !important;
+
+      .dark-theme & {
+        color: $global-font-secondary-color-dark !important;
+      }
+
+      &:hover {
+        color: $global-link-hover-color !important;
+
+        .dark-theme & {
+          color: $global-link-hover-color-dark !important;
+        }
+      }
+    }
+  }
+
+  .post-content {
+    padding-top: .2em;
+    font-size: 0.9em;
+    width: 100%;
+    max-height: 100px;
+    overflow: hidden;
+
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+      font-size: 1em;
+      line-height: 1em;
+      padding-top: .3em;
+      padding-bottom: .3em;
+    }
+
+    p {
+    margin: 0;
+    padding-top: .3em;
+    padding-bottom: .3em;
+    }
+  }
+
+  .post-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 14px !important;
+
+    a {
+      color: $post-link-color !important;
+
+      .dark-theme & {
+        color: $post-link-color-dark !important;
+      }
+
+      &:hover {
+        color: $post-link-hover-color !important;
+
+        .dark-theme & {
+          color: $post-link-hover-color-dark !important;
+        }
+      }
+    }
+
+    .post-tags {
+      padding: 0;
+
+      a {
+        color: $global-link-color !important;
+
+        .dark-theme & {
+          color: $global-link-color-dark !important;
+        }
+
+        &:hover {
+          color: $global-link-hover-color !important;
+
+          .dark-theme & {
+            color: $global-link-hover-color-dark !important;
+          }
+        }
+      }
+    }
+  }
+}

assets/css/_page/_terms.scss

@@ -1,5 +1,3 @@
-.post-warp {
-
 .archive-item {
   margin-left: 2rem;
 }
@@ -71,7 +69,6 @@
 .more-post {
   text-align: right;
 }
-}
 
 .categories {
   h3 {

assets/css/_partial/_pagination.scss

@@ -7,11 +7,11 @@
   list-style: none;
   white-space: nowrap;
   width: 100%;
-  padding-top: 2em;
+  padding-top: 1em;
 
   a {
     -webkit-font-smoothing: antialiased;
-    font-size: 12px;
+    font-size: 0.8em;
     color: #bfbfbf;
     letter-spacing: 0.1em;
     font-weight: 700;

assets/css/style.scss

@@ -5,11 +5,7 @@
 @import "_core/base";
 @import "_core/layout";
 
-@import "_page/home";
+@import "_page/index";
-@import "_page/home_post";
-@import "_page/post";
-@import "_page/tags";
-@import "_page/terms";
 
 @import "_partial/navbar";
 @import "_partial/footer";

assets/js/main.js

@@ -56,46 +56,56 @@ jQuery(function($) {
     _Blog._initToc = function() {
         const SPACING = 20;
         const $toc = $('.post-toc');
+        const $footer = $('.post-footer');
 
         if ($toc.length) {
-            const startTop = $toc.css("top");
+            const minTop = $toc.position().top;
-            const minScrollTop = $toc.offset().top - SPACING;
+            const mainTop = $('main').position().top;
+            const minScrollTop = minTop + mainTop - SPACING;
+
+            $(window).scroll(function() {
+                const scrollTop = $(window).scrollTop();
+                const maxTop = $footer.position().top - $toc.height();
+                const maxScrollTop = maxTop + mainTop - SPACING;
 
                 const tocState = {
                     start: {
                         'position': 'absolute',
-                    'top': startTop,
+                        'top': minTop,
                     },
                     process: {
                         'position': 'fixed',
                         'top': SPACING,
                     },
+                    end: {
+                        'position': 'absolute',
+                        'top': maxTop,
+                    }
                 };
 
-            $(window).scroll(function() {
-            const scrollTop = $(window).scrollTop();
-
                 if (scrollTop < minScrollTop) {
                     $toc.css(tocState.start);
+                } else if (scrollTop > maxScrollTop) {
+                    $toc.css(tocState.end);
                 } else {
                     $toc.css(tocState.process);
                 }
             });
         }
 
-        const HEADERFIX = 30;
+        const HEADERFIX = 60;
         const $toclink = $('.toc-link');
         const $headerlink = $('.headerlink');
         const $tocLinkLis = $('.post-toc-content li');
 
+        const activeIndex = function() {
+            const scrollTop = $(window).scrollTop();
             const headerlinkTop = $.map($headerlink, function(link) {
                 return $(link).offset().top;
             });
-
             const headerLinksOffsetForSearch = $.map(headerlinkTop, function(offset) {
                 return offset - HEADERFIX;
             });
-
             const searchActiveTocIndex = function(array, target) {
                 for (let i = 0; i < array.length - 1; i++) {
                     if (target > array[i] && target <= array[i + 1]) return i;
@@ -104,8 +114,6 @@ jQuery(function($) {
                 return 0;
             };
 
-        const activeIndex = function() {
-            const scrollTop = $(window).scrollTop();
             const activeTocIndex = searchActiveTocIndex(headerLinksOffsetForSearch, scrollTop);
 
             $($toclink).removeClass('active');
@@ -182,7 +190,7 @@ jQuery(function($) {
     _Blog.countdown = function() {
         if (window.countdownMap) {
             Object.keys(countdownMap).forEach(function(id) {
-              $(id).countdown(countdownMap[id], {elapse: true})
+              $(`#${id}`).countdown(countdownMap[id], {elapse: true})
                 .on('update.countdown', function(event) {
                   var $this = $(this).html(event.strftime(''
                     + '<span>%D</span> 天 <br />'
@@ -226,9 +234,9 @@ jQuery(function($) {
         _Blog.changeTitle();
         _Blog.chroma();
         _Blog.responsiveTable();
-        _Blog.toc();
         _Blog.echarts(isDark);
         _Blog.countdown();
         _Blog.typeit();
+        _Blog.toc();
     });
 });

i18n/en.toml

@@ -37,6 +37,9 @@ other = "Theme - "
 [toc]
 other = "Table of Contents"
 
+[publish]
+other = "published on"
+
 [included]
 other = "included in"
 
@@ -63,6 +66,9 @@ other = "Back"
 
 [home]
 other = "Home"
+
+[readmore]
+other = "Read More......"
 # === posts/single.html ===
 
 # === 404.html ===

i18n/zh.toml

@@ -37,6 +37,9 @@ other = "主题 - "
 [toc]
 other = "目录"
 
+[publish]
+other = "发布于"
+
 [included]
 other = "收录于"
 
@@ -63,6 +66,9 @@ other = "返回"
 
 [home]
 other = "主页"
+
+[readmore]
+other = "阅读全文......"
 # === posts/single.html ===
 
 # === 404.html ===

layouts/_default/baseof.html

@@ -5,9 +5,6 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
         {{ partial "head.html" . }}
-        {{ $style := resources.Get "css/style.scss" | resources.ToCSS | resources.Minify}}
-        <link rel="stylesheet" href="{{ $style.RelPermalink }}">
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.10.1/css/all.min.css" integrity="sha256-fdcFNFiBMrNfWL6OcAGQz6jDgNTRxnrLEd4vJYFWScE=" crossorigin="anonymous">
     </head>
     <body class="">
         <div class="wrapper">
@@ -18,7 +15,7 @@
                 </div>
             </main>
             {{ partial "footer.html" . }}
+            {{ partial "scripts.html" . }}
         </div>
-        {{ partial "js.html" . }}
     </body>
 </html>

layouts/_default/section.html

@@ -1,22 +1,22 @@
-{{ define "title" }}{{ T "posts" }} - {{ .Site.Title }}{{ end }}
+{{ define "title" }}{{ T "posts" }} - {{ .Site.Title }}{{ end -}}
 
-{{ define "content" }}
+{{ define "content" -}}
-    {{ $data := .Data }}
+    {{ $data := .Data -}}
     <div class="post-warp archive">
-        <h2 class="post-title" style="text-align:right;padding-bottom:2em">
+        <h2 class="post-title">
             {{ printf "- %s -" (T "posts") }}
         </h2>
-        {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
+        {{- range (.Paginate (.Pages.GroupByDate "2006")).PageGroups -}}
             <h3>{{ .Key }}</h3>
-
+            {{- range .Pages -}}
-        {{ range .Pages }}
                 <article class="archive-item">
                     <a href="{{ .RelPermalink }}" class="archive-item-link">{{ .Title }}</a>
                     <span class="archive-item-date">
-                {{ .Date.Format (.Site.Params.dateFormatToUse | default "01-02") }}
+                        {{- .Date.Format (.Site.Params.dateFormatToUse | default "01-02") -}}
                     </span>
                 </article>
-        {{ end }} {{ end }}
+            {{- end -}}
-        {{ partial "paginator.html" . }}
+        {{- end -}}
+        {{- partial "paginator.html" . -}}
     </div>
-{{end }}
+{{- end }}

layouts/_default/summary.html

@@ -0,0 +1,55 @@
+<article class="post" itemscope itemtype="http://schema.org/Article">
+    {{ $publish_date := .PublishDate.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }}
+    {{ $author := .Site.Author.name }}
+    {{ if isset .Params "author" }}
+       {{ $author = .Site.Author.name }}
+    {{ end }}
+
+    <!--featured_image-->
+    {{ with .Params.featured_image }}
+        {{ $image := $.Params.featured_image_preview | default . }}
+        <div class="featured_image_preview">
+            <img src=/images/loading.svg data-sizes=auto data-src={{ $image }} alt="featured image" class="lazyload">
+        </div>
+    {{ end }}
+    <!-- end featured_image-->
+    <header class="post-header">
+        <h1 class="post-title post-list-title" itemprop="name headline">
+            <a href="{{ .Permalink }}">{{ .Title }}</a>
+        </h1>
+    </header>
+    <div class="post-meta">
+        <a class="author" href="{{.Site.BaseURL }}" rel="author"><i class="fas fa-user-circle"></i>&nbsp;{{ $author }}&nbsp;</a>
+        {{ T "publish" }}<span class="post-time">&nbsp;<time datetime={{ $publish_date }}>{{ $publish_date }}</time>&nbsp;</span>
+        {{ with .Params.categories -}}
+            <span class="post-category">
+                {{ T "included" }}
+                {{ range . }}
+                    {{- $name := . -}}
+                    {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}}
+                        <i class="far fa-folder"></i>&nbsp;<a href="{{ .Permalink }}">{{ $name }}</a>&nbsp;
+                    {{ end -}}
+                {{ end }}
+            </span>
+        {{- end }}
+    </div>
+    <div class="post-content">
+        {{ if .Params.show_description }}
+            <p>{{ . }}</p>
+        {{ else }}
+            {{ .Summary }}
+        {{ end }}
+    </div>
+    <div class="post-footer">
+        <a href="{{ .Permalink }}">{{ T "readmore" }}</a>
+        {{ with .Params.tags }}
+            <div class="post-tags">
+                {{ range . }}
+                    <span class="tag">
+                        <a href="{{ "tags/" | absURL }}{{ . | urlize }}/">&nbsp;<i class="fas fa-tag"></i>&nbsp;{{ . }}</a>
+                    </span>
+                {{ end }}
+            </div>
+        {{ end }}
+    </div>
+</article>

layouts/index.html

@@ -1,15 +1,16 @@
-{{ define "content" }}
+{{ define "content" -}}
-    {{ if eq .Site.Params.home_mode "post" }}
+    {{ if eq .Site.Params.home_mode "post" -}}
         <div class="post-warp">
-            {{ partial "home/profile.html" . }}
+            {{- partial "home/profile.html" . -}}
 
-            {{ range (.Paginate (where .Pages "Type" "posts")).Pages }}
+            {{- $paginator := .Paginate (where (where .Data.Pages "Type" "posts") ".Params.show_in_homepage" "!=" false) }}
-                {{ .Render "summary" }}
+            {{ range $paginator.Pages -}}
-            {{ end }}
+                {{ .Render "summary" -}}
+            {{ end -}}
 
             {{ partial "paginator.html" . }}
         </div>
-    {{ else }}
+    {{- else -}}
-        {{ partial "home/profile.html" . }}
+        {{ partial "home/profile.html" . -}}
-    {{ end }}
+    {{ end -}}
 {{ end }}

layouts/partials/head.html

@@ -30,12 +30,15 @@
 <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
 <meta name="msapplication-TileColor" content="#da532c">
 <meta name="theme-color" content="#ffffff">
-
+{{- with .OutputFormats.Get "RSS" -}}
-{{ with .OutputFormats.Get "RSS" }}
     <link rel="alternate" href="{{ .RelPermalink }}" type="application/rss+xml" title="{{ site.Title }}">
     <link rel="feed" href="{{ .RelPermalink }}" type="application/rss+xml" title="{{ site.Title }}">
-{{ end }}
+{{- end -}}
 
-{{ template "_internal/twitter_cards.html" . }}
+{{- template "_internal/twitter_cards.html" . -}}
 
-{{ partial "seo_schema.html" . }}
+{{- partial "seo_schema.html" . -}}
+
+{{- $style := resources.Get "css/style.scss" | resources.ToCSS | resources.Minify -}}
+<link rel="stylesheet" href="{{ $style.RelPermalink }}">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.10.1/css/all.min.css" integrity="sha256-fdcFNFiBMrNfWL6OcAGQz6jDgNTRxnrLEd4vJYFWScE=" crossorigin="anonymous">

layouts/partials/header.html

@@ -13,7 +13,6 @@
         </div>
     </div>
 </nav>
-
 <nav class="navbar-mobile" id="nav-mobile" style="display: none">
      <div class="container">
         <div class="navbar-header">

layouts/partials/post/footer.html

@@ -0,0 +1,35 @@
+{{ $modify_date := .Lastmod.Format (.Site.Params.dateFormatToUse | default "2006-01-02") -}}
+<div class="post-footer">
+    <div class="post-info">
+        <div class="post-info-mod"><span>{{ printf (T "lastMod") $modify_date }}</span></div>
+        <div class="post-info-share">
+            {{ if and ( .Param "socialShare" ) (gt (len (.Param "share")) 0) }}
+                <span>{{ partial "post/share.html" . }}</span>
+            {{ end }}
+        </div>
+    </div>
+
+    <div class="post-tags">
+        <section>
+            {{ with .Params.tags }}
+                {{ range . }}
+                    <span class="tag">
+                        <a href="{{ "tags/" | absURL }}{{ . | urlize }}/"><i class="fas fa-tag"></i>&nbsp;{{.}}&nbsp;</a>
+                    </span>
+                {{ end }}
+            {{ end }}
+        </section>
+        <section>
+            <span><a href="javascript:window.history.back();">{{ T "back" }}</a></span>&nbsp;|&nbsp;<span><a href="{{ .Site.BaseURL }}">{{ T "home" }}</a></span>
+        </section>
+    </div>
+
+    <div class="post-nav">
+        {{ if .PrevInSection }}
+        <a href="{{.PrevInSection.Permalink}}" class="prev" rel="prev" title="{{ .PrevInSection.Title}}"><i class="fas fa-angle-left"></i>&nbsp;{{ .PrevInSection.Title}}</a>
+        {{ end }}
+        {{ if .NextInSection }}
+        <a href="{{.NextInSection.Permalink}}" class="next" rel="next" title="{{.NextInSection.Title}}">{{.NextInSection.Title}}&nbsp;<i class="fas fa-angle-right"></i></a>
+        {{ end }}
+    </div>
+</div>

layouts/partials/post/share.html

@@ -1,59 +1,49 @@
-{{ if or .Params.socialShare (and .Site.Params.socialShare (ne .Params.socialShare false)) }}
+{{ if or (eq .Params.share.enable false) (eq .Site.Params.share.enable false) | not }}
-
     {{ if or .Params.Share.Twitter (and .Site.Params.Share.Twitter (ne .Params.Share.Twitter false)) }}
         <a href="//twitter.com/share?url={{ .Permalink }}&amp;text={{ .Title }}&amp;via={{ .Site.Params.Social.Twitter }}" target="_blank" title="Share on Twitter">
             <i class="fab fa-twitter"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Facebook (and .Site.Params.Share.Facebook (ne .Params.Share.Facebook false)) }}
         <a href="//www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" target="_blank" title="Share on Facebook">
             <i class="fab fa-facebook-square"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Reddit (and .Site.Params.Share.Reddit (ne .Params.Share.Reddit false)) }}
         <a href="//reddit.com/submit?url={{ .Permalink }}&amp;title={{ .Title }}" target="_blank" title="Share on Reddit">
             <i class="fab fa-reddit"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Linkedin (and .Site.Params.Share.Linkedin (ne .Params.Share.Linkedin false)) }}
         <a href="//www.linkedin.com/shareArticle?url={{ .Permalink }}&amp;title={{ .Title }}" target="_blank" title="Share on LinkedIn">
             <i class="fab fa-linkedin"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Pinterest (and .Site.Params.Share.Pinterest (ne .Params.Share.Pinterest false)) }}
         <a href="//www.pinterest.com/pin/create/button/?url={{ .Permalink }}&amp;description={{ .Title }}" target="_blank" title="Share on Pinterest">
             <i class="fab fa-pinterest"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.YCombinator (and .Site.Params.Share.YCombinator (ne .Params.Share.YCombinator false)) }}
         <a href="//news.ycombinator.com/submitlink?u={{ .Permalink }}&amp;description={{ .Title }}" target="_blank" title="Share on Hacker News">
             <i class="fab fa-y-combinator"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Mix (and .Site.Params.Share.Mix (ne .Params.Share.Mix false)) }}
         <a href="//mix.com/add?url={{ .Permalink }}&amp;description={{ .Title }}" target="_blank" title="Share on Mix">
             <i class="fab fa-mix"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Tumblr (and .Site.Params.Share.Tumblr (ne .Params.Share.Tumblr false)) }}
         <a href="//www.tumblr.com/widgets/share/tool?canonicalUrl={{ .Permalink }}&amp;title={{ .Title }}" target="_blank" title="Share on Tumblr">
             <i class="fab fa-tumblr"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.VK (and .Site.Params.Share.VK (ne .Params.Share.VK false)) }}
         <a href="//vk.com/share.php?url={{ .Permalink }}&amp;title={{ .Title }}" target="_blank" title="Share on VKontakte ">
             <i class="fab fa-vk"></i>
         </a>
     {{ end }}
-
     {{ if or .Params.Share.Weibo (and .Site.Params.Share.Weibo (ne .Params.Share.Weibo false)) }}
         <a href="//service.weibo.com/share/share.php?url={{ .Permalink }}&amp;appkey=&amp;title={{ .Title }}" target="_blank" title="Share on Weibo">
             <i class="fab fa-weibo"></i>

layouts/partials/scripts.html

@@ -1,6 +1,3 @@
-{{ $scripts := resources.Get "/js/main.js" | slice }}
-{{ $dynamicToTop := resources.Get "/js/dynamicToTop.js" }}
-
 <!-- jQuery https://github.com/jquery/jquery -->
 {{ $jquery := `
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
@@ -41,10 +38,9 @@
 ` }}
 
 {{ $jquery | safeHTML }}
-
-{{ if .IsPage }}
 {{ $lazysizes | safeHTML }}
 
+{{ if .IsPage }}
     {{ if .Scratch.Get "diagram" }}
         {{ $diagram | safeHTML }}
     {{ end }}
@@ -71,11 +67,6 @@
         {{ $countdown | safeHTML }}
         <script>var countdownMap = {{ . | jsonify | safeJS }};</script>
     {{ end }}
-
-    {{ $scripts = $scripts | append $dynamicToTop }}
-    {{ $scripts = $scripts | resources.Concat "/js/vendor_post.js" | resources.Minify }}
-{{ else }}
-    {{ $scripts = $scripts | resources.Concat "/js/vendor_main.js" | resources.Minify}}
 {{ end }}
 
 {{ $typeitMap := .Scratch.Get "typeitMap" }}
@@ -88,6 +79,7 @@
     <script>var typeitArr = {{ $typeitArr | jsonify | safeJS }};</script>
 {{ end }}
 
+{{ $scripts := slice (resources.Get "/js/main.js") (resources.Get "/js/dynamicToTop.js") | resources.Concat "/js/vendor.js" | resources.Minify }}
 <script src="{{ $scripts.RelPermalink }}" async=""></script>
 
 {{ template "_internal/google_analytics_async.html" . }}

layouts/posts/single.html

@@ -2,7 +2,6 @@
 
 {{ define "content" }}
     {{ $publish_date := .PublishDate.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }}
-    {{ $modify_date := .Lastmod.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }}
     {{ $author := .Site.Author.name }}
     {{ if isset .Params "author" }}
        {{ $author = .Site.Author.name }}
@@ -15,20 +14,19 @@
 
         <div class="post-meta">
             <div class="post-meta-main">
-                <a href="{{.Site.BaseURL }}" rel="author">{{ $author }}</a>
+                <a class="author" href="{{.Site.BaseURL }}" rel="author"><i class="fas fa-user-circle"></i>&nbsp;{{ $author }}&nbsp;</a>
-                {{ T "included" }}
                 {{ with .Params.categories -}}
                     <span class="post-category">
+                        {{ T "included" }}
                         {{ range . }}
                             {{- $name := . -}}
                             {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}}
-                                <i class="far fa-folder"></i>&nbsp;<a href="{{ .Permalink }}">{{ $name }}</a>
+                                <i class="far fa-folder"></i>&nbsp;<a href="{{ .Permalink }}">{{ $name }}</a>&nbsp;
                             {{ end -}}
                         {{ end }}
                     </span>
                 {{- end }}
             </div>
-
             <div class="post-meta-other">
                 <span class="post-time"><i class="far fa-calendar-alt"></i>&nbsp;<time datetime={{ $publish_date }}>{{ $publish_date }}</time>&nbsp;</span>
                 <i class="fas fa-pencil-alt"></i>&nbsp;{{ T "wordCount" .WordCount }}&nbsp;
@@ -45,64 +43,34 @@
             <div class="post-toc" id="post-toc">
                 <h2 class="post-toc-title">{{ T "toc" }}</h2>
                 {{- $globalAutoCollapseToc := .Site.Params.autoCollapseToc | default true }}
-                <div class="post-toc-content{{ if not (or .Params.autoCollapseToc (and $globalAutoCollapseToc (ne .Params.autoCollapseToc false))) }} always-active{{ end }}">
+                <div class="post-toc-content{{ if not (and $globalAutoCollapseToc (ne .Params.autoCollapseToc false)) }} always-active{{ end }}">
                     {{ .TableOfContents }}
                 </div>
             </div>
         {{- end }}
 
-        <div class="post-content">
-            <!--featured_image-->
         {{ with .Params.featured_image }}
             <img src=/images/loading.svg data-sizes=auto data-src={{ . }} alt="featured image" class="featured_image lazyload">
         {{ end }}
-            <!-- end featured_image-->
 
-            {{ $reAltIn := `<img src="([^"]+)" alt="([^"]+)?" />` }}
+        <div class="post-content">
-            {{ $reAltOut := "<figure><img src=/images/loading.svg data-sizes=auto data-src=$1 alt=$2 class=lazyload><figcaption class=image-caption>$2</figcaption></figure>" }}
+            {{ $content := .Content }}
-            {{ $altContent := .Content | replaceRE $reAltIn $reAltOut | safeHTML }}
+            {{ $REin := `<img src="([^"]+)" alt="([^"]+)?" />` }}
-            {{ $reAltTitleIn := `<img src="([^"]+)" alt="([^"]+)?" title="([^"]+)?" />` }}
+            {{ $REout := "<figure><img src=/images/loading.svg data-sizes=auto data-src=$1 alt=$2 class=lazyload><figcaption class=image-caption>$2</figcaption></figure>" }}
-            {{ $reAltTitleOut := "<figure><img src=/images/loading.svg data-src=$1 data-sizes=auto alt=$2 title=$3 class=lazyload><figcaption class=image-caption>$2</figcaption></figure>" }}
+            {{ $content = replaceRE $REin $REout $content }}
-            {{ $finalContent := $altContent | replaceRE $reAltTitleIn $reAltTitleOut | safeHTML }}
+            {{ $REin = `<img src="([^"]+)" alt="([^"]+)?" title="([^"]+)?" />` }}
-            {{ $finalContent }}
+            {{ $REout = "<figure><img src=/images/loading.svg data-src=$1 data-sizes=auto alt=$2 title=$3 class=lazyload><figcaption class=image-caption>$2</figcaption></figure>" }}
-        </div>
+            {{ $content = replaceRE $REin $REout $content }}
-        <div class="post-footer">
+            {{ $REin = `:\(([\w- ]+?)\):` }}
-            <div class="post-info">
+            {{ $REout = `<i class="inline-icon $1"></i>` }}
-                <div class="post-info-mod"><span>{{ printf (T "lastMod") $modify_date }}</span></div>
+            {{ $content = replaceRE $REin $REout $content }}
-                <div class="post-info-share">
+            {{ $content | safeHTML }}
-                    {{ if and ( $.Param "socialShare" ) (gt (len ($.Param "share")) 0) }}
-                        <span>{{ partial "post/share-links.html" . }}</span>
-                    {{ end }}
-                </div>
         </div>
 
-            <div class="post-tags">
+        {{ partial "post/footer.html" . }}
-                <section>
-                    {{ with .Params.tags }}
-                        {{ range . }}
-                            <span class="tag">
-                                <i class="fas fa-tag"></i><a href="{{ "tags/" | absURL }}{{ . | urlize }}/">&nbsp;{{.}}&nbsp;</a>
-                            </span>
-                        {{ end }}
-                    {{ end }}
-                </section>
-                <section>
-                    <span><a href="javascript:window.history.back();">{{ T "back" }}</a></span>&nbsp;|&nbsp;<span><a href="{{ .Site.BaseURL }}">{{ T "home" }}</a></span>
-                </section>
-            </div>
-
-            <div class="post-nav">
-                {{ if .PrevInSection }}
-                <a href="{{.PrevInSection.Permalink}}" class="prev" rel="prev" title="{{ .PrevInSection.Title}}"><i class="fas fa-angle-left"></i>&nbsp;{{ .PrevInSection.Title}}</a>
-                {{ end }}
-                {{ if .NextInSection }}
-                <a href="{{.NextInSection.Permalink}}" class="next" rel="next" title="{{.NextInSection.Title}}">{{.NextInSection.Title}}&nbsp;<i class="fas fa-angle-right"></i></a>
-                {{ end }}
-            </div>
-        </div>
 
         <div class="post-comment">
-            {{ if ( .Params.showComments | default true ) }}
+            {{ if ( .Params.comment | default true ) }}
             {{ partial "comments.html" . }}
             {{ end }}
         </div>

layouts/posts/summary.html

@@ -1,46 +0,0 @@
-<article class="post" itemscope itemtype="http://schema.org/Article">
-    <header class="post-header">
-        <h1 class="post-title" itemprop="name headline">
-            <a href="{{ .Permalink }}">{{ .Title }}</a>
-        </h1>
-    </header>
-    <div class="post-content">
-        <!--featured_image-->
-        {{ with .Params.featured_image }}
-            <p><img itemprop="image" src={{ . }} class="featured_image"></p>
-        {{ end }}
-        <!-- end featured_image-->
-        {{ .Summary }}
-    </div>
-    <div class="post-footer">
-        <div class="post-meta">
-            <span class="post-time">
-                <time datetime={{.Date.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }} itemprop="datePublished">
-                    {{ .Date.Format (.Site.Params.dateFormatToUse | default "2 January 2006") }}
-                </time>
-            </span>
-            in
-            {{ with .Params.categories }}
-                <i class="far fa-folder"></i>
-                <span class="post-category">
-                    {{ range . }}
-                        {{ $name := . }}
-                        {{ with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) }}
-                            <a href="{{ .Permalink }}">{{ $name }}</a>
-                        {{ end }}
-                    {{ end }}
-                </span>
-            {{ end }}
-        </div>
-
-        {{ with .Params.tags }}
-            <div class="post-tags">
-                {{ range . }}
-                    <span class="tag">
-                        <a href="{{ "tags/" | absURL }}{{ . | urlize }}/">#{{ . }}</a>
-                    </span>
-                {{ end }}
-            </div>
-        {{ end }}
-    </div>
-</article>

layouts/shortcodes/countdown.html

@@ -1,17 +1,16 @@
-{{ if .Get "id" }}
+{{ if .Get "id" -}}
-    {{ $id := .Get "id" }}
+    {{ $id := .Get "id" -}}
-    {{ with .Get "class" }}
+    {{ if .Get "date" -}}
+        {{ $date := .Get "date" -}}
+        {{ with .Page.Scratch.Get "countdownMap" -}}
+            {{ .Page.Scratch.Set "countdownMap" (dict $id $date | merge .) -}}
+        {{ else -}}
+            {{ .Page.Scratch.Set "countdownMap" (dict $id $date) -}}
+        {{ end -}}
+        {{ with .Get "class" -}}
             <div id={{ $id }} class="{{ . }}"></div>
-    {{ else }}
+        {{- else -}}
             <div id={{ $id }}></div>
-    {{ end }}
+        {{- end -}}
-    {{ $id = printf "#%s" $id }}
+    {{ end -}}
-    {{ with .Get "date" }}
-        {{ $date := . }}
-        {{ with $.Page.Scratch.Get "countdownMap" }}
-            {{ $.Page.Scratch.Set "countdownMap" (dict $id $date | merge .) }}
-        {{ else }}
-            {{ $.Page.Scratch.Set "countdownMap" (dict $id $date) }}
-        {{ end }}
-    {{ end }}
 {{ end }}

layouts/taxonomy/list.html

@@ -9,7 +9,7 @@
         {{ $taxonomyName = (T "category") }}
     {{ end }}
     <div class="post-warp archive">
-        <h2 class="post-title" style="text-align:right;padding-bottom:2em">
+        <h2 class="post-title">
             {{- printf "%s - %s" $taxonomyName .Title -}}
         </h2>
         {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}

layouts/taxonomy/terms.html

@@ -13,8 +13,8 @@
     {{ $length := len $terms }}
     {{ $type := .Type }}
 
-    <div class="post-warp {{.Data.Plural}}">
+    <div class="post-warp archive">
-        <h2 class="post-title" style="text-align:right;padding-bottom:2em">
+        <h2 class="post-title">
             {{- printf "- %s -" $taxonomysName -}}
         </h2>