发布 v3.4.0

🐛
https://github.com/b3log/solo/issues/12720 yilia
2019-03-26 08:23:53 +08:00 · 2019-03-26 08:21:33 +08:00 · 2019-03-22 19:27:08 +08:00 · 2019-03-22 19:25:36 +08:00 · 2019-03-22 18:53:35 +08:00 · 2019-03-22 18:02:41 +08:00
446 changed files with 6370 additions and 15317 deletions
--- a/9IPHP/archive-articles.ftl
+++ b/9IPHP/archive-articles.ftl
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-        </@head>
+         <@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
+             <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+         </@head>
    </head>
    <body>
        <#include "header.ftl">
--- a/9IPHP/archives.ftl
+++ b/9IPHP/archives.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${archiveLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
-        <meta name="description" content="${metaDescription},${archiveLabel}"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/9IPHP/article-list.ftl
+++ b/9IPHP/article-list.ftl
@@ -38,26 +38,26 @@
            </h1>

            <div class="meta">
-                <span class="tooltipped tooltipped-n" aria-label="${createDateLabel}">
+                <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
                    <i class="icon-date"></i>
                    <time>
                        ${article.articleCreateDate?string("yyyy-MM-dd")}
                    </time>
                </span>
                &nbsp; | &nbsp;
-                <span class="tooltipped tooltipped-n" aria-label="${commentCountLabel}">
+                <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${commentCountLabel}">
                    <i class="icon-comments"></i>
                    <a href="${servePath}${article.articlePermalink}#comments">
                        ${article.articleCommentCount} ${commentLabel}</a>
                </span>
                &nbsp; | &nbsp;
-                <span class="tooltipped tooltipped-n" aria-label="${viewCountLabel}">
+                <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${viewCountLabel}">
                    <i class="icon-views"></i>
                    ${article.articleViewCount} ${viewLabel}
                </span>
            </div>
        </header>
-        <div class="content-reset">
+        <div class="vditor-reset">
            ${article.articleAbstract}
        </div>
        <footer class="fn-clear tags">
--- a/9IPHP/article.ftl
+++ b/9IPHP/article.ftl
@@ -17,50 +17,34 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
-    <head>
-        <@head title="${article.articleTitle} - ${blogTitle}">
-        <meta name="keywords" content="${article.articleTags}" />
-        <meta name="description" content="${article.articleAbstract?html}" />
-        </@head>
+<head>
+    <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
+        <link rel="stylesheet"
+              href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        <#if previousArticlePermalink??>
            <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
        </#if>
        <#if nextArticlePermalink??>
            <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
        </#if>
-            <!-- Open Graph -->
-            <meta property="og:locale" content="zh_CN"/>
-            <meta property="og:type" content="article"/>
-            <meta property="og:title" content="${article.articleTitle}"/>
-            <meta property="og:description" content="${article.articleAbstract?html}"/>
-            <meta property="og:image" content="${article.authorThumbnailURL}"/>
-            <meta property="og:url" content="${servePath}${article.articlePermalink}"/>
-            <meta property="og:site_name" content="Solo"/>
-            <!-- Twitter Card -->
-            <meta name="twitter:card" content="summary"/>
-            <meta name="twitter:description" content="${article.articleAbstract?html}"/>
-            <meta name="twitter:title" content="${article.articleTitle}"/>
-            <meta name="twitter:image" content="${article.authorThumbnailURL}"/>
-            <meta name="twitter:url" content="${servePath}${article.articlePermalink}"/>
-            <meta name="twitter:site" content="@DL88250"/>
-            <meta name="twitter:creator" content="@DL88250"/>
-    </head>
-    <body>
+    </@head>
+</head>
+<body>
        <#include "header.ftl">
-        <div class="wrapper">
-            <div class="main-wrap">
-                <main>
-                    <article class="post">
-                        <header>
-                            <h1>
-                                <a rel="bookmark" href="${servePath}${article.articlePermalink}">
-                                    ${article.articleTitle}
-                                </a>
+<div class="wrapper">
+    <div class="main-wrap">
+        <main>
+            <article class="post">
+                <header>
+                    <h1>
+                        <a rel="bookmark" href="${servePath}${article.articlePermalink}">
+                        ${article.articleTitle}
+                        </a>
                                <#if article.articlePutTop>
                                    <sup>
                                        ${topArticleLabel}
@@ -71,94 +55,94 @@
                                        ${updatedLabel}
                                    </sup>
                                </#if>
-                            </h1>
-                            <div class="meta">
-                                <span class="tooltipped tooltipped-n" aria-label="${createDateLabel}">
+                    </h1>
+                    <div class="meta">
+                                <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
                                    <i class="icon-date"></i>
                                    <time>
-                                        ${article.articleCreateDate?string("yyyy-MM-dd")}
+                                    ${article.articleCreateDate?string("yyyy-MM-dd")}
                                    </time>
                                </span>
-                                                &nbsp; | &nbsp;
-                                                <span class="tooltipped tooltipped-n" aria-label="${commentCountLabel}">
+                        &nbsp; | &nbsp;
+                        <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${commentCountLabel}">
                                    <i class="icon-comments"></i>
                                    <a href="${servePath}${article.articlePermalink}#comments">
                                        ${article.articleCommentCount} ${commentLabel}</a>
                                </span>
-                                                &nbsp; | &nbsp;
-                                                <span class="tooltipped tooltipped-n" aria-label="${viewCountLabel}">
+                        &nbsp; | &nbsp;
+                        <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${viewCountLabel}">
                                    <i class="icon-views"></i>
-                                    ${article.articleViewCount} ${viewLabel}
+                        ${article.articleViewCount} ${viewLabel}
                                </span>
-                            </div>
-                        </header>
+                    </div>
+                </header>

-                        <div class="content-reset">
-                            ${article.articleContent}
+                <div class="vditor-reset">
+                ${article.articleContent}
                            <#if "" != article.articleSign.signHTML?trim>
                                <div>
                                    ${article.articleSign.signHTML}
                                </div>
                            </#if>
-                        </div>
+                </div>

-                        <footer class="tags">
+                <footer class="tags">
                            <#list article.articleTags?split(",") as articleTag>
                                <a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
                                    ${articleTag}</a>
                            </#list>

-                            <#-- div class="copyright">
-                                ${articleCP1Label}
-                                <a rel="bookmark" href="${servePath}${article.articlePermalink}">
-                                    ${article.articleTitle}
-                                </a> -
-                                <a href="${servePath}">
-                                    ${blogTitle}
-                                </a>
-                            </div -->
+                <#-- div class="copyright">
+                    ${articleCP1Label}
+                    <a rel="bookmark" href="${servePath}${article.articlePermalink}">
+                        ${article.articleTitle}
+                    </a> -
+                    <a href="${servePath}">
+                        ${blogTitle}
+                    </a>
+                </div -->

-                            <div class="rel fn-clear">
+                    <div class="rel fn-clear">
                                <#if previousArticlePermalink??>
                                    <a href="${servePath}${previousArticlePermalink}" rel="prev"
-                                       class="fn-left tooltipped tooltipped-n"
+                                       class="fn-left vditor-tooltipped vditor-tooltipped__n"
                                       aria-label="${previousArticleTitle}">
                                        ${previousArticleLabel}
                                    </a>
                                </#if>
                                <#if nextArticlePermalink??>
                                    <a href="${servePath}${nextArticlePermalink}" rel="next"
-                                       class="fn-right tooltipped tooltipped-n"
+                                       class="fn-right vditor-tooltipped vditor-tooltipped__n"
                                       aria-label="${nextArticleTitle}">
                                        ${nextArticleLabel}
                                    </a>
                                </#if>
-                            </div>
-                        </footer>
+                    </div>
+                </footer>
                        <@comments commentList=articleComments article=article></@comments>
-                        <br>
-                        <div id="externalRelevantArticles" class="list"></div>
-                        <div id="relevantArticles" class="list"></div>
-                        <div id="randomArticles" class="list"></div>
-                    </article>
-                </main>
+                <br>
+                <div id="externalRelevantArticles" class="list"></div>
+                <div id="relevantArticles" class="list"></div>
+                <div id="randomArticles" class="list"></div>
+            </article>
+        </main>
                <#include "side.ftl">
-            </div>
-        </div>
+    </div>
+</div>
        <#include "footer.ftl">
        <@comment_script oId=article.oId commentable=article.commentable>
        page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
-        <#if 0 != randomArticlesDisplayCount>
+            <#if 0 != randomArticlesDisplayCount>
        page.loadRandomArticles();
-        </#if>
-        <#if 0 != externalRelevantArticlesDisplayCount>
+            </#if>
+            <#if 0 != externalRelevantArticlesDisplayCount>
        page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>"
            , "<header class='title'><h2>${externalRelevantArticlesLabel}</h2></header>");
-        </#if>
-        <#if 0 != relevantArticlesDisplayCount>
+            </#if>
+            <#if 0 != relevantArticlesDisplayCount>
        page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticlesLabel}</h4>');
-        </#if>
-        Skin.initArticle('${tocLabel}', '${siteViewLabel}')
-        </@comment_script>    
-    </body>
+            </#if>
+        Skin.initToc()
+        </@comment_script>
+</body>
 </html>
