https://github.com/b3log/solo/issues/12658

Andrea/article-list.ftl

@@ -55,7 +55,7 @@
             </div>
         </div>
         <div class="clear"></div>
-        <div class="article-abstract article-body">
+        <div class="article-abstract content-reset">
             ${article.articleAbstract}
             <div class="clear"></div>
             <a class="right underline" href="${servePath}${article.articlePermalink}">

Andrea/article.ftl

@@ -92,7 +92,7 @@
                                 </div>
                             </div>
                             <div class="clear"></div>
-                            <div class="article-body">
+                            <div class="content-reset">
                                 ${article.articleContent}
                                 <#if "" != article.articleSign.signHTML?trim>
                                 <div class="marginTop12">

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 article-body">
+            <div class="comment-content content-reset">
             ${comment.commentContent}
             </div>
         <#if article.commentable>

Andrea/css/base.scss

@@ -19,8 +19,33 @@
  * skin andrea style
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.2.0.0, Jun 4, 2018
+ * @version 2.0.0.0, Feb 21, 2019
 */
+@import "../../../scss/reset-content";
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.clear:before,
+.clear:after {
+    display: table;
+    content: "";
+}
+
+.clear:after {
+    clear: both;
+}
+.none {
+    display: none;
+}
+body, dd, div, dl, h1, h2, h3, h4, h5, h6, html, img, li, ol, p, ul {
+    padding: 0;
+    margin: 0;
+}
 body {
     background-image: url("../images/bg-grey.jpg");
     background-color: #000000;
@@ -477,7 +502,7 @@ img {
 }
 
 /* article */
-.article-body {
+.content-reset {
     border-top: 2px dashed #F1EEE9;
     margin-top: 15px;
     overflow: hidden;
@@ -485,7 +510,7 @@ img {
     line-height: 145%;
 }
 
-.article-body p:first-child:first-letter, .article-body:first-letter{
+.content-reset p:first-child:first-letter, .content-reset:first-letter{
     font-size: 48px;
     float: left;
     font-weight: bold;

Andrea/footer.ftl

@@ -34,22 +34,7 @@
         "markedAvailable": ${markedAvailable?c},
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
-        "skinDirName": "${skinDirName}",
-        "em00Label": "${em00Label}",
-        "em01Label": "${em01Label}",
-        "em02Label": "${em02Label}",
-        "em03Label": "${em03Label}",
-        "em04Label": "${em04Label}",
-        "em05Label": "${em05Label}",
-        "em06Label": "${em06Label}",
-        "em07Label": "${em07Label}",
-        "em08Label": "${em08Label}",
-        "em09Label": "${em09Label}",
-        "em10Label": "${em10Label}",
-        "em11Label": "${em11Label}",
-        "em12Label": "${em12Label}",
-        "em13Label": "${em13Label}",
-        "em14Label": "${em14Label}"
+        "skinDirName": "${skinDirName}"
     };
 
     // init brush

Andrea/lang/lang_zh_CN.properties

@@ -188,7 +188,6 @@ permalink1Label=\u94FE\u63A5\uFF1A
 permalinkLabel=\u94FE\u63A5
 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 Solo\uFF01
 b3logLabel=<span style="color: orange;">B</span><span style="color: blue;"><sup>3</sup></span><span style="color: green;">L</span><span style="color: red;">O</span><span style="color: blue;">G</span>
-killBrowserLabel=<h2>\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01</h2><p>\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002</p>\u60A8\u53EF\u4EE5\u4E0B\u8F7D<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706B\u72D0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8C37\u6B4C\u6D4F\u89C8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6E38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5B83\u6D4F\u89C8\u5668</a>.</li></ul>
 readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB
 readmore2Label=\u9605\u8BFB\u66F4\u591A
 replyLabel=\u56DE\u590D\u00BB

Andrea/macro-head.ftl

@@ -27,8 +27,7 @@
 <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}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
-<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${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">

Andrea/page.ftl

@@ -37,7 +37,7 @@
                 <div class="main">
                     <div class="main-content">
                         <div class="article">
-                            <div class="article-body" style="margin-top: 0px;">
+                            <div class="content-reset" style="margin-top: 0px;">
                                 ${page.pageContent}
                             </div>
                         </div>