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

2019-02-21 18:16:59 +08:00
parent d7e9db917c
commit 755eb33471
134 changed files with 1846 additions and 1598 deletions
--- a/skins/Coda/archive-articles.ftl
+++ b/skins/Coda/archive-articles.ftl
@@ -25,7 +25,7 @@
        <meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
        </@head>
-		<link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/style${miniPostfix}.css?${staticResourceVersion}" media="all" />
+		<link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" media="all" />
    </head>
    <body id="blog">
 		<div id="wrap">
--- a/skins/Coda/article.ftl
+++ b/skins/Coda/article.ftl
@@ -27,7 +27,7 @@
        <meta name="keywords" content="${article.articleTags}" />
        <meta name="description" content="${article.articleAbstract?html}" />
        </@head>
-        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/style${miniPostfix}.css?${staticResourceVersion}" media="all" />
+        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" media="all" />
    </head>
    <body id="blog">
        ${topBarReplacement}
@@ -88,7 +88,7 @@
                                    </sup>
                                    </#if>
                                </h2>
-                                <div class="post_content article-body">
+                                <div class="post_content content-reset">
                                    ${article.articleContent}
                                    <div class="copyright_info opaque_10">
                                        »»»
@@ -141,15 +141,15 @@
                                    </#if>
                                </div>
                                <div id="relatedpost" class="hor_side">
-									<#if 0 != randomArticlesDisplayCount>
-										page.loadRandomArticles();
-									</#if>
-									<#if 0 != relevantArticlesDisplayCount>
-										page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
-									</#if>
-									<#if 0 != externalRelevantArticlesDisplayCount>
-										page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
-									</#if>
+                                     <#if 0 != relevantArticlesDisplayCount>
+                                        <div id="relevantArticles" class="article__near"></div>
+                                                                     </#if>
+                                    <#if 0 != randomArticlesDisplayCount>
+                                        <div id="randomArticles" class="article__near"></div>
+                                    </#if>
+                                    <#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
+                                        <div id="externalRelevantArticles" class="article__near"></div>
+                                    </#if>
                                </div>
                            </section>
                    <div class="clear"></div>
--- a/skins/Coda/author-articles.ftl
+++ b/skins/Coda/author-articles.ftl
@@ -25,7 +25,7 @@
        <meta name="keywords" content="${article.articleTags}" />
        <meta name="description" content="${article.articleAbstract?html}" />
        </@head>
-        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/style${miniPostfix}.css?${staticResourceVersion}" media="all" />
+        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" media="all" />
    </head>
    <body id="blog">
        <div id="loading" style="display: none; "></div>
--- a/skins/Coda/css/base.css
+++ b/skins/Coda/css/base.css
--- a/skins/Coda/css/base.scss
+++ b/skins/Coda/css/base.scss
@@ -21,6 +21,7 @@ Theme URI: http://isayme.com/
 Author: iSayme
 Author URI: http://isayme.com/
 */
+@import "../../../scss/reset-content";
 body#blog{background:#474C52 url("../images/bg.jpg") center center fixed}
 #wrap{width:84em;margin:0 auto;text-align:left;}
 /*header*/