--- a/9IPHP/category-articles.ftl
+++ b/9IPHP/category-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${category.categoryTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/9IPHP/common-comment.ftl
+++ b/9IPHP/common-comment.ftl
@@ -19,7 +19,7 @@
 -->
 <li id="${comment.oId}">
    <div>
-        <div class="avatar tooltipped tooltipped-n" aria-label="${comment.commentName}"
+        <div class="avatar vditor-tooltipped vditor-tooltipped__n" aria-label="${comment.commentName}"
             style="background-image: url(${comment.commentThumbnailURL})"></div>
        <main>
            <div class="fn-clear">
@@ -40,7 +40,7 @@
                    <a class="reply-btn" href="javascript:page.toggleEditor('${comment.oId}', '${comment.commentName}')">${replyLabel}</a>
                </#if>
            </div>
-            <div class="content-reset">
+            <div class="vditor-reset">
                ${comment.commentContent}
            </div>
        </main>
--- a/9IPHP/css/base.css
+++ b/9IPHP/css/base.css
--- a/9IPHP/css/base.scss
+++ b/9IPHP/css/base.scss
--- a/9IPHP/dynamic.ftl
+++ b/9IPHP/dynamic.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${dynamicLabel}"/>
-        <meta name="description" content="${metaDescription},${dynamicLabel}"/>
+        <@head title="${dynamicLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -36,7 +35,7 @@
                            <#list recentComments as comment>
                                <li id="${comment.oId}">
                                    <div>
-                                        <div class="avatar tooltipped tooltipped-n" aria-label="${comment.commentName}"
+                                        <div class="avatar vditor-tooltipped vditor-tooltipped__n" aria-label="${comment.commentName}"
                                             style="background-image: url(${comment.commentThumbnailURL})"></div>
                                        <main>
                                            <div class="fn-clear">
@@ -48,7 +47,7 @@
                                                <time class="ft-gray">${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
                                                <a class="reply-btn" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
                                            </div>
-                                            <div class="content-reset">
+                                            <div class="vditor-reset">
                                                ${comment.commentContent}
                                            </div>
                                        </main>
@@ -57,7 +56,7 @@
                            </#list>
                        </ul>
                    <#else>
-                    <div class="content-reset ft-center">
+                    <div class="vditor-reset ft-center">
                        ${noDynamicLabel}
                    </div>
                    </#if>
@@ -68,7 +67,7 @@
        <#include "footer.ftl">

        <script>
-            var $commentContents = $(".comments .content-reset");
+            var $commentContents = $(".comments .vditor-reset");
            for (var i = 0; i < $commentContents.length; i++) {
                var str = $commentContents[i].innerHTML;
                $commentContents[i].innerHTML = Util.replaceEmString(str);
--- a/9IPHP/footer.ftl
+++ b/9IPHP/footer.ftl
@@ -25,28 +25,13 @@

    Powered by <a href="https://b3log.org" target="_blank">B3log</a> 开源 &nbsp;
    <span class="ft-warn">&heartsuit;</span>
-    Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">9IPHP</a> by <a href="https://github.com/9IPHP/9IPHP" target="_blank">9IPHP</a> & <a href="http://vanessa.b3log.org" target="_blank">Vanessa</a>
+    Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
+    <sup>[<a href="https://github.com/9IPHP/9IPHP" target="_blank">ref</a>]</sup>
+    by <a href="http://vanessa.b3log.org" target="_blank">Vanessa</a>
 </footer>
 <div class="icon-up" onclick="Util.goTop()"></div>
-
-<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
-<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
-<script type="text/javascript">
-    var latkeConfig = {
-        "servePath": "${servePath}",
-        "staticServePath": "${staticServePath}",
-        "isLoggedIn": "${isLoggedIn?string}",
-        "userName": "${userName}"
-    };
-
-    var Label = {
-        "markedAvailable": ${markedAvailable?c},
-        "skinDirName": "${skinDirName}"
-    };
-    Util.initSW();
-    Util.parseMarkdown();
-    Util.killIE(10)
-    Util.previewImg()
-</script>
+<script src="${staticServePath}/js/lib/compress/pjax.min.js"></script>
+<script src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"></script>
+<script src="${staticServePath}/skins/${skinDirName}/js/common${miniPostfix}.js?${staticResourceVersion}"></script>
+<#include "../../common-template/label.ftl">
 ${plugins}
--- a/9IPHP/header.ftl
+++ b/9IPHP/header.ftl
@@ -28,15 +28,15 @@
            <small> &nbsp; ${blogSubtitle}</small>
            <div class="fn-right">
                <#if isLoggedIn>
-                    <a href="${servePath}/admin-index.do#main" title="${adminLabel}">
-                        <i class="icon-setting"></i> ${adminLabel}
+                    <a class="fn__flex-inline" href="${servePath}/admin-index.do#main" title="${adminLabel}">
+                        <i class="icon-setting"></i>&nbsp;${adminLabel}
                    </a>
-                    <a href="${logoutURL}">
-                        <i class="icon-logout"></i> ${logoutLabel}
+                    <a class="fn__flex-inline" href="${logoutURL}">
+                        <i class="icon-logout"></i>&nbsp;${logoutLabel}
                    </a>
                    <#else>
-                    <a href="${servePath}/start">
-                        <i class="icon-login"></i> ${startToUseLabel}
+                    <a class="fn__flex-inline" href="${servePath}/start">
+                        <i class="icon-login"></i>&nbsp;${startToUseLabel}
                    </a>
                </#if>
            </div>
--- a/9IPHP/images/code-bg.png
+++ b/9IPHP/images/code-bg.png
--- a/9IPHP/index.ftl
+++ b/9IPHP/index.ftl
@@ -17,17 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${blogTitle}">
-        <#if metaKeywords??>
-        <meta name="keywords" content="${metaKeywords}"/>
-        </#if>
-        <#if metaDescription??>
-        <meta name="description" content="${metaDescription}"/>
-        </#if>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/9IPHP/js/common.js
+++ b/9IPHP/js/common.js
@@ -27,110 +27,73 @@
 * @static
 */
 var Skin = {
-    _initCommon: function ($goTop) {
-        var $banner = $('header .banner'),
-        $navbar = $('header .navbar');
+  _initCommon: function ($goTop) {
+    var $banner = $('header .banner'),
+      $navbar = $('header .navbar')

-        $(window).scroll(function () {
-            if ($(window).scrollTop() > 125) {
-                $goTop.show();
-            } else {
-                $goTop.hide();
-            }
+    $(window).scroll(function () {
+      if ($(window).scrollTop() > 125) {
+        $goTop.show()
+      } else {
+        $goTop.hide()
+      }

-            if ($(window).width() < 701) {
-                return false;
-            }
+      if ($(window).width() < 701) {
+        return false
+      }

-            if ($(window).scrollTop() > $banner.height()) {
-                $navbar.addClass('pin');
-                $('.main-wrap').parent().css('margin-top', '86px')
-            } else {
-                $navbar.removeClass('pin');
-                $('.main-wrap').parent().css('margin-top', '0')
-            }
-        });
-    },
-    init: function () {
-        this._initCommon($('.icon-up'));
+      if ($(window).scrollTop() > $banner.height()) {
+        $navbar.addClass('pin')
+        $('.main-wrap').parent().css('margin-top', '81px')
+        $('.article__toc').css('position', 'fixed')
+      } else {
+        $navbar.removeClass('pin')
+        $('.main-wrap').parent().css('margin-top', '0')
+        $('.article__toc').css('position', 'inherit')
+      }
+    })

-        $('.navbar nav a').each(function () {
-            if (this.href === location.href) {
-                this.className = 'current'
-            }
-        });
+    $(window).scroll()
+  },
+  init: function () {
+    this._initCommon($('.icon-up'))

-        $('.responsive .list a').each(function () {
-            if (this.href === location.href) {
-                $(this).parent().addClass('current');
-            }
-        });
+    $('.navbar nav a').each(function () {
+      if (this.href === location.href) {
+        this.className = 'current'
+      }
+    })

-        $('.responsive .icon-list').click(function () {
-            $('.responsive .list').slideToggle();
-        });
-    },
-    _initArticleCommon: function (tocLabel, siteViewLabel) {
-        // TOC
-        if ($('.b3-solo-list li').length > 0 && $(window).width() > 1000) {
-            // add color to sidebar menu
-            $('aside').addClass('has-toc');
+    $('.responsive .list a').each(function () {
+      if (this.href === location.href) {
+        $(this).parent().addClass('current')
+      }
+    })

-            // append toc to sidebar menu
-            var articleTocHTML = '<ul class="fn-clear"><li class="current" data-tab="toc">' + tocLabel
-            + '</li><li data-tab="site">' + siteViewLabel + '</li></ul><section></section>';
-            $('aside').prepend(articleTocHTML);
-            var $sectionF = $('aside section:first').html($('.b3-solo-list')),
-                    $sectionL = $('aside section:last');
-            $sectionF.height($(window).height() - 154).css({ 'overflow': 'auto', 'width':  $('aside').width() + 'px'});
-            $sectionL.hide();
-            // 切换 tab
-            $('aside > ul > li').click(function () {
-                if ($(this).data('tab') === 'toc') {
-                    $sectionL.animate({
-                        "opacity": '0',
-                        "top": '-50px'
-                    }, 300, function () {
-                        $sectionF.show().css('top', '-50px');
-                        $sectionF.animate({
-                            "opacity": '1',
-                            "top": '0'
-                        }, 300).show();
-                    });
-                } else {
-                    $sectionF.animate({
-                        "opacity": '0',
-                        "top": '-50px'
-                    }, 300, function () {
-                        $sectionF.hide().css('top', '-50px');
-                        $sectionL.animate({
-                            "opacity": '1',
-                            "top": '0'
-                        }, 300).show();
-                    }).hide();
-                }
-                $('aside > ul > li').removeClass('current');
-                $(this).addClass('current');
-            });
-
-            $(window).scroll(function () {
-                if ($(window).scrollTop() > 125) {
-                    $('aside section:eq(0)').css({
-                        position: "fixed",
-                        top: "51px",
-                        backgroundColor: "#fff"
-                    })
-                } else {
-                    $('aside section:eq(0)').css({
-                        position: "inherit",
-                        borderLeft: 0
-                    })
-                }
-            });
-        }
-    },
-    initArticle: function (tocLabel, siteViewLabel) {
-        this._initArticleCommon(tocLabel, siteViewLabel);
+    $('.responsive .icon-list').click(function () {
+      $('.responsive .list').slideToggle()
+    })
+  },
+  initToc: function () {
+    var $articleToc = $('.article__toc')
+    if ($articleToc.length === 0) {
+      return false
    }
-};
-Skin.init();
+
+    $articleToc.css({
+      width: $articleToc.parent().width(),
+      left: $articleToc.parent().offset().left,
+    }).find('a').click(function () {
+      $articleToc.find('li').removeClass('toc--current')
+      $(this).parent().addClass('toc--current')
+      var id = $(this).attr('href')
+      setTimeout(function () {
+        $(window).scrollTop($(id).offset().top - 60)
+      })
+    })
+  },
+}
+
+$(document).ready(function () {
+  Skin.init()
+})
--- a/9IPHP/js/common.min.js
+++ b/9IPHP/js/common.min.js
@@ -1 +1 @@
-var Skin={_initCommon:function(i){var t=$("header .banner"),n=$("header .navbar");$(window).scroll(function(){if(125<$(window).scrollTop()?i.show():i.hide(),$(window).width()<701)return!1;$(window).scrollTop()>t.height()?(n.addClass("pin"),$(".main-wrap").parent().css("margin-top","86px")):(n.removeClass("pin"),$(".main-wrap").parent().css("margin-top","0"))})},init:function(){this._initCommon($(".icon-up")),$(".navbar nav a").each(function(){this.href===location.href&&(this.className="current")}),$(".responsive .list a").each(function(){this.href===location.href&&$(this).parent().addClass("current")}),$(".responsive .icon-list").click(function(){$(".responsive .list").slideToggle()})},_initArticleCommon:function(i,t){if(0<$(".b3-solo-list li").length&&1e3<$(window).width()){$("aside").addClass("has-toc");var n='<ul class="fn-clear"><li class="current" data-tab="toc">'+i+'</li><li data-tab="site">'+t+"</li></ul><section></section>";$("aside").prepend(n);var o=$("aside section:first").html($(".b3-solo-list")),s=$("aside section:last");o.height($(window).height()-154).css({overflow:"auto",width:$("aside").width()+"px"}),s.hide(),$("aside > ul > li").click(function(){"toc"===$(this).data("tab")?s.animate({opacity:"0",top:"-50px"},300,function(){o.show().css("top","-50px"),o.animate({opacity:"1",top:"0"},300).show()}):o.animate({opacity:"0",top:"-50px"},300,function(){o.hide().css("top","-50px"),s.animate({opacity:"1",top:"0"},300).show()}).hide(),$("aside > ul > li").removeClass("current"),$(this).addClass("current")}),$(window).scroll(function(){125<$(window).scrollTop()?$("aside section:eq(0)").css({position:"fixed",top:"51px",backgroundColor:"#fff"}):$("aside section:eq(0)").css({position:"inherit",borderLeft:0})})}},initArticle:function(i,t){this._initArticleCommon(i,t)}};Skin.init();
+var Skin={_initCommon:function(i){var n=$("header .banner"),t=$("header .navbar");$(window).scroll(function(){if(125<$(window).scrollTop()?i.show():i.hide(),$(window).width()<701)return!1;$(window).scrollTop()>n.height()?(t.addClass("pin"),$(".main-wrap").parent().css("margin-top","81px"),$(".article__toc").css("position","fixed")):(t.removeClass("pin"),$(".main-wrap").parent().css("margin-top","0"),$(".article__toc").css("position","inherit"))}),$(window).scroll()},init:function(){this._initCommon($(".icon-up")),$(".navbar nav a").each(function(){this.href===location.href&&(this.className="current")}),$(".responsive .list a").each(function(){this.href===location.href&&$(this).parent().addClass("current")}),$(".responsive .icon-list").click(function(){$(".responsive .list").slideToggle()})},initToc:function(){var n=$(".article__toc");if(0===n.length)return!1;n.css({width:n.parent().width(),left:n.parent().offset().left}).find("a").click(function(){n.find("li").removeClass("toc--current"),$(this).parent().addClass("toc--current");var i=$(this).attr("href");setTimeout(function(){$(window).scrollTop($(i).offset().top-60)})})}};$(document).ready(function(){Skin.init()});
--- a/9IPHP/js/isotope.pkgd.js
+++ b/9IPHP/js/isotope.pkgd.js
--- a/9IPHP/js/isotope.pkgd.min.js
+++ b/9IPHP/js/isotope.pkgd.min.js
--- a/9IPHP/links.ftl
+++ b/9IPHP/links.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${linkLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${linkLabel}"/>
-        <meta name="description" content="${metaDescription},${linkLabel}"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/9IPHP/macro-head.ftl
+++ b/9IPHP/macro-head.ftl
@@ -1,37 +0,0 @@
-<#--
-
-    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-->
-<#macro head title>
-<meta charset="utf-8" />
-<title>${title}</title>
-<#nested>
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<meta name="author" content="${blogTitle?html}" />
-<meta name="generator" content="Solo" />
-<meta name="owner" content="B3log Team" />
-<meta name="revised" content="${blogTitle?html}, ${year}" />
-<meta name="copyright" content="B3log" />
-<meta http-equiv="Window-target" content="_top" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
-<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
-<link rel="manifest" href="${servePath}/manifest.json">
-<link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
-${htmlHead}
-</#macro>
--- a/9IPHP/page.ftl
+++ b/9IPHP/page.ftl
@@ -17,15 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${page.pageTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
-        <meta name="description" content="${metaDescription}" />
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -34,7 +33,7 @@
            <div class="main-wrap">
                <main>
                    <article class="post">
-                        <div class="content-reset">
+                        <div class="vditor-reset">
                        ${page.pageContent}
                        </div>
                        <@comments commentList=pageComments article=page></@comments>
--- a/9IPHP/side.ftl
+++ b/9IPHP/side.ftl
@@ -17,48 +17,54 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
+<#include "../../common-template/macro-user_site.ftl">
 <aside>
+    <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
+        <#include "../../common-template/toc.ftl"/>
+    <#else>
    <section>
        <#if noticeBoard??>
-            <div class="ad content-reset">
-                ${noticeBoard}
-            </div>
+        <div class="ad vditor-reset">
+            ${noticeBoard}
+        </div>
        </#if>

        <#if 0 != mostUsedCategories?size>
-            <div class="module">
-                <header><h2>${categoryLabel}</h2></header>
-                <main>
-                    <#list mostUsedCategories as category>
-                        <a href="${servePath}/category/${category.categoryURI}"
-                           aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
-                           class="tag tooltipped tooltipped-n">
-                                ${category.categoryTitle}</a>
-                    </#list>
-                </main>
-            </div>
+        <div class="module">
+            <header><h2>${categoryLabel}</h2></header>
+            <main>
+                <#list mostUsedCategories as category>
+                    <a href="${servePath}/category/${category.categoryURI}"
+                       aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
+                       class="tag vditor-tooltipped vditor-tooltipped__n">
+                        ${category.categoryTitle}</a>
+                </#list>
+            </main>
+        </div>
        </#if>

        <#if 0 != mostUsedTags?size>
-            <div class="module">
-                <header><h2>${tagsLabel}</h2></header>
-                <main>
-                    <#list mostUsedTags as tag>
-                        <a rel="tag"
-                           href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"
-                           class="tag tooltipped tooltipped-n"
-                           aria-label="${tag.tagPublishedRefCount} ${countLabel}${articleLabel}">
-                                ${tag.tagTitle}</a>
-                    </#list>
-                </main>
-            </div>
+        <div class="module">
+            <header><h2>${tagsLabel}</h2></header>
+            <main>
+                <#list mostUsedTags as tag>
+                    <a rel="tag"
+                       href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"
+                       class="tag vditor-tooltipped vditor-tooltipped__n"
+                       aria-label="${tag.tagPublishedRefCount} ${countLabel}${articleLabel}">
+                        ${tag.tagTitle}</a>
+                </#list>
+            </main>
+        </div>
        </#if>

        <div class="module meta">
            <header>
-                <h2>${adminUser.userName}</h2>
+                <h2 class="ft__center">
+                    <@userSite dir="nw"></@userSite>
+                </h2>
            </header>
-            <main class="fn-clear">
+            <main class="fn__clear">
                <img src="${adminUser.userAvatar}" aria-label="${adminUser.userName}"/>
                <div class="fn-right">
                    <a href="${servePath}/archives.html">
@@ -74,41 +80,42 @@
        </div>

        <#if 0 != mostCommentArticles?size>
-            <div class="module">
-                <header><h2>${mostCommentArticlesLabel}</h2></header>
-                <main class="list">
-                    <ul>
-                        <#list mostCommentArticles as article>
-                            <li>
-                                <a rel="nofollow" aria-label="${article.articleCommentCount} ${commentLabel}"
-                                   class="tooltipped tooltipped-e"
-                                   href="${servePath}${article.articlePermalink}">
-                                    ${article.articleTitle}
-                                </a>
-                            </li>
-                        </#list>
-                    </ul>
-                </main>
-            </div>
+        <div class="module">
+            <header><h2>${mostCommentArticlesLabel}</h2></header>
+            <main class="list">
+                <ul>
+                    <#list mostCommentArticles as article>
+                        <li>
+                            <a rel="nofollow" aria-label="${article.articleCommentCount} ${commentLabel}"
+                               class="vditor-tooltipped vditor-tooltipped__e"
+                               href="${servePath}${article.articlePermalink}">
+                                ${article.articleTitle}
+                            </a>
+                        </li>
+                    </#list>
+                </ul>
+            </main>
+        </div>
        </#if>

        <#if 0 != mostViewCountArticles?size>
-            <div class="module">
-                <header><h2>${mostViewCountArticlesLabel}</h2></header>
-                <main class="list">
-                    <ul>
-                        <#list mostViewCountArticles as article>
-                            <li>
-                                <a rel="nofollow" aria-label="${article.articleCommentCount} ${commentLabel}"
-                                   class="tooltipped tooltipped-e"
-                                   href="${servePath}${article.articlePermalink}">
-                                    ${article.articleTitle}
-                                </a>
-                            </li>
-                        </#list>
-                    </ul>
-                </main>
-            </div>
+        <div class="module">
+            <header><h2>${mostViewCountArticlesLabel}</h2></header>
+            <main class="list">
+                <ul>
+                    <#list mostViewCountArticles as article>
+                        <li>
+                            <a rel="nofollow" aria-label="${article.articleCommentCount} ${commentLabel}"
+                               class="vditor-tooltipped vditor-tooltipped__e"
+                               href="${servePath}${article.articlePermalink}">
+                                ${article.articleTitle}
+                            </a>
+                        </li>
+                    </#list>
+                </ul>
+            </main>
+        </div>
        </#if>
    </section>
+    </#if>
 </aside>
--- a/9IPHP/tag-articles.ftl
+++ b/9IPHP/tag-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${tag.tagTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        <@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/9IPHP/tags.ftl
+++ b/9IPHP/tags.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${allTagsLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
-        <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -37,7 +36,7 @@
                    </div>
                    <div class="tags">
                        <#list tags as tag>
-                            <a rel="tag" data-count="${tag.tagPublishedRefCount}" class="tag"
+                            <a rel="tag" class="tag"
                               href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                                <span>${tag.tagTitle}</span>
                                (<b>${tag.tagPublishedRefCount}</b>)
@@ -49,16 +48,5 @@
            </div>
        </div>
        <#include "footer.ftl">
-            <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/isotope.pkgd.min.js" charset="utf-8"></script>
-            <script>
-            $('.tags').isotope({
-                transitionDuration: '1.5s',
-                filter: 'a',
-                layoutMode: 'fitRows'
-            });
-            $('.tags').isotope({
-                sortBy: 'random'
-            });
-            </script>
    </body>
 </html>
--- a/Andrea/archive-articles.ftl
+++ b/Andrea/archive-articles.ftl
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-        </@head>
+         <@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
+             <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+         </@head>
    </head>
    <body>
        ${topBarReplacement}
--- a/Andrea/archives.ftl
+++ b/Andrea/archives.ftl
@@ -0,0 +1,71 @@
+<#--
+
+    Solo - A small and beautiful blogging system written in Java.
+    Copyright (c) 2010-2019, b3log.org & hacpai.com
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+-->
+<#include "../../common-template/macro-common_head.ftl">
+<!DOCTYPE html>
+<html>
+<head>
+        <@head title="${allTagsLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+        </@head>
+</head>
+<body>
+${topBarReplacement}
+        <#include "side-tool.ftl">
+<div class="wrapper">
+            <#include "header.ftl">
+    <div>
+        <div class="main">
+            <div class="main-content vditor-content">
+                <#if 0 != archiveDates?size>
+                    <ul id="tags" class="fn__clear">
+                    <#list archiveDates as archiveDate>
+                        <li>
+                            <#if "en" == localeString?substring(0, 2)>
+                                <a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
+                                    ${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
+                                </a>
+                            <#else>
+                                    <a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
+                                        ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
+                                    </a>
+                            </#if>
+                        </li>
+                    </#list>
+                    </ul>
+                </#if>
+                <div class="clear"></div>
+            </div>
+            <div class="main-footer"></div>
+        </div>
+        <div class="side-navi">
+                    <#include "side.ftl">
+        </div>
+        <div class="clear"></div>
+        <div class="brush">
+            <div class="brush-icon"></div>
+            <div id="brush"></div>
+        </div>
+        <div class="footer">
+                    <#include "footer.ftl">
+        </div>
+    </div>
+</div>
+</body>
+</html>
--- a/Andrea/article-list.ftl
+++ b/Andrea/article-list.ftl
@@ -55,7 +55,7 @@
            </div>
        </div>
        <div class="clear"></div>
-        <div class="article-abstract content-reset">
+        <div class="article-abstract vditor-reset">
            ${article.articleAbstract}
            <div class="clear"></div>
            <a class="right underline" href="${servePath}${article.articlePermalink}">
--- a/Andrea/article.ftl
+++ b/Andrea/article.ftl
@@ -17,38 +17,22 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${article.articleTitle} - ${blogTitle}">
-        <meta name="keywords" content="${article.articleTags}" />
-        <meta name="description" content="${article.articleAbstract?html}" />
-        </@head>
+        <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
+            <link rel="stylesheet"
+                  href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        <#if previousArticlePermalink??>
            <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
        </#if>
        <#if nextArticlePermalink??>
            <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
        </#if>
-            <!-- Open Graph -->
-            <meta property="og:locale" content="zh_CN"/>
-            <meta property="og:type" content="article"/>
-            <meta property="og:title" content="${article.articleTitle}"/>
-            <meta property="og:description" content="${article.articleAbstract?html}"/>
-            <meta property="og:image" content="${article.authorThumbnailURL}"/>
-            <meta property="og:url" content="${servePath}${article.articlePermalink}"/>
-            <meta property="og:site_name" content="Solo"/>
-            <!-- Twitter Card -->
-            <meta name="twitter:card" content="summary"/>
-            <meta name="twitter:description" content="${article.articleAbstract?html}"/>
-            <meta name="twitter:title" content="${article.articleTitle}"/>
-            <meta name="twitter:image" content="${article.authorThumbnailURL}"/>
-            <meta name="twitter:url" content="${servePath}${article.articlePermalink}"/>
-            <meta name="twitter:site" content="@DL88250"/>
-            <meta name="twitter:creator" content="@DL88250"/>
+        </@head>
    </head>
    <body>
        ${topBarReplacement}
@@ -92,7 +76,7 @@
                                </div>
                            </div>
                            <div class="clear"></div>
-                            <div class="content-reset">
+                            <div class="vditor-reset">
                                ${article.articleContent}
                                <#if "" != article.articleSign.signHTML?trim>
                                <div class="marginTop12">
--- a/Andrea/author-articles.ftl
+++ b/Andrea/author-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${authorName} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${authorName}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Andrea/category-articles.ftl
+++ b/Andrea/category-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${category.categoryTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Andrea/common-comment.ftl
+++ b/Andrea/common-comment.ftl
@@ -36,7 +36,7 @@
               onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
        </#if>
            &nbsp;${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
-            <div class="comment-content content-reset">
+            <div class="comment-content vditor-reset">
            ${comment.commentContent}
            </div>
        <#if article.commentable>
--- a/Andrea/css/base.css
+++ b/Andrea/css/base.css
--- a/Andrea/css/base.scss
+++ b/Andrea/css/base.scss
--- a/Andrea/footer.ftl
+++ b/Andrea/footer.ftl
@@ -20,32 +20,21 @@
 <div class="copyright">
    &copy; ${year} - <a href="${servePath}">${blogTitle}</a>${footerContent}<br/>
    Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}<br/>
-    Theme by <a rel="friend" href="http://www.madeincima.eu/" target="_blank">Andrea</a> & <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
+    Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a> by <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
 </div>
 <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
+<script src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}"></script>
+<#include "../../common-template/label.ftl">
 <script type="text/javascript">
-    var latkeConfig = {
-        "servePath": "${servePath}",
-        "staticServePath": "${staticServePath}",
-        "isLoggedIn": "${isLoggedIn?string}"
-    };
-    
-    var Label = {
-        "markedAvailable": ${markedAvailable?c},
-        "adminLabel": "${adminLabel}",
-        "logoutLabel": "${logoutLabel}",
-        "skinDirName": "${skinDirName}"
-    };
-
    // init brush
    var buildBrush = function () {
-        $("#brush").height(document.documentElement.scrollHeight - document.documentElement.clientHeight).css("background-position",
-        parseInt((document.documentElement.scrollWidth - 910) / 2 - 56) + "px -150px");
+        $("#brush").height($('body').height() - $(window).height() + 200).css("background-position",
+        parseInt((document.documentElement.scrollWidth - 910) / 2 - 56) + "px -200px");
    };

    // init
    $(document).ready(function () {
-        Util.init();
+        Util.setTopBar()
        Util.replaceSideEm($("#naviComments li .side-comment"));
    
        // brush
--- a/Andrea/header.ftl
+++ b/Andrea/header.ftl
@@ -25,27 +25,6 @@
            </a>
        </h1>
        <span class="sub-title">${blogSubtitle}</span>
-        <div>
-            <span>
-                ${viewCount1Label}
-                <span class='error-msg'>
-                    ${statistic.statisticBlogViewCount}
-                </span>
-            </span>
-            <span>
-                ${articleCount1Label}
-                <span class='error-msg'>
-                    ${statistic.statisticPublishedBlogArticleCount}
-                </span>
-            </span>
-            <span>
-                ${commentCount1Label}
-                <span class='error-msg'>
-                    ${statistic.statisticPublishedBlogCommentCount}
-                </span>
-            </span>
-        </div>
-        <span class="clear"></span>
    </div>
    <div class="right">
        <ul>
--- a/Andrea/index.ftl
+++ b/Andrea/index.ftl
@@ -17,17 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${blogTitle}">
-        <#if metaKeywords??>
-        <meta name="keywords" content="${metaKeywords}"/>
-        </#if>
-        <#if metaDescription??>
-        <meta name="description" content="${metaDescription}"/>
-        </#if>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Andrea/lang/lang_en_US.properties
+++ b/Andrea/lang/lang_en_US.properties
@@ -18,7 +18,7 @@

 #
 # Description: Solo language configurations(en_US).
-# Version: 3.0.0.0, Feb 23, 2019
+# Version: 3.2.0.0, Mar 20, 2019
 # Author: Liang Ding
 # Author: Vanessa
 #
@@ -65,3 +65,4 @@ canntBeLocalhostOnProductionLabel=Can not set host as localhost on production!
 noDataLable=NO Data
 ####
 confirmRemoveLabel=Are You Sure?
+moreArchiveLabel=More Archive
--- a/Andrea/lang/lang_zh_CN.properties
+++ b/Andrea/lang/lang_zh_CN.properties
@@ -18,7 +18,7 @@

 #
 # Description: Solo default language configurations(zh_CN).
-# Version: 3.0.0.0, Feb 23, 2019
+# Version: 3.2.0.0, Mar 20, 2019
 # Author: Liang Ding
 # Author: Vanessa
 #
@@ -66,3 +66,4 @@ canntBeLocalhostOnProductionLabel=GAE \u73AF\u5883\u4E0A\u8BF7\u52FF\u6307\u5B9A
 noDataLable=\u65E0\u6570\u636E
 ####
 confirmRemoveLabel=\u786E\u5B9A\u5220\u9664\uFF1F
+moreArchiveLabel=\u66F4\u591A\u5B58\u6863
--- a/Andrea/macro-head.ftl
+++ b/Andrea/macro-head.ftl
@@ -1,36 +0,0 @@
-<#--
-
-    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-->
-<#macro head title>
-<meta charset="utf-8" />
-<title>${title}</title>
-<#nested>
-<meta name="author" content="${blogTitle?html}" />
-<meta name="generator" content="Solo" />
-<meta name="owner" content="B3log Team" />
-<meta name="revised" content="${blogTitle?html}, ${year}" />
-<meta name="copyright" content="B3log" />
-<meta http-equiv="Window-target" content="_top" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
-<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
-<link rel="manifest" href="${servePath}/manifest.json">
-<link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
-${htmlHead}
-</#macro>
--- a/Andrea/page.ftl
+++ b/Andrea/page.ftl
@@ -17,15 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${page.pageTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
-        <meta name="description" content="${metaDescription}" />
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -37,7 +36,7 @@
                <div class="main">
                    <div class="main-content">
                        <div class="article">
-                            <div class="content-reset" style="margin-top: 0px;">
+                            <div class="vditor-reset" style="margin-top: 0px;">
                                ${page.pageContent}
                            </div>
                        </div>
--- a/Andrea/side.ftl
+++ b/Andrea/side.ftl
@@ -17,145 +17,196 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#if "" != noticeBoard>
 <div class="item" style="margin-top: -35px;">
-    <h4>${noticeBoardLabel}</h4>
-    <div class="marginLeft12 marginTop12">
-        ${noticeBoard}
-    </div>
+    <#include "../../common-template/macro-user_site.ftl">
+    <h4>
+    <@userSite dir="nw"></@userSite>
+    </h4>
+    <dl>
+        <dd>
+            <ul>
+                <li>
+                ${viewCount1Label}
+                    <span class='error-msg'>
+                    ${statistic.statisticBlogViewCount}
+                    </span>
+                </li>
+                <li>
+                ${articleCount1Label}
+                    <span class='error-msg'>
+                    ${statistic.statisticPublishedBlogArticleCount}
+                    </span>
+                </li>
+                <li>
+                ${commentCount1Label}
+                    <span class='error-msg'>
+                    ${statistic.statisticPublishedBlogCommentCount}
+                    </span>
+                </li>
+            </ul>
+        </dd>
+    </dl>
+
+    <#if "" != noticeBoard>
+        <div class="margin12">
+            ${noticeBoard}
+        </div>
+    </#if>
 </div>
-</#if>
-<#if 0 != recentComments?size || 0 != mostCommentArticles?size || 0 != mostViewCountArticles?size>
+
+
+<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
 <div class="item">
    <dl>
-        <#if 0 != mostCommentArticles?size>
        <dd>
-            <h4>${mostCommentArticlesLabel}</h4>
-            <ul>
-                <#list mostCommentArticles as article>
-                <li>
-                    <a rel="nofollow" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}">
-                        <sup>[${article.articleCommentCount}]</sup>
-                        ${article.articleTitle}
-                    </a>
-                </li>
-                </#list>
-            </ul>
+            <h4>${tocLabel}</h4>
+            <#include "../../common-template/toc.ftl"/>
        </dd>
-        </#if>
-        <#if 0 != recentComments?size>
-        <dd>
-            <h4>${recentCommentsLabel}</h4>
-            <ul id="naviComments">
-                <#list recentComments as comment>
-                <li>
-                    <a class="author" title="${comment.commentName}" target="_blank" href="${comment.commentURL}">
-                        ${comment.commentName}
-                    </a>:
-                    <a rel="nofollow" class='side-comment' href="${servePath}${comment.commentSharpURL}">
-                        ${comment.commentContent}
-                    </a>
-                </li>
-                </#list>
-            </ul>
-        </dd>
-        </#if>
-        <#if 0 != mostViewCountArticles?size>
-        <dd>
-            <h4>${mostViewCountArticlesLabel}</h4>
-            <ul>
-                <#list mostViewCountArticles as article>
-                <li>
-                    <a rel="nofollow" title="${article.articleTitle}"
-                       href="${servePath}${article.articlePermalink}">
-                        <sup>[${article.articleViewCount}]</sup>
-                        ${article.articleTitle}
-                    </a>
-                </li>
-                </#list>
-            </ul>
-        </dd>
-        </#if>
    </dl>
 </div>
-</#if>

-<#if 0 != mostUsedCategories?size || 0 != mostUsedTags?size>
+<#else>
+    <#if 0 != recentComments?size || 0 != mostCommentArticles?size || 0 != mostViewCountArticles?size>
    <div class="item">
        <dl>
-            <#if 0 != mostUsedCategories?size>
+            <#if 0 != mostCommentArticles?size>
            <dd>
-                <h4>${categoryLabel}</h4>
+                <h4>${mostCommentArticlesLabel}</h4>
                <ul>
-                    <#list mostUsedCategories as category>
+                    <#list mostCommentArticles as article>
                        <li>
-                            <a href="${servePath}/category/${category.categoryURI}">
-                                ${category.categoryTitle} (${category.categoryTagCnt})</a>
+                            <a rel="nofollow" title="${article.articleTitle}"
+                               href="${servePath}${article.articlePermalink}">
+                                <sup>[${article.articleCommentCount}]</sup>
+                                ${article.articleTitle}
+                            </a>
                        </li>
                    </#list>
                </ul>
            </dd>
            </#if>
-            <#if 0 != mostUsedTags?size>
+            <#if 0 != recentComments?size>
+            <dd>
+                <h4>${recentCommentsLabel}</h4>
+                <ul id="naviComments">
+                    <#list recentComments as comment>
+                        <li>
+                            <a class="author" title="${comment.commentName}" target="_blank" href="${comment.commentURL}">
+                                ${comment.commentName}
+                            </a>:
+                            <a rel="nofollow" class='side-comment' href="${servePath}${comment.commentSharpURL}">
+                                ${comment.commentContent}
+                            </a>
+                        </li>
+                    </#list>
+                </ul>
+            </dd>
+            </#if>
+            <#if 0 != mostViewCountArticles?size>
+            <dd>
+                <h4>${mostViewCountArticlesLabel}</h4>
+                <ul>
+                    <#list mostViewCountArticles as article>
+                        <li>
+                            <a rel="nofollow" title="${article.articleTitle}"
+                               href="${servePath}${article.articlePermalink}">
+                                <sup>[${article.articleViewCount}]</sup>
+                                ${article.articleTitle}
+                            </a>
+                        </li>
+                    </#list>
+                </ul>
+            </dd>
+            </#if>
+        </dl>
+    </div>
+    </#if>
+
+    <#if 0 != mostUsedCategories?size || 0 != mostUsedTags?size>
+        <div class="item">
+            <dl>
+                <#if 0 != mostUsedCategories?size>
                <dd>
-                    <h4>${tagsLabel}</h4>
+                    <h4>${categoryLabel}</h4>
                    <ul>
-                        <#list mostUsedTags as tag>
+                        <#list mostUsedCategories as category>
                            <li>
-                                <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
-                                    ${tag.tagTitle} (${tag.tagPublishedRefCount})</a>
+                                <a href="${servePath}/category/${category.categoryURI}">
+                                    ${category.categoryTitle} (${category.categoryTagCnt})</a>
                            </li>
                        </#list>
                    </ul>
                </dd>
-            </#if>
+                </#if>
+                <#if 0 != mostUsedTags?size>
+                    <dd>
+                        <h4>${tagsLabel}</h4>
+                        <ul>
+                            <#list mostUsedTags as tag>
+                                <li>
+                                    <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})"
+                                       href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
+                                        ${tag.tagTitle} (${tag.tagPublishedRefCount})</a>
+                                </li>
+                            </#list>
+                        </ul>
+                    </dd>
+                </#if>
+            </dl>
+        </div>
+    </#if>
+
+    <#if 0 != links?size>
+    <div class="item">
+        <dl>
+            <dd>
+                <h4>${linkLabel}</h4>
+                <ul class="navi-tags">
+                    <#list links as link>
+                        <li>
+                            <a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
+                                ${link.linkTitle}</a>
+                            <img onclick="window.location='${link.linkAddress}'"
+                                 alt="${link.linkTitle}"
+                                 src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>"
+                                 width="16" height="16"/>
+                        </li>
+                    </#list>
+                </ul>
+            </dd>
        </dl>
    </div>
-</#if>
-
-<#if 0 != links?size>
-<div class="item">
-    <dl>
-        <dd>
-            <h4>${linkLabel}</h4>
-            <ul class="navi-tags">
-                <#list links as link>
-                <li>
-                    <a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
-                        ${link.linkTitle}</a>
-                     <img onclick="window.location='${link.linkAddress}'"
-                         alt="${link.linkTitle}" 
-                         src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" />
-                </li>
-                </#list>
-            </ul>
-        </dd>
-    </dl>
-</div>
-</#if>
-<#if 0 != archiveDates?size>
-<div class="item">
-    <dl>
-        <dd>
-            <h4>${archiveLabel}</h4>
-            <ul>
-                <#list archiveDates as archiveDate>
-                <#if archiveDate_index < 10>
-                <li>
-                    <#if "en" == localeString?substring(0, 2)>
-                    <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
-                       title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
-                        ${archiveDate.monthName} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount})</a>
-                    <#else>
-                    <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
-                       title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
-                        ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount})</a>
+    </#if>
+    <#if 0 != archiveDates?size>
+    <div class="item">
+        <dl>
+            <dd>
+                <h4>${archiveLabel}</h4>
+                <ul>
+                    <#list archiveDates as archiveDate>
+                    <#if archiveDate_index < 10>
+                    <li>
+                        <#if "en" == localeString?substring(0, 2)>
+                            <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
+                               title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
+                                ${archiveDate.monthName} ${archiveDate.archiveDateYear}
+                                (${archiveDate.archiveDatePublishedArticleCount})</a>
+                        <#else>
+                        <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
+                           title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
+                            ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
+                            (${archiveDate.archiveDatePublishedArticleCount})</a>
+                        </#if>
+                    </li>
+                    <#elseif archiveDate_index == 10>
+                    <li>
+                        <a href="${servePath}/archives.html">${moreArchiveLabel}</a>
+                    </li>
                    </#if>
-                </li>
-                </#if>
-                </#list>
-            </ul>
-        </dd>
-    </dl>
-</div>
+                    </#list>
+                </ul>
+            </dd>
+        </dl>
+    </div>
+    </#if>
 </#if>
--- a/Andrea/skin.properties
+++ b/Andrea/skin.properties
@@ -18,9 +18,9 @@

 #
 # Description: Andrea skin.
-# Version: 1.0.0.8, Nov 21, 2012
+# Version: 1.0.0.8, Mar 20, 2019
 # Author: Liyuan Li
 #

 name=Andrea
-memo=Refers to http://www.madeincima.eu
+memo=https://github.com/b3log/solo-skins
--- a/Andrea/tag-articles.ftl
+++ b/Andrea/tag-articles.ftl
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${tag.tagTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-        </@head>
+       <@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
+           <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+       </@head>
    </head>
    <body>
        ${topBarReplacement}
--- a/Andrea/tags.ftl
+++ b/Andrea/tags.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${allTagsLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
-        <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -33,8 +32,8 @@
            <#include "header.ftl">
            <div>
                <div class="main">
-                    <div class="main-content">
-                        <ul id="tags">
+                    <div class="main-content vditor-content">
+                        <ul id="tags" class="fn__clear">
                            <#list tags as tag>
                            <li>
                                <a rel="tag" data-count="${tag.tagPublishedRefCount}"
--- a/Bruce/archive-articles.ftl
+++ b/Bruce/archive-articles.ftl
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-        </@head>
+         <@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
+             <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+         </@head>
    </head>
    <body>
        <#include "header.ftl">
--- a/Bruce/archives.ftl
+++ b/Bruce/archives.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${archiveLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
-        <meta name="description" content="${metaDescription},${archiveLabel}"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -42,12 +41,10 @@
                        <#if curYear != archiveDate.archiveDateYear?number></div>
                    
                    <div class="row"><hr/><h2>${archiveDate.archiveDateYear} ${yearLabel}</h2></#if>
-                        <span>
                            <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
                               title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
                                ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
-                            <span class="gray">•<span>
-                        </span>
+                            <span class="gray">•</span>

                        <#assign curYear = archiveDate.archiveDateYear?number>
                        </#list>
--- a/Bruce/article.ftl
+++ b/Bruce/article.ftl
@@ -17,38 +17,22 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${article.articleTitle} - ${blogTitle}">
-        <meta name="keywords" content="${article.articleTags}" />
-        <meta name="description" content="${article.articleAbstract?html}" />
-        </@head>
+        <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
+            <link rel="stylesheet"
+                  href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        <#if previousArticlePermalink??>
            <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
        </#if>
        <#if nextArticlePermalink??>
            <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
        </#if>
-            <!-- Open Graph -->
-            <meta property="og:locale" content="zh_CN"/>
-            <meta property="og:type" content="article"/>
-            <meta property="og:title" content="${article.articleTitle}"/>
-            <meta property="og:description" content="${article.articleAbstract?html}"/>
-            <meta property="og:image" content="${article.authorThumbnailURL}"/>
-            <meta property="og:url" content="${servePath}${article.articlePermalink}"/>
-            <meta property="og:site_name" content="Solo"/>
-            <!-- Twitter Card -->
-            <meta name="twitter:card" content="summary"/>
-            <meta name="twitter:description" content="${article.articleAbstract?html}"/>
-            <meta name="twitter:title" content="${article.articleTitle}"/>
-            <meta name="twitter:image" content="${article.authorThumbnailURL}"/>
-            <meta name="twitter:url" content="${servePath}${article.articlePermalink}"/>
-            <meta name="twitter:site" content="@DL88250"/>
-            <meta name="twitter:creator" content="@DL88250"/>
+        </@head>
    </head>
    <body>
        <#include "header.ftl">
@@ -79,7 +63,7 @@
                            </div>

                            <div class="row article-content code-highlight">
-                                <div class="col-sm-12 content-reset" id="abstract${article.oId}">
+                                <div class="col-sm-12 vditor-reset" id="abstract${article.oId}">
                                    ${article.articleContent}
                                    <#if "" != article.articleSign.signHTML?trim>
                                    <p>
@@ -102,9 +86,13 @@
                    </#if>
                    <div class="col-sm-2"></div>
                </div>
-            </div>  
+            </div>
        </div>

+        <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
+            <#include "../../common-template/toc.ftl"/>
+        </#if>
+
        <#include "footer.ftl">
        <@comment_script oId=article.oId commentable=article.commentable>
        page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
--- a/Bruce/category-articles.ftl
+++ b/Bruce/category-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${category.categoryTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Bruce/common-comment.ftl
+++ b/Bruce/common-comment.ftl
@@ -17,7 +17,7 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<div class="row comment" id="${comment.oId}">
+<div class="comment fn__clear" id="${comment.oId}">
    <img class="col-sm-1" title="${comment.commentName}"
         alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
    <div class="col-sm-11">
@@ -38,6 +38,6 @@
            </#if></span>

        </div>
-        <div class="row code-highlight article-content content-reset">${comment.commentContent}</div>
+        <div class="row code-highlight article-content vditor-reset">${comment.commentContent}</div>
    </div>
 </div>
--- a/Bruce/css/_bootstrap.scss
+++ b/Bruce/css/_bootstrap.scss
@@ -2365,7 +2365,7 @@ output {
  display: block;
  width: 100%;
  height: 34px;
-  padding: 6px 12px;
+  padding: 6px 8px;
  font-size: 14px;
  line-height: 1.42857143;
  color: #555;
@@ -3943,6 +3943,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
  line-height: 20px;
 }
@media (max-width: 767px) {
+  .comment > img {
+    display: none !important;
+  }
  .navbar-nav .open .dropdown-menu {
    position: static;
    float: none;
@@ -6211,4 +6214,4 @@ button.close {
    display: none !important;
  }
 }
-/*# sourceMappingURL=bootstrap.css.map */
+
--- a/Bruce/css/base.css
+++ b/Bruce/css/base.css
--- a/Bruce/css/base.scss
+++ b/Bruce/css/base.scss
@@ -21,12 +21,47 @@
 *
 * @author <a href="http://88250.b3log.org">Liang Ding</a>
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 2.0.0.0, Feb 21, 2019
+ * @version 2.1.0.0, Mar 21, 2019
 */
-
-@import "../../../scss/reset-content";
+@import "bootstrap";
+@import "../../../scss/usite";
+@import "../../../scss/toc";
+@import "../../../scss/function";
@import "vditor/src/assets/scss/classic";

+.article__toc {
+    position: fixed;
+    top: 90px;
+    bottom: 198px;
+    padding-left: 0;
+    left: 100%;
+}
+#comments {
+    position: relative;
+}
+.comment-body-ref {
+    position: absolute;
+    background-color: #fff;
+    width: 100%;
+    left: 64px;
+    border: 1px solid #ccc;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+    border-radius: 5px;
+    padding: 10px 0;
+}
+
+.user__site {
+    display: inline-block;
+    height: 20px;
+    width: 20px;
+    margin: 0 5px 15px 0;
+    svg {
+        height: 20px;
+        width: 20px;
+        fill: currentColor;
+    }
+}
+
 body, button, input, select, textarea { 
    font: 400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;
    letter-spacing: 0.01rem;
@@ -62,19 +97,6 @@ h4, h5, h6 {
    margin-bottom: 12px;
 }

-.article-content {
-    font-size: 1.1em;
-}
-
-.article-content .task-list-item {
-    list-style: none;
-    margin-left: -1em;
-}
-
-.article-content img {
-    max-width: 100%;
-}
-
 .header {
    border-bottom: 1px solid #ddd;
    background-color: #f9f9f9;
--- a/Bruce/css/bootstrap-theme.css
+++ b/Bruce/css/bootstrap-theme.css
@@ -1,453 +0,0 @@
-/**
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-}
-.btn-default {
-  text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image:      -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
-  background-image:         linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #dbdbdb;
-  border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus {
-  background-color: #e0e0e0;
-  background-position: 0 -15px;
-}
-.btn-default:active,
-.btn-default.active {
-  background-color: #e0e0e0;
-  border-color: #dbdbdb;
-}
-.btn-default:disabled,
-.btn-default[disabled] {
-  background-color: #e0e0e0;
-  background-image: none;
-}
-.btn-primary {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#2d6ca2));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #2b669a;
-}
-.btn-primary:hover,
-.btn-primary:focus {
-  background-color: #2d6ca2;
-  background-position: 0 -15px;
-}
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #2d6ca2;
-  border-color: #2b669a;
-}
-.btn-primary:disabled,
-.btn-primary[disabled] {
-  background-color: #2d6ca2;
-  background-image: none;
-}
-.btn-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image:      -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #3e8f3e;
-}
-.btn-success:hover,
-.btn-success:focus {
-  background-color: #419641;
-  background-position: 0 -15px;
-}
-.btn-success:active,
-.btn-success.active {
-  background-color: #419641;
-  border-color: #3e8f3e;
-}
-.btn-success:disabled,
-.btn-success[disabled] {
-  background-color: #419641;
-  background-image: none;
-}
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image:      -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
-.btn-info:disabled,
-.btn-info[disabled] {
-  background-color: #2aabd2;
-  background-image: none;
-}
-.btn-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image:      -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #e38d13;
-}
-.btn-warning:hover,
-.btn-warning:focus {
-  background-color: #eb9316;
-  background-position: 0 -15px;
-}
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #eb9316;
-  border-color: #e38d13;
-}
-.btn-warning:disabled,
-.btn-warning[disabled] {
-  background-color: #eb9316;
-  background-image: none;
-}
-.btn-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image:      -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #b92c28;
-}
-.btn-danger:hover,
-.btn-danger:focus {
-  background-color: #c12e2a;
-  background-position: 0 -15px;
-}
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #c12e2a;
-  border-color: #b92c28;
-}
-.btn-danger:disabled,
-.btn-danger[disabled] {
-  background-color: #c12e2a;
-  background-image: none;
-}
-.thumbnail,
-.img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background-color: #e8e8e8;
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:      -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  background-color: #357ebd;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-  background-repeat: repeat-x;
-}
-.navbar-default {
-  background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image:      -o-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f8f8f8));
-  background-image:         linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-}
-.navbar-default .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
-  background-image:      -o-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f3f3f3));
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
-}
-.navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image:      -o-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222));
-  background-image:         linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-}
-.navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
-  background-image:      -o-linear-gradient(top, #222 0%, #282828 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#222), to(#282828));
-  background-image:         linear-gradient(to bottom, #222 0%, #282828 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  border-radius: 0;
-}
-.alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-}
-.alert-success {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image:      -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #b2dba1;
-}
-.alert-info {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image:      -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #9acfea;
-}
-.alert-warning {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image:      -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
-}
-.alert-danger {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image:      -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dca7a7;
-}
-.progress {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image:      -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3071a9));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image:      -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image:      -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image:      -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image:      -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-striped {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #3071a9;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3278b3));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #3278b3;
-}
-.panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-}
-.panel-default > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:      -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:      -o-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd));
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-success > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image:      -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-info > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image:      -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-warning > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image:      -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-danger > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image:      -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.well {
-  background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image:      -o-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#f5f5f5));
-  background-image:         linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dcdcdc;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-}
-/*# sourceMappingURL=bootstrap-theme.css.map */
--- a/Bruce/css/bootstrap-theme.css.map
+++ b/Bruce/css/bootstrap-theme.css.map
--- a/Bruce/css/bootstrap.css.map
+++ b/Bruce/css/bootstrap.css.map
--- a/Bruce/footer.ftl
+++ b/Bruce/footer.ftl
@@ -17,41 +17,24 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
+<#include "../../common-template/macro-user_site.ftl">
 <div class="footer">
+    <@userSite dir="n"></@userSite>
+    <br>
    &copy; ${year} - <a href="${servePath}">${blogTitle}</a>${footerContent} Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}
    <div>
-        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">Bruce</a>
+        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
        by
        <a rel="friend" href="http://88250.b3log.org" target="_blank">88250</a>
    </div>
    <div><em>All rights reserved.</em></div>
 </div>

-<script type="text/javascript">
-    var latkeConfig = {
-        "servePath": "${servePath}",
-        "staticServePath": "${staticServePath}",
-        "isLoggedIn": "${isLoggedIn?string}"
-    };
-
-    var Label = {
-        "markedAvailable": ${markedAvailable?c},
-        "tag1Label": "${tag1Label}",
-        "viewLabel": "${viewLabel}",
-        "commentLabel": "${commentLabel}",
-        "topArticleLabel": "${topArticleLabel}",
-        "updatedLabel": "${updatedLabel}",
-        "contentLabel": "${fullContentLabel}",
-        "abstractLabel": "${abstractLabel}",
-        "adminLabel": "${adminLabel}",
-        "logoutLabel": "${logoutLabel}",
-        "skinDirName": "${skinDirName}"
-    };
-</script>
 <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/bootstrap${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
+<#include "../../common-template/label.ftl">
 <script>
-    Util.init()
+    Util.setTopBar()
 </script>
 ${plugins}
--- a/Bruce/index.ftl
+++ b/Bruce/index.ftl
@@ -17,17 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${blogTitle}">
-        <#if metaKeywords??>
-        <meta name="keywords" content="${metaKeywords}"/>
-        </#if>
-        <#if metaDescription??>
-        <meta name="description" content="${metaDescription}"/>
-        </#if>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Bruce/js/bootstrap.js
+++ b/Bruce/js/bootstrap.js
@@ -2109,6 +2109,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
  // ==============

  $(window).on('load', function () {
+    
+    $('.article__toc').animate({
+      'left': ($('.site').outerWidth() + $('.site').offset().left) + 'px'
+    }, 600)
    $('[data-spy="affix"]').each(function () {
      var $spy = $(this)
      var data = $spy.data()
--- a/Bruce/js/bootstrap.min.js
+++ b/Bruce/js/bootstrap.min.js
--- a/Bruce/links.ftl
+++ b/Bruce/links.ftl
@@ -17,20 +17,19 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${linkLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${linkLabel}"/>
-        <meta name="description" content="${metaDescription},${linkLabel}"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
        <#include "header.ftl">


-        <div class="container">
+        <div class="container" style="min-height: 70vh">
            <div class="row">
                <div class="col-sm-2"></div>

--- a/Bruce/macro-comments.ftl
+++ b/Bruce/macro-comments.ftl
@@ -18,15 +18,15 @@

 -->
 <#macro comments commentList article>
-<div class="row" id="comments">
+<div id="comments">
    <#list commentList as comment>
    <#include "common-comment.ftl"/>
    </#list>
 </div>

-<#if article.commentable>
-<div class="row cmtForm">
-    <textarea rows="3" placeholder="${postCommentsLabel}" id="comment" class="form-control"></textarea>
-</div>
-</#if>
+    <#if article.commentable>
+    <div class="cmtForm">
+        <textarea rows="3" placeholder="${postCommentsLabel}" id="comment" class="form-control"></textarea>
+    </div>
+    </#if>
 </#macro>
--- a/Bruce/macro-head.ftl
+++ b/Bruce/macro-head.ftl
@@ -1,38 +0,0 @@
-<#--
-
-    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-->
-<#macro head title>
-<meta charset="utf-8" />
-<title>${title}</title>
-<#nested>
-<meta name="author" content="${blogTitle?html}" />
-<meta name="generator" content="Solo" />
-<meta name="copyright" content="B3log" />
-<meta name="owner" content="B3log Team" />
-<meta name="revised" content="${blogTitle?html}, ${year}" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
-<meta http-equiv="Window-target" content="_top" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/bootstrap${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
-<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
-<link rel="manifest" href="${servePath}/manifest.json">
-<link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
-${htmlHead}
-</#macro>
--- a/Bruce/page.ftl
+++ b/Bruce/page.ftl
@@ -17,15 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${page.pageTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
-        <meta name="description" content="${metaDescription}" />
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -36,7 +35,7 @@
                <div class="col-sm-2"></div>

                <div class="col-sm-8 site">
-                    <div class="article content-reset">
+                    <div class="article vditor-reset">
                    ${page.pageContent}
                    </div>
                    
--- a/Bruce/tag-articles.ftl
+++ b/Bruce/tag-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${tag.tagTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        <@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -34,10 +33,8 @@
                <div class="col-sm-2"></div>
                <div class="col-sm-8 site article-list">
                    <h2>
-                        <a id="tag" rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                            ${tag.tagTitle}
                            (${tag.tagPublishedRefCount})
-                        </a>
                    </h2>
                    <#include "article-list.ftl">
                </div>
--- a/Bruce/tags.ftl
+++ b/Bruce/tags.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${allTagsLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
-        <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Community/archive-articles.ftl
+++ b/Community/archive-articles.ftl
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-        </@head>
+         <@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
+             <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+         </@head>
    </head>
    <body>
        ${topBarReplacement}
--- a/Community/article-list.ftl
+++ b/Community/article-list.ftl
@@ -67,7 +67,7 @@
            </sup>
            </#if>
        </h2>
-        <div class="content-reset">
+        <div class="vditor-reset">
            ${article.articleAbstract}
        </div>
        <div class="read-more">
--- a/Community/article.ftl
+++ b/Community/article.ftl
@@ -17,38 +17,22 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${article.articleTitle} - ${blogTitle}">
-        <meta name="keywords" content="${article.articleTags}" />
-        <meta name="description" content="${article.articleAbstract?html}" />
-        </@head>
+        <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
+            <link rel="stylesheet"
+                  href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        <#if previousArticlePermalink??>
            <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
        </#if>
        <#if nextArticlePermalink??>
            <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
        </#if>
-            <!-- Open Graph -->
-            <meta property="og:locale" content="zh_CN"/>
-            <meta property="og:type" content="article"/>
-            <meta property="og:title" content="${article.articleTitle}"/>
-            <meta property="og:description" content="${article.articleAbstract?html}"/>
-            <meta property="og:image" content="${article.authorThumbnailURL}"/>
-            <meta property="og:url" content="${servePath}${article.articlePermalink}"/>
-            <meta property="og:site_name" content="Solo"/>
-            <!-- Twitter Card -->
-            <meta name="twitter:card" content="summary"/>
-            <meta name="twitter:description" content="${article.articleAbstract?html}"/>
-            <meta name="twitter:title" content="${article.articleTitle}"/>
-            <meta name="twitter:image" content="${article.authorThumbnailURL}"/>
-            <meta name="twitter:url" content="${servePath}${article.articlePermalink}"/>
-            <meta name="twitter:site" content="@DL88250"/>
-            <meta name="twitter:creator" content="@DL88250"/>
+        </@head>
    </head>
    <body>
        ${topBarReplacement}
@@ -88,6 +72,15 @@
                            </a>
                        </li>
                    </ul>
+                    <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
+                        <br> <br>
+                        <div class="article-date">
+                            ${tocLabel}
+                        </div>
+                        <div class="arrow-right"></div>
+                        <div class="clear"></div>
+                        <#include "../../common-template/toc.ftl"/>
+                    </#if>
                </div>
                <div class="article-main article-detail-body">
                    <h2 class="title">
@@ -103,7 +96,7 @@
                        </sup>
                        </#if>
                    </h2>
-                    <div class="content-reset">
+                    <div class="vditor-reset">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div class="marginTop12">
--- a/Community/author-articles.ftl
+++ b/Community/author-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${authorName} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${authorName}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -33,7 +32,7 @@
        </div>
        <div class="content">
            <h2>
-                ${commentName1Label}${authorName}
+                ${authorName}
            </h2>
            <#include "article-list.ftl">
        </div>
--- a/Community/category-articles.ftl
+++ b/Community/category-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${category.categoryTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -32,8 +31,7 @@
            <#include "header.ftl">
        </div>
        <div class="content">
-            <h2>${categoryLabel}
-                ${category.categoryTitle}
+            <h2>${category.categoryTitle}
                (${category.categoryTagCnt})<small> ${category.categoryDescription}</small>
            </h2>
            <#include "article-list.ftl">
--- a/Community/common-comment.ftl
+++ b/Community/common-comment.ftl
@@ -35,7 +35,7 @@
        </#if>
        ${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
        </div>
-        <div class="comment-content content-reset">
+        <div class="comment-content vditor-reset">
        ${comment.commentContent}
        </div>
        <div class="clear"></div>
--- a/Community/css/base.css
+++ b/Community/css/base.css
--- a/Community/css/base.scss
+++ b/Community/css/base.scss
@@ -20,12 +20,27 @@
 * skin community style
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 2.1.0.0, Mar 1, 2019
+ * @version 2.2.0.0, Mar 22, 2019
 */
-@import "../../../scss/reset-content";
@import "../../../scss/reset";
+@import "../../../scss/toc";
+@import "../../../scss/usite";
@import "vditor/src/assets/scss/classic";

+.user__site {
+  margin: 0 8px 0;
+  display: inline-block;
+  height: 25px;
+  &:hover {
+    color: #888;
+  }
+  svg {
+    height: 25px;
+    width: 25px;
+    fill: currentColor;
+  }
+}
+
 .left {
  float: left;
 }
@@ -254,15 +269,15 @@ a.header-title {
  overflow: hidden;
 }

-.content-reset {
+.vditor-reset {
  line-height: 145%;
 }

-.content-reset a {
+.vditor-reset a {
  color: #075181;
 }

-.content-reset a:hover {
+.vditor-reset a:hover {
  color: #68ADD5;
 }

@@ -755,4 +770,22 @@ a.star-icon {
  margin: 3px;
  cursor: pointer;
  float: left;
+}
+
+#tags li {
+  list-style: none;
+  float: left;
+
+  a {
+    display: block;
+    color: #fff;
+    line-height: 30px;
+    padding: 0 10px;
+    margin: 0 10px 10px 0;
+    background-color: #9BC4CE;
+    &:hover {
+      text-decoration: none;
+      background-color:  #B4D9E2;
+    }
+  }
 }
--- a/Community/footer.ftl
+++ b/Community/footer.ftl
@@ -23,7 +23,7 @@
            <span style="color: gray;">&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent}
        </div>
        Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}&nbsp;&nbsp;
-        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">Community</a>
+        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
        by <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
    </div>
    <div class="right nowrap">
@@ -50,19 +50,9 @@
 </div>
 <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
+<#include "../../common-template/label.ftl">
 <script type="text/javascript">
-    var latkeConfig = {
-        "servePath": "${servePath}",
-        "isLoggedIn": "${isLoggedIn?string}",
-        "staticServePath": "${staticServePath}"
-    };
-    
-    var Label = {
-        "markedAvailable": ${markedAvailable?c},
-        "adminLabel": "${adminLabel}",
-        "logoutLabel": "${logoutLabel}",
-        "skinDirName": "${skinDirName}"
-    },
+
    maxLength = parseInt("${mostCommentArticles?size}");

    $(document).ready(function () {
@@ -79,8 +69,8 @@
            $(".moon-current-icon").removeClass().addClass("moon-icon");
        }

-        Util.init();
-        
+        Util.setTopBar()
+
        $(".footer-block").each(function (num) {
            var $lis = $(this).find("li");
            if ($lis.length > maxLength) {
--- a/Community/index.ftl
+++ b/Community/index.ftl
@@ -17,17 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${blogTitle}">
-        <#if metaKeywords??>
-        <meta name="keywords" content="${metaKeywords}"/>
-        </#if>
-        <#if metaDescription??>
-        <meta name="description" content="${metaDescription}"/>
-        </#if>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Community/macro-comments.ftl
+++ b/Community/macro-comments.ftl
@@ -28,7 +28,7 @@
    ${postCommentsLabel}
 </div>
 <div class="comment">
-    <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
+    <textarea rows="3" placeholder="${commentContentLabel}" id="comment"></textarea>
 </div>
 </#if>
 </#macro>
--- a/Community/macro-head.ftl
+++ b/Community/macro-head.ftl
@@ -1,36 +0,0 @@
-<#--
-
-    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-->
-<#macro head title>
-<meta charset="utf-8" />
-<title>${title}</title>
-<#nested>
-<meta name="author" content="${blogTitle?html}" />
-<meta name="generator" content="Solo" />
-<meta name="owner" content="B3log Team" />
-<meta name="revised" content="${blogTitle?html}, ${year}" />
-<meta name="copyright" content="B3log" />
-<meta http-equiv="Window-target" content="_top" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
-<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
-<link rel="manifest" href="${servePath}/manifest.json">
-<link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
-${htmlHead}
-</#macro>
--- a/Community/page.ftl
+++ b/Community/page.ftl
@@ -17,15 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${page.pageTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
-        <meta name="description" content="${metaDescription}" />
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -34,7 +33,7 @@
            <#include "header.ftl">
        </div>
        <div class="content">
-            <div class="content-reset marginBottom40">
+            <div class="vditor-reset marginBottom40">
                ${page.pageContent}
            </div>
            <@comments commentList=pageComments article=page></@comments>
--- a/Community/side.ftl
+++ b/Community/side.ftl
@@ -19,6 +19,18 @@
 -->
 <div class="footer-secondary">
    <div class="content">
+
+        <h4>
+            ${noticeBoardLabel}
+        </h4>
+        <div class="arrow-right"></div>
+        <div class="notice">
+            <#include "../../common-template/macro-user_site.ftl">
+            <@userSite dir="n"/>
+        </div>
+        <div class="clear"></div>
+        <div class="hr"></div>
+
        <#if "" != noticeBoard>
        <h4>
            ${noticeBoardLabel}
--- a/Community/tag-articles.ftl
+++ b/Community/tag-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${tag.tagTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        <@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
@@ -32,7 +31,7 @@
            <#include "header.ftl">
        </div>
        <div class="content">
-            <h2>${tag1Label}
+            <h2>
                <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                    <span id="tagArticlesTag">
                        ${tag.tagTitle}
--- a/Community/tags.ftl
+++ b/Community/tags.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${allTagsLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
-        <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body>
--- a/Finding/archive-articles.ftl
+++ b/Finding/archive-articles.ftl
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
-        </@head>
+         <@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
+             <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
+         </@head>
    </head>
    <body class="nav-closed">
        <div class="nav">
--- a/Finding/archives.ftl
+++ b/Finding/archives.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${archiveLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
-        <meta name="description" content="${metaDescription},${archiveLabel}"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/article.ftl
+++ b/Finding/article.ftl
@@ -17,38 +17,22 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${article.articleTitle} - ${blogTitle}">
-        <meta name="keywords" content="${article.articleTags}" />
-        <meta name="description" content="${article.articleAbstract?html}" />
-        </@head>
+        <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
+            <link rel="stylesheet"
+                  href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        <#if previousArticlePermalink??>
            <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
        </#if>
        <#if nextArticlePermalink??>
            <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
        </#if>
-            <!-- Open Graph -->
-            <meta property="og:locale" content="zh_CN"/>
-            <meta property="og:type" content="article"/>
-            <meta property="og:title" content="${article.articleTitle}"/>
-            <meta property="og:description" content="${article.articleAbstract?html}"/>
-            <meta property="og:image" content="${article.authorThumbnailURL}"/>
-            <meta property="og:url" content="${servePath}${article.articlePermalink}"/>
-            <meta property="og:site_name" content="Solo"/>
-            <!-- Twitter Card -->
-            <meta name="twitter:card" content="summary"/>
-            <meta name="twitter:description" content="${article.articleAbstract?html}"/>
-            <meta name="twitter:title" content="${article.articleTitle}"/>
-            <meta name="twitter:image" content="${article.authorThumbnailURL}"/>
-            <meta name="twitter:url" content="${servePath}${article.articlePermalink}"/>
-            <meta name="twitter:site" content="@DL88250"/>
-            <meta name="twitter:creator" content="@DL88250"/>
+        </@head>
    </head>
    <body class="nav-closed">
        <div class="nav">
@@ -84,7 +68,7 @@
                            <time>${article.articleCreateDate?string("yyyy-MM-dd")}</time>
                        </section>
                    </header>
-                    <section class="post-content content-reset">
+                    <section class="post-content vditor-reset">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div class="marginTop12">
--- a/Finding/author-articles.ftl
+++ b/Finding/author-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${authorName} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${authorName}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/category-articles.ftl
+++ b/Finding/category-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${category.categoryTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/category.ftl
+++ b/Finding/category.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${categoryLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${categoryLabel}"/>
-        <meta name="description" content="<#list mostUsedCategories as category>${category.categoryTitle}<#if category_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/common-comment.ftl
+++ b/Finding/common-comment.ftl
@@ -42,7 +42,7 @@
            <a class="fn-right" href="javascript:page.toggleEditor('${comment.oId}', '${comment.commentName}')">${replyLabel}</a>
        </#if>
        </div>
-        <div class="comment-content post-content content-reset">
+        <div class="comment-content post-content vditor-reset">
        ${comment.commentContent}
        </div>
    </div>
--- a/Finding/css/base.css
+++ b/Finding/css/base.css
--- a/Finding/css/base.scss
+++ b/Finding/css/base.scss
@@ -21,10 +21,22 @@
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
 * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.2.0.0, Mar 4, 2019
+ * @version 2.3.0.0, Mar 22, 2019
 */
-@import "../../../scss/reset-content";
+@import "../../../scss/toc";
+@import "../../../scss/usite";
@import "vditor/src/assets/scss/classic";
+
+.user__site {
+  float: left;
+  margin-left: 10px;
+  svg {
+    height: 20px;
+    width: 20px;
+    fill: currentColor;
+  }
+}
+
 /* start reset */
 html {
  height: 100%;
@@ -638,6 +650,8 @@ pre code, pre tt {

 .nav {
  position: fixed;
+  display: flex;
+  flex-direction: column;
  top: 0;
  right: 0;
  bottom: 0;
@@ -655,9 +669,14 @@ pre code, pre tt {
  transition: transform 0.5s ease,
  opacity 0.3s ease 0.7s;
  overflow-x: hidden;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }

 .nav ul {
+  flex: 1;
  margin: 0;
  padding: 0px 0 5%;
  list-style: none;
@@ -711,19 +730,12 @@ pre code, pre tt {
 }

 .nav .count {
-  position: absolute;
-  bottom: 10px;
  font-size: 1rem;
-  width: 100%;
  word-wrap: normal;
  word-break: break-all;
  white-space: nowrap;
 }

-.nav .b3-solo-list li.current a {
-  color: #fff;
-}
-
 .nav .page-icon {
  float: left;
  height: 14px;
--- a/Finding/dynamic.ftl
+++ b/Finding/dynamic.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${dynamicLabel}"/>
-        <meta name="description" content="${metaDescription},${dynamicLabel}"/>
+        <@head title="${dynamicLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
@@ -54,7 +53,7 @@
                                </span>
                                <a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
                            </div>
-                            <div class="comment-content post-content content-reset">
+                            <div class="comment-content post-content vditor-reset">
                                ${comment.commentContent}
                            </div>
                        </div>
--- a/Finding/footer.ftl
+++ b/Finding/footer.ftl
@@ -23,28 +23,12 @@
    ${footerContent}
    <span class="fn-right">
        Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}&nbsp;&nbsp;
-        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">Finding</a>
+        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
        by <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
    </span>
 </footer>
 <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/${skinDirName}${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
-<script type="text/javascript">
-    var latkeConfig = {
-        "servePath": "${servePath}",
-        "staticServePath": "${staticServePath}",
-        "isLoggedIn": "${isLoggedIn?string}",
-        "userName": "${userName}"
-    };
-
-    var Label = {
-        "markedAvailable": ${markedAvailable?c},
-        "skinDirName": "${skinDirName}"
-    };
-    Util.initSW();
-    Util.parseMarkdown();
-    Util.killIE(8)
-    Util.previewImg()
-</script>
+<#include "../../common-template/label.ftl">
 ${plugins}
--- a/Finding/index.ftl
+++ b/Finding/index.ftl
@@ -17,17 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${blogTitle}">
-        <#if metaKeywords??>
-        <meta name="keywords" content="${metaKeywords}"/>
-        </#if>
-        <#if metaDescription??>
-        <meta name="description" content="${metaDescription}"/>
-        </#if>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/js/Finding.js
+++ b/Finding/js/Finding.js
@@ -67,66 +67,13 @@ var Finding = {
   * @returns {undefined}
   */
  _initToc: function () {
-    if ($('.b3-solo-list li').length === 0) {
-      $('.nav .icon-list').hide();
-      $('.nav .icon-sitemap').click();
+    if ($('.article__toc li').length === 0) {
      return;
    }

-    $('.nav ul:first').after($('.b3-solo-list'));
    if ($(window).width() > 500) {
      $("body").toggleClass("nav-opened nav-closed");
    }
-
-    $('.nav .icon-list').show();
-    Finding.tabNav('toc')
-
-    var $articleTocs = $('.content-reset [id^=b3_solo_h]'),
-      $articleToc = $('.b3-solo-list');
-
-    $(window).scroll(function (event) {
-      if ($('.b3-solo-list li').length === 0) {
-        return false;
-      }
-
-      // 界面各种图片加载会导致帖子目录定位
-      var toc = [];
-      $articleTocs.each(function (i) {
-        toc.push({
-          id: this.id,
-          offsetTop: this.offsetTop
-        });
-      });
-
-      // 当前目录样式
-      var scrollTop = $(window).scrollTop();
-      for (var i = 0, iMax = toc.length; i < iMax; i++) {
-        if (scrollTop < toc[i].offsetTop + 280) {
-          $articleToc.find('li').removeClass('current');
-          var index = i > 0 ? i - 1 : 0;
-          $articleToc.find('a[href="#' + toc[index].id + '"]').parent().addClass('current');
-          break;
-        }
-      }
-      if (scrollTop >= toc[toc.length - 1].offsetTop + 280) {
-        $articleToc.find('li').removeClass('current');
-        $articleToc.find('li:last').addClass('current');
-      }
-    });
-
-    $(window).scroll();
-  },
-  tabNav: function (type) {
-    $('.nav .current').removeClass('current');
-    if (type === 'toc') {
-      $('.nav ul:first, .nav .count').hide();
-      $('.nav ul:last').show();
-      $('.icon-list').addClass('current');
-    } else {
-      $('.nav ul:first, .nav .count').show();
-      $('.nav ul:last').hide();
-      $('.icon-sitemap').addClass('current');
-    }
  },
  /**
   * 分享
@@ -160,7 +107,7 @@ var Finding = {
        if ($qrCode.find('canvas').length === 0) {
          $.ajax({
            method: 'GET',
-            url: latkeConfig.staticServePath +
+            url: Label.staticServePath +
            '/js/lib/jquery.qrcode.min.js',
            dataType: 'script',
            cache: true,
--- a/Finding/js/Finding.min.js
+++ b/Finding/js/Finding.min.js
@@ -1 +1 @@
-var Finding={init:function(){Util.killIE(),this._initToc(),this.share(),$(".scroll-down").click(function(t){t.preventDefault();var n=$(this),o=$("html, body"),i=!!n.attr("data-offset")&&n.attr("data-offset"),a=parseInt(i);o.stop(!0,!1).animate({scrollTop:$(this.hash).offset().top+a},500)}),$("body").append('<a class="icon-gotop fn-none" href="javascript:Util.goTop()"></a><span class="menu-button icon-menu"><span class="word">Menu</span></span>'),$(".menu-button").click(function(t){t.stopPropagation(),$("body").toggleClass("nav-opened nav-closed")}),$(window).scroll(function(){$(window).scrollTop()>$(".main-header").height()?$(".icon-gotop").show():$(".icon-gotop").hide()})},_initToc:function(){if(0===$(".b3-solo-list li").length)return $(".nav .icon-list").hide(),void $(".nav .icon-sitemap").click();$(".nav ul:first").after($(".b3-solo-list")),500<$(window).width()&&$("body").toggleClass("nav-opened nav-closed"),$(".nav .icon-list").show(),Finding.tabNav("toc");var s=$(".content-reset [id^=b3_solo_h]"),l=$(".b3-solo-list");$(window).scroll(function(t){if(0===$(".b3-solo-list li").length)return!1;var n=[];s.each(function(t){n.push({id:this.id,offsetTop:this.offsetTop})});for(var o=$(window).scrollTop(),i=0,a=n.length;i<a;i++)if(o<n[i].offsetTop+280){l.find("li").removeClass("current");var e=0<i?i-1:0;l.find('a[href="#'+n[e].id+'"]').parent().addClass("current");break}o>=n[n.length-1].offsetTop+280&&(l.find("li").removeClass("current"),l.find("li:last").addClass("current"))}),$(window).scroll()},tabNav:function(t){$(".nav .current").removeClass("current"),"toc"===t?($(".nav ul:first, .nav .count").hide(),$(".nav ul:last").show(),$(".icon-list").addClass("current")):($(".nav ul:first, .nav .count").show(),$(".nav ul:last").hide(),$(".icon-sitemap").addClass("current"))},share:function(){var t=$(".share"),n=t.find(".icon-wechat"),o=n.data("url"),i=n.data("avatar"),a=encodeURIComponent(n.data("title")+" - "+n.data("blogtitle")),e=encodeURIComponent(o),s={};s.weibo="http://v.t.sina.com.cn/share/share.php?title="+a+"&url="+e+"&pic="+i,s.qqz="https://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url="+e+"&sharesource=qzone&title="+a+"&pics="+i,s.twitter="https://twitter.com/intent/tweet?status="+a+" "+e,t.find("span").click(function(){var t=$(this).data("type");if(t)return"wechat"===t?(0===n.find("canvas").length?$.ajax({method:"GET",url:latkeConfig.staticServePath+"/js/lib/jquery.qrcode.min.js",dataType:"script",cache:!0,success:function(){n.qrcode({width:128,height:128,text:o})}}):n.find("canvas").slideToggle(),!1):void window.open(s[t],"_blank","top=100,left=200,width=648,height=618")})}};Finding.init();
+var Finding={init:function(){Util.killIE(),this._initToc(),this.share(),$(".scroll-down").click(function(t){t.preventDefault();var n=$(this),e=$("html, body"),o=!!n.attr("data-offset")&&n.attr("data-offset"),i=parseInt(o);e.stop(!0,!1).animate({scrollTop:$(this.hash).offset().top+i},500)}),$("body").append('<a class="icon-gotop fn-none" href="javascript:Util.goTop()"></a><span class="menu-button icon-menu"><span class="word">Menu</span></span>'),$(".menu-button").click(function(t){t.stopPropagation(),$("body").toggleClass("nav-opened nav-closed")}),$(window).scroll(function(){$(window).scrollTop()>$(".main-header").height()?$(".icon-gotop").show():$(".icon-gotop").hide()})},_initToc:function(){0!==$(".article__toc li").length&&500<$(window).width()&&$("body").toggleClass("nav-opened nav-closed")},share:function(){var t=$(".share"),n=t.find(".icon-wechat"),e=n.data("url"),o=n.data("avatar"),i=encodeURIComponent(n.data("title")+" - "+n.data("blogtitle")),a=encodeURIComponent(e),s={};s.weibo="http://v.t.sina.com.cn/share/share.php?title="+i+"&url="+a+"&pic="+o,s.qqz="https://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url="+a+"&sharesource=qzone&title="+i+"&pics="+o,s.twitter="https://twitter.com/intent/tweet?status="+i+" "+a,t.find("span").click(function(){var t=$(this).data("type");if(t)return"wechat"===t?(0===n.find("canvas").length?$.ajax({method:"GET",url:Label.staticServePath+"/js/lib/jquery.qrcode.min.js",dataType:"script",cache:!0,success:function(){n.qrcode({width:128,height:128,text:e})}}):n.find("canvas").slideToggle(),!1):void window.open(s[t],"_blank","top=100,left=200,width=648,height=618")})}};Finding.init();
--- a/Finding/links.ftl
+++ b/Finding/links.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${linkLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${linkLabel}"/>
-        <meta name="description" content="${metaDescription},${linkLabel}"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/macro-head.ftl
+++ b/Finding/macro-head.ftl
@@ -1,37 +0,0 @@
-<#--
-
-    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-->
-<#macro head title>
-<meta charset="utf-8" />
-<title>${title}</title>
-<#nested>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="author" content="${blogTitle?html}" />
-<meta name="generator" content="Solo" />
-<meta name="owner" content="B3log Team" />
-<meta name="revised" content="${blogTitle?html}, ${year}" />
-<meta name="copyright" content="B3log" />
-<meta http-equiv="Window-target" content="_top" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
-<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
-<link rel="manifest" href="${servePath}/manifest.json">
-<link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml">
-${htmlHead}
-</#macro>
--- a/Finding/page.ftl
+++ b/Finding/page.ftl
@@ -17,15 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <#include "macro-comments.ftl">
 <#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${page.pageTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
-        <meta name="description" content="${metaDescription}" />
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
@@ -36,7 +35,7 @@
            <#include "header.ftl">
            <main>
                <article class="post">
-                    <section class="post-content content-reset">
+                    <section class="post-content vditor-reset">
                        ${page.pageContent}
                    </section>
                    <footer>
--- a/Finding/side.ftl
+++ b/Finding/side.ftl
@@ -19,9 +19,6 @@
 -->
 <div class="fn-clear">
    <span class="fn-right">
-        <a href="javascript:Finding.tabNav('link')" title="${permalinkLabel}" class="icon-sitemap current"></a>
-        &nbsp;
-        <a href="javascript:Finding.tabNav('toc')" title="${tocLabel}" class="icon-list fn-none"> &nbsp; </a>
        <#if isLoggedIn>
        <a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>
        &nbsp; 
@@ -31,35 +28,43 @@
        </#if>
    </span>
 </div>
-<ul>
-    <#list pageNavigations as page>
-    <li>
-        <a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
-    </li>
-    </#list>
-    <li>
-        <a href="${servePath}/dynamic.html">${dynamicLabel}</a>
-    </li>
-    <li>
-        <a href="${servePath}/category.html">${categoryLabel}</a>
-    </li>
-    <li>
-        <a href="${servePath}/tags.html">${allTagsLabel}</a>
-    </li>
-    <li>
-        <a href="${servePath}/archives.html">${archiveLabel}</a>
-    </li>
-    <li>
-        <a href="${servePath}/links.html">${linkLabel}</a>
-    </li>
-    <li>
-        <a rel="alternate" href="${servePath}/rss.xml">${subscribeLabel}</a>
-    </li>
-    <Li>
-        <a href="${servePath}/search?keyword=">Search</a>
-    </Li>
-</ul>
+<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
+    <#include "../../common-template/toc.ftl"/>
+<#else>
+    <ul>
+        <#list pageNavigations as page>
+        <li>
+            <a href="${page.pagePermalink}" target="${page.pageOpenTarget}"><#if page.pageIcon != ''><img class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
+        </li>
+        </#list>
+        <li>
+            <a href="${servePath}/dynamic.html">${dynamicLabel}</a>
+        </li>
+        <li>
+            <a href="${servePath}/category.html">${categoryLabel}</a>
+        </li>
+        <li>
+            <a href="${servePath}/tags.html">${allTagsLabel}</a>
+        </li>
+        <li>
+            <a href="${servePath}/archives.html">${archiveLabel}</a>
+        </li>
+        <li>
+            <a href="${servePath}/links.html">${linkLabel}</a>
+        </li>
+        <li>
+            <a rel="alternate" href="${servePath}/rss.xml">${subscribeLabel}</a>
+        </li>
+        <Li>
+            <a href="${servePath}/search?keyword=">Search</a>
+        </Li>
+    </ul>
+</#if>
 <div class="count">
+    <div class="fn-clear">
+        <#include "../../common-template/macro-user_site.ftl"/>
+        <@userSite dir=""/>
+    </div>
    <span>
        ${viewCount1Label}
        ${statistic.statisticBlogViewCount}
--- a/Finding/tag-articles.ftl
+++ b/Finding/tag-articles.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
-        <@head title="${tag.tagTitle} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        <@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Finding/tags.ftl
+++ b/Finding/tags.ftl
@@ -17,13 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<#include "macro-head.ftl">
+<#include "../../common-template/macro-common_head.ftl">
 <!DOCTYPE html>
 <html>
    <head>
        <@head title="${allTagsLabel} - ${blogTitle}">
-        <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
-        <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
+            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
        </@head>
    </head>
    <body class="nav-closed">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Liang Ding	5fbe279bcd	发布 v3.4.0	2019-03-26 08:23:53 +08:00
Van	e9cf230aba	🐛	2019-03-26 08:21:33 +08:00
Van	04be872d8c	https://github.com/b3log/solo/issues/12720 yilia	2019-03-22 19:27:08 +08:00
Van	b2fe147b13	https://github.com/b3log/solo/issues/12720 tree-house	2019-03-22 19:25:36 +08:00
Van	60a8e6df33	https://github.com/b3log/solo/issues/12720 timeline	2019-03-22 18:53:35 +08:00
Van	3ca8f083f2	https://github.com/b3log/solo/issues/12720 Pinghsu	2019-03-22 18:02:41 +08:00
Van	034e929f62	https://github.com/b3log/solo/issues/12720 owmx-3.0	2019-03-22 17:39:55 +08:00
Van	32b7923774	https://github.com/b3log/solo/issues/12720 nijigen	2019-03-22 17:10:56 +08:00
Van	53f713a45d	https://github.com/b3log/solo/issues/12720 next	2019-03-22 16:45:30 +08:00
Van	1121ffae30	https://github.com/b3log/solo/issues/12720 NeoEase	2019-03-22 16:20:33 +08:00
Van	7de1250af0	https://github.com/b3log/solo/issues/12720 metro-hot	2019-03-22 12:59:52 +08:00
Van	acffd3c0f3	https://github.com/b3log/solo/issues/12720 Media	2019-03-22 12:45:12 +08:00
Van	5245aafcca	https://github.com/b3log/solo/issues/12720 Jane	2019-03-22 12:04:02 +08:00
Van	50417e9a54	https://github.com/b3log/solo/issues/12720 i-nove	2019-03-22 11:37:24 +08:00
Van	faa1169ee8	https://github.com/b3log/solo/issues/12720 Finding	2019-03-22 10:33:09 +08:00
Van	4996aa298b	https://github.com/b3log/solo/issues/12720 favourite	2019-03-22 10:02:00 +08:00
Van	fbba7cde5c	https://github.com/b3log/solo/issues/12720 Community	2019-03-22 09:05:11 +08:00
Van	ad7e12ef30	https://github.com/b3log/solo/issues/12720 Bruce	2019-03-21 21:34:11 +08:00
Van	1558900384	https://github.com/b3log/solo/issues/12720 Andrea	2019-03-21 17:55:48 +08:00
Van	8c9b13c393	♻️ toolptiped	2019-03-20 13:50:45 +08:00
Van	4d04c02872	https://github.com/b3log/solo/issues/12720 9IPHP	2019-03-20 13:49:45 +08:00
Van	1605dceed8	♻️	2019-03-20 07:59:29 +08:00
Van	d5c44707aa	♻️	2019-03-19 20:01:39 +08:00
Van	c8131b93ca	https://github.com/b3log/solo/issues/12720	2019-03-19 19:03:09 +08:00
Van	20a63cbe49	#12720	2019-03-19 15:43:46 +08:00
Van	446f18f7d7	©️	2019-03-18 09:17:15 +08:00
Liang Ding	c0348449da	发布 v3.3.0	2019-03-17 20:50:31 +08:00
Liang Ding	a7a63eff28	🎨 可配置 favicon URL	2019-03-17 20:32:32 +08:00
Van	5153f220f2	⬆️	2019-03-16 20:23:15 +08:00
Van	46ced95f46	⬆️ https://github.com/b3log/solo/issues/12698	2019-03-16 20:04:47 +08:00
Van	7368e5b747	⬆️ https://github.com/b3log/solo/issues/12711	2019-03-16 18:28:32 +08:00
Van	32d9065772	fix https://github.com/b3log/solo/issues/12705	2019-03-16 12:09:57 +08:00
Van	d540b3a920	⬆️	2019-03-06 10:50:35 +08:00
Van	f9c09e185d	⬆️ vditor->0.3.0	2019-03-06 10:49:26 +08:00