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

@@ -38,7 +38,7 @@
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time>
</header>
<section class="abstract content-reset">
<section class="abstract vditor-reset">
${article.articleAbstract}
</section>
<footer class="tags">

View File

@@ -53,7 +53,7 @@
<body>
<#include "side.ftl">
<main>
<article class="post content-reset">
<article class="post vditor-reset">
<header>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
@@ -84,7 +84,7 @@
</a>
</section>
</header>
<section class="abstract content-reset">
<section class="abstract vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>

View File

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

File diff suppressed because one or more lines are too long

View File

@@ -21,9 +21,8 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.2.0.0, Mar 1, 2019
* @version 2.2.0.1, Mar 16, 2019
*/
@import "../../../scss/reset-content";
@import "vditor/src/assets/scss/classic";
/* start reset */
html {
@@ -360,8 +359,8 @@ pre code, pre tt {
height: 100%;
width: 300px;
.content-reset,
.content-reset a {
.vditor-reset,
.vditor-reset a {
font-size: 12px;
font-weight: normal;
}

View File

@@ -48,7 +48,7 @@
</span>
<a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
</div>
<div class="comment-content content-reset">
<div class="comment-content vditor-reset">
${comment.commentContent}
</div>
</div>

View File

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

View File

@@ -32,7 +32,7 @@
<#include "side.ftl">
<main>
<article class="post">
<section class="abstract content-reset">
<section class="abstract vditor-reset">
${page.pageContent}
</section>
<footer class="fn-clear share">

View File

@@ -62,7 +62,7 @@
</header>
<footer>
<#if noticeBoard??>
<div class="content-reset">${noticeBoard}</div>
<div class="vditor-reset">${noticeBoard}</div>
</#if>
<#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>