--- a/skins/Coda/css/global.min.css
+++ b/skins/Coda/css/global.min.css
@@ -1 +1,18 @@
+/**
+ * Solo - A small and beautiful blogging system written in Java.
+ * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 a:hover,h4{color:#a1ff66}.clear:after,article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,time{display:block}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,summary,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}p,pre{margin:0 0 1.3em}h1,h2{margin:.1em 0 .6em;color:#fff}blockquote,pre{padding:0 2em 0 1em;border-left:3px solid #a1ff66}li,ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0}body{font-size:76%;font-family:微软雅黑,"Microsoft YaHei",Helvetica,Times,Arial,serif;text-align:center;color:#D2D8DE}dd,input,label,legend,li,optgroup,p,select,table,textarea{font-size:1em}p{line-height:1.4em;font-size:13px}em,strong{font-weight:700}blockquote{margin:0 0 1.3em 1em;color:#C5CBD0}code,pre{font:1em Monaco,Consolas,"Courier New",Courier,FreeMono,monospace;color:#C5CBD0}a{font-size:inherit}a:link{text-decoration:none;color:#c5e2b5}a:visited{text-decoration:none;color:#95be7d}a:hover{text-decoration:underline}a:active{text-decoration:none!important;color:#fff}h1,h2,h3,h4,h5{font-family:微软雅黑,"Microsoft YaHei",Arial,Helvetica,"Nimbus Sans L",Helvetica,Times,sans-serif;line-height:1em;font-weight:400}h1{font-size:2.2em}h2{font-size:2.1em}h3{margin:.2em 0 .8em;font-size:1.4em;color:#fff}h4{margin:0 0 .2em;font-size:1.2em}.button,h5{font-size:1em;text-transform:uppercase}h5{margin:0;font-weight:700;color:#fff}h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover{color:#b0e194!important}h1 a:active,h2 a:active,h3 a:active,h4 a:active{color:#79ff25!important}.clear:after{content:"";height:0;clear:both;visibility:hidden}.left{float:left}.right{float:right}.c{width:100%;clear:both}.hide{display:none}label{display:block;float:left;width:10em;clear:left;margin-right:1em;padding:.3em 0;text-align:right}input,textarea{width:20em;float:left;margin-bottom:.5em;padding:.4em;color:#C5CBD0;background:url(../images/opaque_10.png);border:none}.button,input:focus,textarea:focus{color:#fff}textarea{width:20em;height:7em;line-height:1.3em;overflow:auto}fieldset .button{background-color:#000;margin:10px 10px 0 0}.button{cursor:pointer;padding:.3em 0;text-align:center;width:auto;overflow:visible;background-color:transparent;border:none}.button:hover{background-color:#509f24!important}.button:active{background-color:#800!important}
--- a/skins/Coda/css/style-home.min.css
+++ b/skins/Coda/css/style-home.min.css
@@ -1 +1,18 @@
+/**
+ * Solo - A small and beautiful blogging system written in Java.
+ * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 #mapmenu ul li a:hover,#maptitle a:hover,div#mappost span a{text-decoration:none}div#mappost span.title,div#mappost span.title a{overflow:hidden;text-overflow:ellipsis}#mapmenu ul li,div#mappost li{display:inline}#mapfooter,#maptitle,#pagination{position:absolute}body#home{background:url(../images/background.jpg) center center fixed}body#home #sitemap{position:absolute;top:50%;left:50%;width:960px;height:540px;margin:-280px 0 0 -480px;text-align:left}#maptitle{top:50px;left:50px}#mapcontent{float:right;width:55%;margin:30px 10px 0 0}#mapmenu{margin:30px 20px 0 0}#mapmenu ul{margin:0 10px 0 0;float:right;font-size:14px}#mapmenu ul li{float:left;padding:5px 10px 5px 0;-webkit-transform:rotate(-40deg);-o-transform:rotate(-40deg);-moz-transform:rotate(-40deg)}#mappost{padding:50px 0 0 20px}#mappost .newposts{font-size:15px}#mapnavi{margin:20px 40px 10px 10px}div#mappost ul{border-top:1px solid #26282c;margin:20px 0 0}div#mappost ul span{margin:0;color:#747a83;border-bottom:1px solid #26282c}div#mappost span.title{height:24px;width:25em;float:left;word-break:break-all;white-space:nowrap}div#mappost span.section{height:24px;width:6em;float:left;padding-left:.5em}div#mappost span.date{width:8.5em;color:#575b64;padding:6px 3px 0 1em;float:left;height:18px;font:1em Consolas,"Courier New",Courier,FreeMono,monospace}div#mappost span.section a,div#mappost td.date{text-align:right}div#mappost span a{display:block;padding:.3em 0;color:#949ca5}div#mappost li:hover{background:url(../images/row_gradient.png) -9.5em 0 repeat-y}div#mappost li:hover span,div#mappost li:hover span a{color:#fff}#mapfooter{width:100%;bottom:0;margin:0 0 -30px}#mapfooter .author{float:right;padding:0 10px 0 0}#pagination{bottom:1em;right:2em}#pagination a:hover{background-color:#15161E;color:#fff;-webkit-transform:rotate(360deg) scale(1.2)}#pagination a{-webkit-transition:all .2s ease;moz-transition:all .2s ease;-o-transition:all .2s ease;transition:all .2s ease}
--- a/skins/Coda/css/style.min.css
+++ b/skins/Coda/css/style.min.css
--- a/skins/Coda/js/coda.min.js
+++ b/skins/Coda/js/coda.min.js
--- a/skins/Coda/js/pagenavi.min.js
+++ b/skins/Coda/js/pagenavi.min.js
@@ -1 +1,18 @@
+/*
+ * Solo - A small and beautiful blogging system written in Java.
+ * Copyright (c) 2010-2019, b3log.org & hacpai.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 function showPageLink(e,a,t,s){var o=0;for(o=Math.max(1,a-1),1==a?(document.write("<span class='pages' style='color:#7D7D7D'>1st</span> "),document.write("<span class='pages' style='color:#7D7D7D'>&laquo;</span> ")):(document.write('<a href="'+e+s+"1\" title='The 1 page'>1st</a> "),document.write('<a href="'+e+o+s+"\" title='Prev page(The "+o+" page)'>&laquo;</a> ")),6<a&&document.write("<span>...</span> "),o=Math.max(1,a-5);o<a;o++)document.write('<a href="'+e+o+s+"\" title='The "+o+" page'>"+o+"</a> ");for(document.write("<font color='red'>"+a+"</font> "),o=a+1;o<=Math.min(t,a+5);o++)document.write('<a href="'+e+o+s+"\" title='The "+o+" page'>"+o+"</a> ");o=Math.min(t,a+1),a+5<t&&document.write("<span>...</span> "),a==t?(document.write("<span class='pages' style='color:#7D7D7D'>&raquo;</span> "),document.write("<span class='pages' style='color:#7D7D7D'>Last</span> ")):(document.write(' <a href="'+e+o+s+"\" title='Next page(The "+o+" page)'>&raquo;</a>"),document.write('<a href="'+e+t+s+"\" title='Last page(The "+t+" page)'>Last</a> "))}
--- a/skins/Coda/macro-comments.ftl
+++ b/skins/Coda/macro-comments.ftl
@@ -51,7 +51,7 @@
                    </span>&nbsp;|&nbsp;
                    <a class="replyto" rel="nofollow" href="javascript:page.toggleEditor('${comment.oId}', '${comment.commentName}');" title="${replyLabel}">${replyLabel}</a>
                </div>
-                <div class="comment-content">
+                <div class="comment-content content-reset">
                    <p>
                        <#if comment.isReply>
                        <a class="atreply" rel="nofollow" href="#${comment.commentOriginalCommentId}"
--- a/skins/Coda/page.ftl
+++ b/skins/Coda/page.ftl
@@ -27,7 +27,7 @@
        <meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
        <meta name="description" content="${metaDescription}" />
        </@head>
-        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/style${miniPostfix}.css?${staticResourceVersion}" media="all" />
+        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" media="all" />
    </head>
    <body id="blog">
 		${topBarReplacement}
@@ -73,7 +73,7 @@
 										${page.pageTitle}
 									</a>
 								</h2>
-								<div class="post_content">
+								<div class="post_content content-reset">
 										${page.pageContent}
 								</div>
 								<div class="opaque_5 post_tags"></div>
--- a/skins/Coda/tag-articles.ftl
+++ b/skins/Coda/tag-articles.ftl
@@ -27,7 +27,7 @@
        <meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
        </@head>
-        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/style${miniPostfix}.css?${staticResourceVersion}" media="all" />
+        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" media="all" />
    </head>
    <body id="blog">
 		<div id="wrap">
--- a/skins/Coda/tags.ftl
+++ b/skins/Coda/tags.ftl
@@ -25,7 +25,7 @@
        <meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
        <meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
        </@head>
-        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/style${miniPostfix}.css?${staticResourceVersion}" media="all" />
+        <link rel="stylesheet" type="text/css" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" media="all" />
    </head>
    <body id="blog">
 		${topBarReplacement}