Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/common-template/label.ftl

@@ -18,7 +18,7 @@
 
 -->
 <script src="https://cdn.jsdelivr.net/npm/uvstat@v1.0.6/dist/index.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/vcmt@v1.0.4/dist/index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vcmt@v1.0.5/dist/index.min.js"></script>
 <script>
   var Label = {
     servePath: "${servePath}",

src/main/resources/skins/9IPHP/css/base.scss

@@ -386,8 +386,8 @@ aside {
 
   .meta img {
     float: left;
-    height: 80px;
-    width: 80px;
+    height: 60px;
+    width: 60px;
     border-radius: 5px;
   }
 }

src/main/resources/skins/Andrea/article.ftl

@@ -105,7 +105,9 @@
                             <div id="externalRelevantArticles" class="article-relative"></div>
                         </div>
                         <#if commentable>
-                        <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                        <div id="vcomment"
+                             style="border-top: 2px solid #3F3D36;margin-top: 30px;padding-top: 27px; padding-bottom: 30px;"
+                             data-name="${article.authorName}" data-postId="${article.oId}"></div>
                             <#if !staticSite>
                             <div id="soloComments" style="display: none;">
                                 <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/Bubble/article.ftl

@@ -84,7 +84,14 @@
     </#if>
     <#if commentable>
     <div class="wrapper">
-        <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+        <div id="vcomment"
+             style="    margin-bottom: 40px; margin-top: 80px; 
+    border: 1px solid rgba(255,255,255,0.8);
+    border-radius: 5px;
+    background: rgba(255,255,255,0.9);
+    box-shadow: 0 1px 4px rgba(0,0,0,0.04);
+    padding: 20px;"
+             data-name="${article.authorName}" data-postId="${article.oId}"></div>
     </div>
         <#if !staticSite>
         <div id="soloComments" style="display: none;">

src/main/resources/skins/Casper/article.ftl

@@ -86,7 +86,7 @@
         </div>
     </#if>
     <#if commentable>
-    <div id="vcomment" class="wrapper" style="padding: 40px 0" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+    <div id="vcomment" class="comment__wrapper wrapper" style="margin: 40px auto" data-name="${article.authorName}" data-postId="${article.oId}"></div>
         <#if !staticSite>
             <div id="soloComments" style="display: none;">
                 <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/Community/article.ftl

@@ -122,7 +122,9 @@
                 </div>
             </div>
             <#if commentable>
-            <div id="vcomment" style="background-color: #ffffff; padding: 10px; margin-bottom: 40px" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+            <div id="vcomment" style="margin-bottom: 40px;
+    border-top: 1px solid #dcdcdc;
+    padding-top: 30px;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
                 <#if !staticSite>
                     <div id="soloComments" style="display: none;">
                         <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/Community/css/base.scss

@@ -392,6 +392,11 @@ a.header-title {
   line-height: 145%;
 }
 
+#vcomment .vcomment {
+  background-color: #fff;
+  padding: 10px 10px 0;
+}
+
 #comments {
   background: url("../images/indentline-light.png") repeat-x scroll left top transparent;
   padding-top: 30px;

src/main/resources/skins/Finding/article.ftl

@@ -102,7 +102,7 @@
                 <div id="externalRelevantArticles" class="fn-wrap"></div>
                 </#if>
                 <#if commentable>
-                <div id="vcomment" class="fn-wrap" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                <div id="vcomment" style="margin-top: 100px" class="fn-wrap" data-name="${article.authorName}" data-postId="${article.oId}"></div>
                     <#if !staticSite>
                         <div id="soloComments" style="display: none;">
                             <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/Jane/footer.ftl

@@ -24,7 +24,7 @@
     </div>
     &copy; ${year}
     <a href="${servePath}">${blogTitle}</a>
-    ${footerContent}  <span class="fn__none--m">&nbsp; • &nbsp;</span>
+    ${footerContent}
     <div class="fn__none"></div>
 
     <div class="fn__right">

src/main/resources/skins/Medium/article.ftl

@@ -119,7 +119,7 @@
                     <div class="fn-flex-1" id="randomArticles"></div>
                 </div>
                 <#if commentable>
