🔖 发布 v3.6.2

https://github.com/b3log/solo/issues/12796
🎨 https://github.com/b3log/solo/issues/12787
2019-06-07 18:49:57 +08:00 · 2019-06-07 11:58:44 +08:00 · 2019-06-01 20:21:32 +08:00 · 2019-06-01 18:42:44 +08:00 · 2019-05-05 10:17:30 +08:00 · 2019-04-21 10:45:04 +08:00
406 changed files with 540 additions and 1614 deletions
--- a/9IPHP/archive-articles.ftl
+++ b/9IPHP/archive-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/archives.ftl
+++ b/9IPHP/archives.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/article-list.ftl
+++ b/9IPHP/article-list.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/article.ftl
+++ b/9IPHP/article.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/category-articles.ftl
+++ b/9IPHP/category-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/common-comment.ftl
+++ b/9IPHP/common-comment.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/css/base.css
+++ b/9IPHP/css/base.css
--- a/9IPHP/css/base.scss
+++ b/9IPHP/css/base.scss
@@ -1,6 +1,6 @@
-/**
+/*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/9IPHP/dynamic.ftl
+++ b/9IPHP/dynamic.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -65,13 +65,5 @@
            </div>
        </div>
        <#include "footer.ftl">
-
-        <script>
-            var $commentContents = $(".comments .vditor-reset");
-            for (var i = 0; i < $commentContents.length; i++) {
-                var str = $commentContents[i].innerHTML;
-                $commentContents[i].innerHTML = Util.replaceEmString(str);
-            }
-        </script>
    </body>
 </html>
--- a/9IPHP/footer.ftl
+++ b/9IPHP/footer.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -19,11 +19,10 @@
 -->
 <footer class="footer fn-clear">
    &copy; ${year}
+    <a href="${servePath}">${blogTitle}</a>
    ${footerContent}
-    <a href="${servePath}">${blogTitle}</a>  &nbsp;   • &nbsp;
-    <a href="https://solo.b3log.org" target="_blank">Solo</a><br/>
-
-    Powered by <a href="https://b3log.org" target="_blank">B3log</a> 开源 &nbsp;
+    <br/>
+    Powered by <a href="https://solo.b3log.org" target="_blank">Solo</a>
    <span class="ft-warn">&heartsuit;</span>
    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>
--- a/9IPHP/header.ftl
+++ b/9IPHP/header.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/index.ftl
+++ b/9IPHP/index.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/js/common.js
+++ b/9IPHP/js/common.js
@@ -1,6 +1,6 @@
 /*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/9IPHP/lang/lang_en_US.properties
+++ b/9IPHP/lang/lang_en_US.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/9IPHP/lang/lang_zh_CN.properties
+++ b/9IPHP/lang/lang_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/9IPHP/links.ftl
+++ b/9IPHP/links.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/macro-comments.ftl
+++ b/9IPHP/macro-comments.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/page.ftl
+++ b/9IPHP/page.ftl
@@ -1,48 +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/>.
-
-->
-<#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}">
-            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
-        </@head>
-    </head>
-    <body>
-        <#include "header.ftl">
-        <div class="wrapper">
-            <div class="main-wrap">
-                <main>
-                    <article class="post">
-                        <div class="vditor-reset">
-                        ${page.pageContent}
-                        </div>
-                        <@comments commentList=pageComments article=page></@comments>
-                    </article>
-                </main>
-                <#include "side.ftl">
-            </div>
-        </div>
-        <#include "footer.ftl">
-        <@comment_script oId=page.oId commentable=page.commentable></@comment_script>
-    </body>
-</html>
--- a/9IPHP/side.ftl
+++ b/9IPHP/side.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/skin.properties
+++ b/9IPHP/skin.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/9IPHP/tag-articles.ftl
+++ b/9IPHP/tag-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/9IPHP/tags.ftl
+++ b/9IPHP/tags.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/archive-articles.ftl
+++ b/Andrea/archive-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/archives.ftl
+++ b/Andrea/archives.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/article-list.ftl
+++ b/Andrea/article-list.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/article.ftl
+++ b/Andrea/article.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/author-articles.ftl
+++ b/Andrea/author-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/category-articles.ftl
+++ b/Andrea/category-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/common-comment.ftl
+++ b/Andrea/common-comment.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/css/base.css
+++ b/Andrea/css/base.css
--- a/Andrea/css/base.scss
+++ b/Andrea/css/base.scss
@@ -1,6 +1,6 @@
-/**
+/*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/Andrea/footer.ftl
+++ b/Andrea/footer.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -18,8 +18,8 @@

 -->
 <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><br/>
+    &copy; ${year} <a href="${servePath}">${blogTitle}</a> ${footerContent}<br/>
+    Powered by <a href="https://solo.b3log.org" target="_blank">Solo</a><br/>
    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>
--- a/Andrea/header.ftl
+++ b/Andrea/header.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/index.ftl
+++ b/Andrea/index.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/lang/lang_en_US.properties
+++ b/Andrea/lang/lang_en_US.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Andrea/lang/lang_zh_CN.properties
+++ b/Andrea/lang/lang_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Andrea/macro-comments.ftl
+++ b/Andrea/macro-comments.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/page.ftl
+++ b/Andrea/page.ftl
@@ -1,62 +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/>.
-
-->
-<#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}">
-            <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">
-                        <div class="article">
-                            <div class="vditor-reset" style="margin-top: 0px;">
-                                ${page.pageContent}
-                            </div>
-                        </div>
-                        <@comments commentList=pageComments article=page></@comments>
-                    </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>
-        <@comment_script oId=page.oId commentable=page.commentable></@comment_script>
-    </body>
-</html>
--- a/Andrea/side-tool.ftl
+++ b/Andrea/side-tool.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/side.ftl
+++ b/Andrea/side.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/skin.properties
+++ b/Andrea/skin.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Andrea/tag-articles.ftl
+++ b/Andrea/tag-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Andrea/tags.ftl
+++ b/Andrea/tags.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/archive-articles.ftl
+++ b/Bruce/archive-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/archives.ftl
+++ b/Bruce/archives.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/article-list.ftl
+++ b/Bruce/article-list.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/article.ftl
+++ b/Bruce/article.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/category-articles.ftl
+++ b/Bruce/category-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/common-comment.ftl
+++ b/Bruce/common-comment.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/css/_bootstrap.scss
+++ b/Bruce/css/_bootstrap.scss
@@ -1,6 +1,6 @@
-/**
+/*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/Bruce/css/base.css
+++ b/Bruce/css/base.css
--- a/Bruce/css/base.scss
+++ b/Bruce/css/base.scss
@@ -1,6 +1,6 @@
-/**
+/*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/Bruce/footer.ftl
+++ b/Bruce/footer.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -21,7 +21,7 @@
 <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>
+    &copy; ${year} <a href="${servePath}">${blogTitle}</a> ${footerContent} Powered by <a href="https://solo.b3log.org" target="_blank">Solo</a>
    <div>
        Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
        by
--- a/Bruce/header.ftl
+++ b/Bruce/header.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/index.ftl
+++ b/Bruce/index.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/js/bootstrap.js
+++ b/Bruce/js/bootstrap.js
@@ -1,6 +1,6 @@
 /*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/Bruce/js/bootstrap.min.js
+++ b/Bruce/js/bootstrap.min.js
--- a/Bruce/lang/lang_en_US.properties
+++ b/Bruce/lang/lang_en_US.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Bruce/lang/lang_zh_CN.properties
+++ b/Bruce/lang/lang_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Bruce/links.ftl
+++ b/Bruce/links.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/macro-comments.ftl
+++ b/Bruce/macro-comments.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/page.ftl
+++ b/Bruce/page.ftl
@@ -1,52 +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/>.
-
-->
-<#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}">
-            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
-        </@head>
-    </head>
-    <body>
-        <#include "header.ftl">
-
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-2"></div>
-
-                <div class="col-sm-8 site">
-                    <div class="article vditor-reset">
-                    ${page.pageContent}
-                    </div>
-                    
-                    <@comments commentList=pageComments article=page></@comments>
-                </div>
-
-                <div class="col-sm-2"></div>
-            </div>
-        </div>
-
-        <#include "footer.ftl">
-        <@comment_script oId=page.oId commentable=page.commentable></@comment_script>
-    </body>
-</html>
--- a/Bruce/skin.properties
+++ b/Bruce/skin.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Bruce/tag-articles.ftl
+++ b/Bruce/tag-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Bruce/tags.ftl
+++ b/Bruce/tags.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Casper/archive-articles.ftl
+++ b/Casper/archive-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
     <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
    <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Casper/archives.ftl
+++ b/Casper/archives.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
 <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Casper/article-list.ftl
+++ b/Casper/article-list.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -54,7 +54,7 @@
            <a class="item__abstract" pjax-title="${article.articleTitle}"
               href="${servePath}${article.articlePermalink}">
                <#if article.articleAbstractText?length gt 80>
-                    ${article.articleAbstractText[0..81]}
+                    ${article.articleAbstractText[0..80]}
                <#else>
                    ${article.articleAbstractText}
                </#if>
--- a/Casper/article.ftl
+++ b/Casper/article.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -34,14 +34,15 @@
    </#if>
 </@head>
 </head>
-<body>
-<div class="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
    <#include "marcr-header.ftl">
    <@header type="article"></@header>
    <div class="article__top">
        <div class="fn__clear">
-            <div class="title">${article.articleTitle}</div>
+            <div class="toc fn__none" onclick="$('.post__toc').slideToggle()">${tocLabel}</div>
+            <div class="title fn__pointer" onclick="Util.goTop()">${article.articleTitle}</div>
            <#include "../../common-template/share.ftl">
        </div>
        <progress class="article__progress"></progress>
@@ -90,7 +91,9 @@
    <div class="article__bottom">
        <div class="wrapper">
            <div class="fn__flex">
+                <#if 0 != externalRelevantArticlesDisplayCount>
                <div class="item" id="externalRelevantArticles"></div>
+                </#if>
                <div class="item" id="randomArticles"></div>
                <div class="item" id="relevantArticles"></div>
            </div>
--- a/Casper/author-articles.ftl
+++ b/Casper/author-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -26,8 +26,8 @@
              href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
    </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
    <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Casper/category-articles.ftl
+++ b/Casper/category-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
 <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Casper/common-comment.ftl
+++ b/Casper/common-comment.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Casper/css/base.css
+++ b/Casper/css/base.css
--- a/Casper/css/base.scss
+++ b/Casper/css/base.scss
@@ -1,6 +1,6 @@
-/**
+/*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
@@ -19,7 +19,7 @@
 * skin style
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.1.0.0, Mar 26, 2019
+ * @version 0.1.0.1, Apr 21, 2019
 */
