This commit is contained in:
Van
2019-03-16 18:28:32 +08:00
parent 32d9065772
commit 7368e5b747
167 changed files with 592 additions and 560 deletions

View File

@@ -57,7 +57,7 @@
</span>
</div>
</header>
<div class="content-reset">
<div class="vditor-reset">
${article.articleAbstract}
</div>
<footer class="fn-clear tags">

View File

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

View File

@@ -40,7 +40,7 @@
<a class="reply-btn" href="javascript:page.toggleEditor('${comment.oId}', '${comment.commentName}')">${replyLabel}</a>
</#if>
</div>
<div class="content-reset">
<div class="vditor-reset">
${comment.commentContent}
</div>
</main>

File diff suppressed because one or more lines are too long

View File

@@ -19,11 +19,10 @@
* skin style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.0.0.0, Feb 21, 2019
* @version 1.0.0.1, Mar 16, 2019
*/
/* start common */
@import "../../../scss/reset";
@import "../../../scss/reset-content";
@import "../../../scss/tooltipped";
@import "vditor/src/assets/scss/classic";
a {
@@ -35,7 +34,7 @@ a:hover {
color: #ff4d3a;
text-decoration: underline;
}
.content-reset a {
.vditor-reset a {
color: #ff4d3a;
}
.fn-pointer {
@@ -633,7 +632,7 @@ aside.has-toc > section:last-child {
min-width: 1px;
}
.comments .content-reset {
.comments .vditor-reset {
margin-top: 10px;
}

View File

@@ -48,7 +48,7 @@
<time class="ft-gray">${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
<a class="reply-btn" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
</div>
<div class="content-reset">
<div class="vditor-reset">
${comment.commentContent}
</div>
</main>
@@ -57,7 +57,7 @@
</#list>
</ul>
<#else>
<div class="content-reset ft-center">
<div class="vditor-reset ft-center">
${noDynamicLabel}
</div>
</#if>
@@ -68,7 +68,7 @@
<#include "footer.ftl">
<script>
var $commentContents = $(".comments .content-reset");
var $commentContents = $(".comments .vditor-reset");
for (var i = 0; i < $commentContents.length; i++) {
var str = $commentContents[i].innerHTML;
$commentContents[i].innerHTML = Util.replaceEmString(str);

View File

@@ -42,11 +42,10 @@
var Label = {
"markedAvailable": ${markedAvailable?c},
"hljsStyle": "atom-one-light",
"langLabel": "${langLabel}",
"skinDirName": "${skinDirName}"
};
Util.initSW();
Util.parseMarkdown();
Util.killIE(10)
Util.previewImg()
Util.init()
</script>
${plugins}

View File

@@ -34,7 +34,7 @@
<div class="main-wrap">
<main>
<article class="post">
<div class="content-reset">
<div class="vditor-reset">
${page.pageContent}
</div>
<@comments commentList=pageComments article=page></@comments>

View File

@@ -20,7 +20,7 @@
<aside>
<section>
<#if noticeBoard??>
<div class="ad content-reset">
<div class="ad vditor-reset">
${noticeBoard}
</div>
</#if>