This commit is contained in:
Van
2019-03-16 19:01:27 +08:00
parent 755eb33471
commit cec3c77491
100 changed files with 110 additions and 1085 deletions

View File

@@ -61,7 +61,7 @@
</sup>
</#if>
</h2>
<div class="content-reset">
<div class="vditor-reset">
${article.articleAbstract}
</div>
<div class="read-more">
@@ -141,7 +141,7 @@
</sup>
</#if>
</h2>
<div class="content-reset">
<div class="vditor-reset">
${article.articleAbstract}
</div>
<div class="read-more">

View File

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

File diff suppressed because one or more lines are too long

View File

@@ -16,9 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@charset "utf-8";
@import "../../../scss/reset-content";
@import "../../../scss/reset";
@import "vditor/src/assets/scss/classic";
.clear:before,
.clear:after {
display: table;
@@ -271,11 +270,11 @@ a.header-title {
display: inline-block;
}
.content-reset a {
.vditor-reset a {
color: #075181;
}
.content-reset a:hover {
.vditor-reset a:hover {
color: #68ADD5;
}

View File

@@ -60,28 +60,14 @@
};
var Label = {
"markedAvailable": ${markedAvailable?c},
"hljsStyle": "atom-one-light",
"langLabel": "${langLabel}",
"clearAllCacheLabel": "${clearAllCacheLabel}",
"clearCacheLabel": "${clearCacheLabel}",
"adminLabel": "${adminLabel}",
"logoutLabel": "${logoutLabel}",
"skinDirName": "${skinDirName}",
"loginLabel": "${loginLabel}",
"loginLabel": "${loginLabel}",
"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}"
"logoutLabel": "${logoutLabel}",
},
maxLength = parseInt("${mostCommentArticles?size}");

View File

@@ -1,18 +1 @@
/*
* 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 getIcon(r){return"http://secure.gravatar.com/avatar/"+hex_md5(trim(r.toLowerCase()))+"?s=160&r=G"}function trim(r){return r.replace(/(^\s*)|(\s*$)/g,"")}

File diff suppressed because one or more lines are too long

View File

@@ -38,7 +38,7 @@
</#if>
${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")}
</div>
<div class="comment-content content-reset">
<div class="comment-content vditor-reset">
${comment.commentContent}
</div>
<div class="clear"></div>

View File

@@ -34,7 +34,7 @@
<#include "header.ftl">
</div>
<div class="content">
<div class="content-reset marginBottom40">
<div class="vditor-reset marginBottom40">
${page.pageContent}
</div>
<@comments commentList=pageComments article=page></@comments>