@import "../../../scss/reset";
@import "../../../scss/usite";
@@ -72,7 +72,7 @@ a {
      width: 100%;
      top: 0;
      background-size: cover;
-      filter: brightness(38%);
+      filter: brightness(48%);
    }
  }
  &--article {
@@ -99,7 +99,7 @@ a {
      width: 100%;
      top: 0;
      background-size: cover;
-      filter: brightness(38%);
+      filter: brightness(48%);
    }
    .header__nav a {
      margin-bottom: 0;
@@ -304,15 +304,10 @@ a {
    line-height: 30px;
    font-size: 12px;
    margin: 0 5px 40px;
-    &:hover {
-      opacity: 0.8;
-      text-decoration: none;
-    }
+    &:hover,
    &--active {
-      background: $black-bg;
-      &:hover {
-        opacity: 1;
-      }
+      opacity: 0.68;
+      text-decoration: none;
    }
    &--omit {
      background-color: transparent;
@@ -333,12 +328,13 @@ a {
    .item {
      position: relative;
      flex: 1 1 300px;
-      margin: 40px 20px;
+      margin: 40px 20px 40px;
      box-shadow: 8px 14px 38px rgba(39, 44, 49, .06), 1px 3px 8px rgba(39, 44, 49, .03);
      border-radius: 5px;
      padding: 40px;
      overflow: hidden;
      text-align: center;
+      box-sizing: border-box;
      &:before {
        content: "";
        position: absolute;
@@ -348,7 +344,7 @@ a {
        width: 100%;
        background: url(../images/header-bg.jpg) no-repeat center center;
        background-size: cover;
-        filter: brightness(38%);
+        filter: brightness(48%);
      }
      h3 {
        color: #fff;
@@ -474,6 +470,7 @@ a {
      max-width: 1404px;
      margin: 0 auto;
      border-radius: 5px;
+      filter: sepia(0.2) contrast(1.3) opacity(.86);
    }
    &__content {
      padding: 70px 100px 0;
@@ -481,6 +478,7 @@ a {
      background-color: #fff;
      &--article {
        margin-top: -164px;
+        position: relative;
      }
    }
    &__tip {
@@ -746,6 +744,13 @@ a {
      .title {
        display: none;
      }
+      .toc {
+        display: block;
+        float: left;
+        line-height: 40px;
+        padding: 0 10px;
+        cursor: pointer;
+      }
    }
    &__share .item {
      height: 40px;
@@ -757,7 +762,7 @@ a {
        padding-top: 40px;
      }
      &__cover {
-        height: 380px;
+        display: none;
      }
      &__content {
        padding: 10px 10px 0;
@@ -806,4 +811,12 @@ a {
      margin-bottom: 40px;
    }
  }
+
+  .post__toc {
+    left: 0;
+    background-color: #fff;
+    width: 100%;
+    top: 41px;
+    bottom: 0;
+  }
 }
--- a/Casper/footer.ftl
+++ b/Casper/footer.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -20,10 +20,11 @@
 <footer class="footer">
    <div class="wrapper fn__clear">
        <div class="fn__left">
-            ${blogTitle} &copy; ${year} ${footerContent} &nbsp;•&nbsp;
-                Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> &nbsp;•&nbsp;
-                <a href="https://solo.b3log.org" target="_blank">Solo</a>
-                <br>
+            &copy; ${year}
+            <a href="${servePath}">${blogTitle}</a>
+            ${footerContent} &nbsp;•&nbsp;
+            Powered by <a href="https://solo.b3log.org" target="_blank">Solo</a>
+            <br>
            Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
            <sup>[<a href="https://github.com/TryGhost/Casper" target="_blank">ref</a>]</sup>
            by <a href="http://vanessa.b3log.org" target="_blank">Vanessa</a>
--- a/Casper/index.ftl
+++ b/Casper/index.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
    <#include "marcr-header.ftl">
    <@header type='index'></@header>
--- a/Casper/js/common.js
+++ b/Casper/js/common.js
@@ -1,6 +1,6 @@
 /*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
@@ -19,7 +19,7 @@
 * @fileoverview util and every page should be used.
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.1.0.1, Mar 28, 2019
+ * @version 0.1.1.0, Apr 19, 2019
 */

 /**
@@ -38,11 +38,26 @@ var Skin = {
    var $articleProgress = $('.article__progress')

    if ($articleToc.length === 1) {
-      $('.post__toc').
-        css('left', $('.article .item__content').offset().left +
-          $('.article .item__content').outerWidth() - 80)
+      if ($(window).width() > 876) {
+        $('.post__toc').
+          css('left', $('.article .item__content').offset().left +
+            $('.article .item__content').outerWidth() - 80)
+      } else {
+        $('.post__toc a').click(function () {
+          $('.post__toc').hide()
+        })
+      }
    }

+    $articleToc.find('a').click(function (event) {
+      var id = $(this).attr('href')
+      window.location.hash = id
+      $(window).scrollTop($(id).offset().top - 60)
+      event.preventDefault()
+      event.stopPropagation()
+      return false
+    })
+
    $(window).unbind('scroll').scroll(function (event) {
      if ($articleProgress.length === 0) {
        return false
@@ -58,16 +73,17 @@ var Skin = {
        $('.article__top').css('top', -61)
      }

-      if ($('.article__toc li').length === 0 || $(window).width() < 1000) {
+      if ($('.article__toc li').length === 0) {
        return false
      }

-      if ($(window).scrollTop() > 975 && $(window).scrollTop() <
-        $('.article').outerHeight() + 100) {
-        $('.post__toc').show()
-      } else {
-        $('.post__toc').hide()
-        return
+      if ($(window).width() > 876) {
+        if ($(window).scrollTop() > 975 && $(window).scrollTop() <
+          $('.article').outerHeight() + 100) {
+          $('.post__toc').show()
+        } else {
+          $('.post__toc').hide()
+        }
      }

      // 界面各种图片加载会导致帖子目录定位
@@ -75,14 +91,14 @@ var Skin = {
      $articleTocs.each(function (i) {
        toc.push({
          id: this.id,
-          offsetTop: this.offsetTop,
+          offsetTop: $(this).offset().top,
        })
      })

      // 当前目录样式
      var scrollTop = $(window).scrollTop()
      for (var i = 0, iMax = toc.length; i < iMax; i++) {
-        if (scrollTop < toc[i].offsetTop) {
+        if (scrollTop < toc[i].offsetTop - 61) {
          $articleToc.find('li').removeClass('current')
          var index = i > 0 ? i - 1 : 0
          $articleToc.find('a[href="#' + toc[index].id + '"]').
@@ -91,7 +107,7 @@ var Skin = {
          break
        }
      }
-      if (scrollTop >= toc[toc.length - 1].offsetTop) {
+      if (scrollTop >= toc[toc.length - 1].offsetTop - 61) {
        $articleToc.find('li').removeClass('current')
        $articleToc.find('li:last').addClass('current')
      }
@@ -100,4 +116,4 @@ var Skin = {
    $(window).scroll()
  },
 }
-Skin.init();
+Skin.init()
--- a/Casper/js/common.min.js
+++ b/Casper/js/common.min.js
@@ -1 +1 @@
-var Skin={init:function(){Util.initPjax()},initArticle:function(){page.share();var l=$(".vditor-reset [id^=b3_solo_h]"),s=$(".article__toc"),c=$(".article__progress");1===s.length&&$(".post__toc").css("left",$(".article .item__content").offset().left+$(".article .item__content").outerWidth()-80),$(window).unbind("scroll").scroll(function(t){if(0===c.length)return!1;if(c.attr("value",parseInt($(window).scrollTop())).attr("max",parseInt($("body").outerHeight()-$(window).height())),236<$(window).scrollTop()?$(".article__top").css("top",0):$(".article__top").css("top",-61),0===$(".article__toc li").length||$(window).width()<1e3)return!1;if(975<$(window).scrollTop()&&$(window).scrollTop()<$(".article").outerHeight()+100){$(".post__toc").show();var i=[];l.each(function(t){i.push({id:this.id,offsetTop:this.offsetTop})});for(var o=$(window).scrollTop(),e=0,r=i.length;e<r;e++)if(o<i[e].offsetTop){s.find("li").removeClass("current");var n=0<e?e-1:0;s.find('a[href="#'+i[n].id+'"]').parent().addClass("current");break}o>=i[i.length-1].offsetTop&&(s.find("li").removeClass("current"),s.find("li:last").addClass("current"))}else $(".post__toc").hide()}),$(window).scroll()}};Skin.init();
+var Skin={init:function(){Util.initPjax()},initArticle:function(){page.share();var l=$(".vditor-reset [id^=b3_solo_h]"),s=$(".article__toc"),c=$(".article__progress");1===s.length&&(876<$(window).width()?$(".post__toc").css("left",$(".article .item__content").offset().left+$(".article .item__content").outerWidth()-80):$(".post__toc a").click(function(){$(".post__toc").hide()})),s.find("a").click(function(t){var o=$(this).attr("href");return window.location.hash=o,$(window).scrollTop($(o).offset().top-60),t.preventDefault(),t.stopPropagation(),!1}),$(window).unbind("scroll").scroll(function(t){if(0===c.length)return!1;if(c.attr("value",parseInt($(window).scrollTop())).attr("max",parseInt($("body").outerHeight()-$(window).height())),236<$(window).scrollTop()?$(".article__top").css("top",0):$(".article__top").css("top",-61),0===$(".article__toc li").length)return!1;876<$(window).width()&&(975<$(window).scrollTop()&&$(window).scrollTop()<$(".article").outerHeight()+100?$(".post__toc").show():$(".post__toc").hide());var o=[];l.each(function(t){o.push({id:this.id,offsetTop:$(this).offset().top})});for(var i=$(window).scrollTop(),e=0,r=o.length;e<r;e++)if(i<o[e].offsetTop-61){s.find("li").removeClass("current");var n=0<e?e-1:0;s.find('a[href="#'+o[n].id+'"]').parent().addClass("current");break}i>=o[o.length-1].offsetTop-61&&(s.find("li").removeClass("current"),s.find("li:last").addClass("current"))}),$(window).scroll()}};Skin.init();
--- a/Casper/links.ftl
+++ b/Casper/links.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
 <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Casper/macro-comments.ftl
+++ b/Casper/macro-comments.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Casper/marcr-header.ftl
+++ b/Casper/marcr-header.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Casper/page.ftl
+++ b/Casper/page.ftl
@@ -1,49 +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/>.
-
-->
-<#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}">
-    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
-</@head>
-</head>
-<body>
-<div id="pjax">
-    <#if pjax><!---- pjax {#pjax} start ----></#if>
-    <#include "marcr-header.ftl">
-    <@header type='article'></@header>
-    <div class="article">
-        <section class="vditor-reset item__content wrapper">
-        ${page.pageContent}
-        </section>
-    </div>
-
-    <@comments commentList=pageComments article=page></@comments>
-    <#if pjax><!---- pjax {#pjax} end ----></#if>
-</div>
-<#include "footer.ftl">
-<#if pjax><!---- pjax {#pjax} start ----></#if>
-<@comment_script oId=page.oId commentable=page.commentable></@comment_script>
-<#if pjax><!---- pjax {#pjax} end ----></#if>
-</body>
-</html>
--- a/Casper/skin.properties
+++ b/Casper/skin.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Casper/tag-articles.ftl
+++ b/Casper/tag-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
 <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Casper/tags.ftl
+++ b/Casper/tags.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -25,8 +25,8 @@
    <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
 </@head>
 </head>
-<body>
-<div id="pjax">
+<body class="fn__flex-column">
+<div id="pjax" class="fn__flex-1">
    <#if pjax><!---- pjax {#pjax} start ----></#if>
 <#include "marcr-header.ftl">
    <@header type='other'></@header>
--- a/Community/archive-articles.ftl
+++ b/Community/archive-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/article-list.ftl
+++ b/Community/article-list.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/article.ftl
+++ b/Community/article.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/author-articles.ftl
+++ b/Community/author-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/category-articles.ftl
+++ b/Community/category-articles.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/common-comment.ftl
+++ b/Community/common-comment.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/css/base.css
+++ b/Community/css/base.css
--- a/Community/css/base.scss
+++ b/Community/css/base.scss
@@ -1,6 +1,6 @@
-/**
+/*
 * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ * Copyright (c) 2010-present, b3log.org
 *
 * 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
--- a/Community/footer.ftl
+++ b/Community/footer.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
@@ -20,9 +20,9 @@
 <div class="content paddingTop12 paddingBottom12">
    <div class="left">
        <div>
-            <span style="color: gray;">&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent}
+            <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>&nbsp;&nbsp;
+        Powered by <a href="https://solo.b3log.org" target="_blank">Solo</a>&nbsp;&nbsp;
        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>
--- a/Community/header.ftl
+++ b/Community/header.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/index.ftl
+++ b/Community/index.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/lang/lang_en_US.properties
+++ b/Community/lang/lang_en_US.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Community/lang/lang_zh_CN.properties
+++ b/Community/lang/lang_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 # Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
+# Copyright (c) 2010-present, b3log.org
 #
 # 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
--- a/Community/macro-comments.ftl
+++ b/Community/macro-comments.ftl
@@ -1,7 +1,7 @@
 <#--

    Solo - A small and beautiful blogging system written in Java.
-    Copyright (c) 2010-2019, b3log.org & hacpai.com
+    Copyright (c) 2010-present, b3log.org

    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
--- a/Community/page.ftl
+++ b/Community/page.ftl
@@ -1,49 +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/>.
-
-->
-<#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}">
-            <link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
-        </@head>
-    </head>
-    <body>
-        ${topBarReplacement}
-        <div class="header">
-            <#include "header.ftl">
-        </div>
-        <div class="content">
-            <div class="vditor-reset marginBottom40">
-                ${page.pageContent}
-            </div>
-            <@comments commentList=pageComments article=page></@comments>
-        </div>
-        <div>
-            <#include "side.ftl">
-        </div>
-        <div class="footer">
-            <#include "footer.ftl">
-        </div>
-        <@comment_script oId=page.oId commentable=page.commentable></@comment_script>
-    </body>
-</html>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Liang Ding	ca0de62bdd	🔖 发布 v3.6.2	2019-06-07 18:49:57 +08:00
Van	d582ffd29a	https://github.com/b3log/solo/issues/12796	2019-06-07 11:58:44 +08:00
Liang Ding	e49ac44020	🎨 https://github.com/b3log/solo/issues/12787	2019-06-01 20:21:32 +08:00
Van	7332ca1d7e	https://github.com/b3log/solo/issues/12787	2019-06-01 18:42:44 +08:00
Van	895d3cfa4c	fix https://github.com/b3log/solo/issues/12773	2019-05-05 10:17:30 +08:00
Liang Ding	3844f84450	📦 打包前端	2019-04-21 10:45:04 +08:00
Van	d101f1a172	⬆️	2019-04-21 10:40:28 +08:00
Van	588629cae6	📦 https://github.com/b3log/solo/issues/12766	2019-04-21 09:57:40 +08:00
Van	4e0efa0a53	🚦	2019-04-19 16:42:15 +08:00
Van	1416debe53	Merge branch 'master' of https://github.com/b3log/solo-skins	2019-04-19 16:41:13 +08:00
Van	4abaf10a1b	fix https://github.com/b3log/solo-skins/issues/29	2019-04-19 16:41:09 +08:00
Liang Ding	bc8eb51c2b	🔖 发布 v3.6.0	2019-04-19 10:38:32 +08:00
Van	c699f2ff85	https://github.com/b3log/solo/issues/12764	2019-04-18 17:36:32 +08:00
Van	0d277a9b0e	https://github.com/b3log/solo/issues/12757	2019-04-13 09:36:20 +08:00
Liang Ding	3fbc732017	🐛 Fix https://github.com/b3log/solo/issues/12755	2019-04-08 14:30:53 +08:00
Van	cfd5d476cd	fix https://github.com/b3log/solo/issues/12748	2019-04-03 21:15:34 +08:00
Liang Ding	443cacafa3	📦 编译打包	2019-04-02 21:07:51 +08:00
Van	734a0979a7	fix https://github.com/b3log/solo/issues/12748	2019-04-02 11:37:02 +08:00
Van	8ab115ac53	2 https://github.com/b3log/solo/issues/12748	2019-04-02 11:26:55 +08:00
Van	dfc58496ed	6 https://github.com/b3log/solo/issues/12748	2019-04-02 11:08:40 +08:00
Van	72b8473caa	3 https://github.com/b3log/solo/issues/12748	2019-04-02 11:02:45 +08:00
Van	94c330ff14	4 https://github.com/b3log/solo/issues/12748	2019-04-02 11:00:10 +08:00
Van	e03cfdcbf1	https://github.com/b3log/solo/issues/12748 5	2019-04-02 10:56:49 +08:00
Liang Ding	c26beefecf	📄 更新文件头	2019-04-02 09:36:01 +08:00