-                <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                <div id="vcomment" class="article__comment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
                     <#if !staticSite>
                         <div id="soloComments" style="display: none;">
                             <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/NeoEase/article.ftl

@@ -107,7 +107,8 @@
                         </div>
                     </div>
                     <#if commentable>
-                    <div id="vcomment" style="padding: 10px 0;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                    <div id="vcomment" style="margin:15px 5px 0 5px;padding: 10px;background-color: #F5F5F5;box-sizing: border-box"
+                         data-name="${article.authorName}" data-postId="${article.oId}"></div>
                         <#if !staticSite>
                             <div id="soloComments" style="display: none;">
                                 <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/favourite/article.ftl

@@ -120,7 +120,10 @@
                             <div id="externalRelevantArticles" class="article-relative"></div>
                         </div>
                         <#if commentable>
-                        <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                        <div id="vcomment"
+                             class="comments"
+                             style="padding-top: 15px"
+                             data-name="${article.authorName}" data-postId="${article.oId}"></div>
                             <#if !staticSite>
                                 <div id="soloComments" style="display: none;">
                                     <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/i-nove/article.ftl

@@ -113,7 +113,9 @@
                                 <div id="externalRelevantArticles" class="article-relative"></div>
                             </div>
                             <#if commentable>
-                            <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                            <div id="vcomment" class="comments"
+                                 style="padding-top: 15px"
+                                 data-name="${article.authorName}" data-postId="${article.oId}"></div>
                                 <#if !staticSite>
                                 <div id="soloComments" style="display: none;">
                                     <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/metro-hot/css/base.scss

@@ -763,6 +763,32 @@ pre.prettyprint {
 /* end article */
 
 /* start comment */
+#vcomment {
+  .vcomment {
+
+    &__item {
+      border-bottom: 0;
+    }
+
+    .vditor-reset {
+      margin-bottom: 0;
+    }
+
+    &__meta {
+      color: #BDBEBD;
+    }
+
+    &__pointer,
+    &__text {
+      color: #BDBEBD;
+
+      &:hover {
+        color: #fff;
+      }
+    }
+  }
+}
+
 #comments {
   position: relative;
 }

src/main/resources/skins/next/css/base.scss

@@ -767,6 +767,11 @@ img {
 /* end article */
 
 /* start comments */
+
+.vcomment__avatarlink {
+  border-bottom: 0;
+}
+
 ul.comments {
   padding: 0;
   list-style: none;
@@ -1096,4 +1101,4 @@ ul.comments .comment-meta time {
   }
 }
 
-/* end responsive */
+/* end responsive */
\ No newline at end of file

src/main/resources/skins/nijigen/css/base.scss

@@ -698,10 +698,6 @@ a {
       text-decoration: underline;
     }
 
-    .fn__none--m {
-      display: none;
-    }
-
     .fn__none {
       display: block;
     }

src/main/resources/skins/nijigen/footer.ftl

@@ -21,7 +21,7 @@
 <footer class="footer">
     &copy; ${year}
     <a href="${servePath}">${blogTitle}</a>
-    ${footerContent}  <span class="fn__none--m">&nbsp; • &nbsp;</span>
+    ${footerContent}
     <div class="fn__none"></div>
     <br/>
 

src/main/resources/skins/timeline/article.ftl

@@ -118,7 +118,7 @@ ${topBarReplacement}
                     <div id="externalRelevantArticles"></div>
                     </#if>
                     <#if commentable>
-                    <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                    <div id="vcomment" class="module" data-name="${article.authorName}" data-postId="${article.oId}"></div>
                         <#if !staticSite>
                         <div id="soloComments" style="display: none;" class="module">
                             <@comments commentList=articleComments article=article></@comments>

src/main/resources/skins/tree-house/article.ftl

@@ -104,7 +104,7 @@
                             <div class="line right"></div>
                             <#if commentable>
                             <div id="vcomment"
-                                 style="margin: 88px 100px 0 99px"
+                                 style="margin: 88px 100px 0 99px;background-color: #effdff;border-radius: 10px;padding: 10px;"
                                  data-name="${article.authorName}" data-postId="${article.oId}"></div>
                                 <#if !staticSite>
                                     <div id="soloComments" style="display: none;">