Merge remote-tracking branch 'origin/master'

Medium/css/base.scss

@@ -19,7 +19,7 @@
  * skin style
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 2.0.0.0, Feb 21, 2019
+ * @version 2.0.0.1, Mar 1, 2019
  */
 @import "../../../scss/reset-content";
 @import "../../../scss/reset";
@@ -823,10 +823,10 @@
 
 .article__next {
   border-left: 1px solid rgba(0, 0, 0, 0.38);
-  line-height: 14px;
+  line-height: 15px;
   margin-top: 7px;
   color: rgba(0, 0, 0, 0.84);
-  font-size: 18px;
+  font-size: 14px;
   display: inline-block;
   padding-left: 20px;
   margin-left: 20px;

classic/css/base.scss

@@ -21,10 +21,12 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.0.0.0, Feb 21, 2019
+ * @version 2.0.0.1, Mar 1, 2019
 */
+@import "../../../scss/reset";
 @import "../../../scss/reset-content";
 @import "vditor/src/assets/scss/classic";
+
 .left {
   float: left;
 }
@@ -42,26 +44,33 @@
 .clear:after {
   clear: both;
 }
+
 .none {
   display: none;
 }
+
 a, a:link {
   color: #0000CC;
 }
+
 a:active {
   color: red;
 }
+
 a:visited {
   color: #551A8B;
 }
+
 h5 {
   font-size: 12px;
 }
+
 .content {
   margin: 0 auto;
   max-width: 1250px;
   padding: 0 12px;
 }
+
 .header {
   height: 108px;
   margin-bottom: 10px;
@@ -77,40 +86,49 @@ h5 {
   font-size: 14px;
   font-weight: normal;
 }
+
 .side {
   border-left: 2px solid #E5ECF9;
   padding-left: 12px;
   width: 280px;
 }
+
 .main {
   margin-right: -294px;
   width: 100%;
 }
-.main>div {
+
+.main > div {
   min-width: 280px;
   padding-right: 318px;
 }
+
 #logoTitle {
   font-family: "Microsoft YaHei";
   font-size: 32px;
   line-height: 64px;
   text-decoration: none;
 }
+
 #statistic span {
   font-size: 11px;
 }
+
 .article, .comments {
   padding-bottom: 24px;
 }
+
 .article-title {
   background-color: #E3E3FF;
   border-top: 1px solid #3366CC;
   margin-left: 91px;
   padding: 3px 0 6px 12px;
 }
+
 .article-title sup {
   font-size: 12px;
 }
+
 .article-date {
   background-color: #E3E3FF;
   border: 1px solid #BBCCFF;
@@ -122,34 +140,46 @@ h5 {
   text-align: center;
   word-break: break-all;
 }
+
 .article-abstract {
   word-wrap: break-word;
 }
+
 .content-reset {
   margin-left: 12px;
   line-height: 145%;
 }
+
 .article-footer {
   margin-right: 12px;
 }
+
 .article-footer a, .article-details-footer a {
   text-decoration: none;
 }
+
 .article-details-footer {
   margin: 36px 12px 0 0;
 }
+
 .article-relative {
   line-height: 22px;
   margin-top: 24px;
+  ul {
+    list-style: none;
+  }
 }
+
 .comments {
   position: relative;
 }
+
 .comment-title {
   background-color: #E3E3FF;
   border-top: 1px solid #3366CC;
   padding: 3px 12px 3px 12px;
 }
+
 .comment-body-ref {
   background-color: #FFFFFF;
   border: 1px solid #E3E3FF;
@@ -161,24 +191,30 @@ h5 {
   width: 87%;
   z-index: 10;
 }
+
 .comment-body-ref .comment-title {
   border-top: 0px;
 }
+
 .comment-body {
   padding: 9px 12px 12px;
   word-wrap: break-word;
   overflow: hidden;
 }
+
 .comment-picture {
   margin-right: 12px;
 }
+
 .comment-picture img {
   height: 60px;
   width: 60px;
 }
+
 .comment-reply {
   margin: 0 auto 24px auto;
 }
+
 .comment-content {
   float: left;
   width: 88%;
@@ -191,18 +227,22 @@ h5 {
 .error-msg {
   color: #3366CC;
 }
+
 .error-footer {
   bottom: 0px;
   position: fixed;
   width: 82%;
 }
+
 #sideNavi a.selected {
   color: #000000;
   text-decoration: none;
 }
+
 .side-navi ul {
   list-style: none;
 }
+
 #sideNavi li {
   line-height: 22px;
   overflow: hidden;
@@ -210,40 +250,53 @@ h5 {
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
 }
+
 #sideNavi li.aboutMe, #sideNavi li.side-navi-notice {
   white-space: normal;
 }
+
 #sideNavi sup {
   margin-right: 3px;
   color: green;
 }
+
 .side-comment {
   text-decoration: none;
 }
+
 #recentComments p {
   display: inline;
+  img {
+    display: none;
+  }
 }
+
 #recentComments div, #recentComments br {
   display: none;
 }
+
 .line {
   border-top: thin dotted #BBBBBB;
   margin-top: 12px;
   padding-top: 12px;
 }
+
 .pagination {
   margin: 16px;
   text-align: center;
 }
+
 .pagination a, .pagination a:visited {
   color: #4272DB;
   padding: 0 3px;
   text-decoration: none;
 }
+
 .pagination a.selected {
   color: #000000;
   font-weight: bold;
 }
+
 #tagsPanel .tagPanel {
   border: 2px solid;
   cursor: pointer;
@@ -251,23 +304,28 @@ h5 {
   margin: 3px;
   border-radius: 6px;
 }
+
 #tagsPanel .tagPanel:hover {
   background-color: #EEEEEE;
   border: 2px dashed;
 }
+
 #tagsPanel .tagPanel {
   text-decoration: none;
 }
+
 .error-title {
   border-top: 1px solid #3366CC;
   background-color: #E5ECF9;
   margin-left: 12px;
   padding: 6px 12px;
 }
+
 .error-panel {
   margin-left: 12px;
   padding: 24px;
 }
+
 .commentIcon, .browserIcon {
   background-image: url("../../../images/icon.png");
   cursor: pointer;
@@ -275,18 +333,23 @@ h5 {
   margin-right: 3px;
   width: 16px;
 }
+
 .commentIcon {
   background-position: -32px -16px;
 }
+
 .browserIcon {
   background-position: -128px -16px;
 }
+
 .goTopIcon {
   background-position: -128px -32px;
 }
+
 .goBottomIcon {
   background-position: -144px -32px;
 }
+
 .footer {
   text-align: center;
   margin: 30px 0 30px 0;

tree-house/css/base.scss

@@ -20,9 +20,10 @@
  * skin tree-house style
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 2.0.0.0, Feb 21, 2019
+ * @version 2.1.0.0, Mar 1, 2019
  */
 
+@import "../../../scss/reset";
 @import "../../../scss/reset-content";
 @import "vditor/src/assets/scss/classic";
 .left {

tree-house/side.ftl

@@ -150,6 +150,7 @@
         <h3>${archiveLabel}</h3>
         <ul>
             <#list archiveDates as archiveDate>
+            <#if archiveDate_index < 10>
             <li>
                 <#if "en" == localeString?substring(0, 2)>
                 <a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
@@ -161,6 +162,7 @@
                     ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
                 </#if>
             </li>
+            </#if>
             </#list>
         </ul>
         <div class='clear'></div>