From 714fd85f3e5cee70336cdb60401a040c4a87dafa Mon Sep 17 00:00:00 2001
From: Van <lly219@gmail.com>
Date: Sun, 17 Feb 2019 13:08:40 +0800
Subject: [PATCH] https://github.com/b3log/solo/issues/12651 bruce

---
 Bruce/article.ftl        | 15 ++++++++++++++-
 Bruce/css/Bruce.css      |  4 ----
 Bruce/macro-comments.ftl |  4 ----
 ease/css/ease.css        |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Bruce/article.ftl b/Bruce/article.ftl
index 057cb15..d8708cf 100644
--- a/Bruce/article.ftl
+++ b/Bruce/article.ftl
@@ -91,8 +91,15 @@
                         </div>
                         <@comments commentList=articleComments article=article></@comments>
                     </div>
-                    
+                        <#if 0 != relevantArticlesDisplayCount>
+                        <div id="relevantArticles"></div>
+                        </#if>
+                        <#if 0 != randomArticlesDisplayCount>
+                        <div id="randomArticles"></div>
+                        </#if>
+                        <#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
                         <div id="externalRelevantArticles"></div>
+                        </#if>
                     <div class="col-sm-2"></div>
                 </div>
             </div>  
@@ -104,6 +111,12 @@
         <#if 0 != externalRelevantArticlesDisplayCount>
         page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
         </#if>
+        <#if 0 != randomArticlesDisplayCount>
+        page.loadRandomArticles();
+        </#if>
+        <#if 0 != relevantArticlesDisplayCount>
+        page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
+        </#if>
         </@comment_script>    
     </body>
 </html>
diff --git a/Bruce/css/Bruce.css b/Bruce/css/Bruce.css
index 5b53c58..32d6aa7 100644
--- a/Bruce/css/Bruce.css
+++ b/Bruce/css/Bruce.css
@@ -197,10 +197,6 @@ h4, h5, h6 {
     border-top: 1px solid #e5e5e5;
 }
 
-.article-relative {
-    margin-top: 48px;
-}
-
 .right {
     float: right;
 }
diff --git a/Bruce/macro-comments.ftl b/Bruce/macro-comments.ftl
index c93bb0f..d815976 100644
--- a/Bruce/macro-comments.ftl
+++ b/Bruce/macro-comments.ftl
@@ -28,9 +28,5 @@
 <div class="row cmtForm">
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment" class="form-control"></textarea>
 </div>
-
-<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
-<div id="externalRelevantArticles" class="row article-relative"></div>
-</#if>
 </#if>
 </#macro>
diff --git a/ease/css/ease.css b/ease/css/ease.css
index 22f7048..81ea2ce 100644
--- a/ease/css/ease.css
+++ b/ease/css/ease.css
@@ -570,7 +570,7 @@ sup {
 
 #externalRelevantArticles {
     width: 357px;
-    margin-top: 13px;
+    margin-top: 0;
 }
 /* end article*/