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

2019-02-21 21:46:33 +08:00
parent 3a5132b6ba
commit fbba7dd293
194 changed files with 2365 additions and 7692 deletions
--- a/Community/article-list.ftl
+++ b/Community/article-list.ftl
@@ -67,7 +67,7 @@
            </sup>
            </#if>
        </h2>
-        <div class="article-body">
+        <div class="content-reset">
            ${article.articleAbstract}
        </div>
        <div class="read-more">
--- a/Community/article.ftl
+++ b/Community/article.ftl
@@ -103,7 +103,7 @@
                        </sup>
                        </#if>
                    </h2>
-                    <div class="article-body">
+                    <div class="content-reset">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div class="marginTop12">
--- a/Community/common-comment.ftl
+++ b/Community/common-comment.ftl
@@ -35,7 +35,7 @@
        </#if>
        ${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
        </div>
-        <div class="comment-content article-body">
+        <div class="comment-content content-reset">
        ${comment.commentContent}
        </div>
        <div class="clear"></div>
--- a/Community/css/Community.min.css
+++ b/Community/css/Community.min.css
--- a/Community/css/base.css
+++ b/Community/css/base.css
--- a/Community/css/Community.css
+++ b/Community/css/Community.css
@@ -20,8 +20,32 @@
 * skin community 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";
+@import "../../../scss/reset";
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.clear:before,
+.clear:after {
+    display: table;
+    content: "";
+}
+
+.clear:after {
+    clear: both;
+}
+
+.none {
+    display: none;
+}
 body {
    background-color: #EFEFEF;
    color: #555555;
@@ -168,7 +192,7 @@ a.header-title {
    float: left;
    height: 14px;
    width: 14px;
-    margin: 15px 5px 0 0;
+    margin: 4px 5px 0 0;
 }

 .header-navi-main .sub-tab {
@@ -226,15 +250,15 @@ a.header-title {
    overflow: hidden;
 }

-.article-body {
+.content-reset {
    line-height: 145%;
 }

-.article-body a {
+.content-reset a {
    color: #075181;
 }

-.article-body a:hover {
+.content-reset a:hover {
    color: #68ADD5;
 }

@@ -450,12 +474,6 @@ a.header-title {
 #commentValidate, #commentValidateReply {
    width: 240px;
 }
-
-.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 {
-    background-image: url("../../../images/emotions/emotions.png");
-    background-size: 120px;
-    margin: 0 12px;
-}
 /* footer secondary */
 .footer-secondary {
    background: url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE;
@@ -574,7 +592,7 @@ a.header-title {

 .footer-block li sup {
    float: left;
-    margin: 5px 3px 0 0;
+    margin: 18px 3px 0 0;
 }

 .footer-block li:hover {
@@ -585,6 +603,7 @@ a.header-title {
 .footer {
    background: url("../images/indentline-light.png") repeat-x scroll left top #DEDEDE;
    text-align: left;
+    padding: 10px 0;
 }

 .footer .content {
--- a/Community/footer.ftl
+++ b/Community/footer.ftl
@@ -61,22 +61,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}"
    },
    maxLength = parseInt("${mostCommentArticles?size}");

--- a/Community/lang/lang_zh_CN.properties
+++ b/Community/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
--- a/Community/macro-head.ftl
+++ b/Community/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">
--- a/Community/page.ftl
+++ b/Community/page.ftl
@@ -34,7 +34,7 @@
            <#include "header.ftl">
        </div>
        <div class="content">
-            <div class="article-body marginBottom40">
+            <div class="content-reset marginBottom40">
                ${page.pageContent}
            </div>
            <@comments commentList=pageComments article=page></@comments>