This commit is contained in:
@@ -58,7 +58,7 @@
|
||||
${article.articleTitle}
|
||||
</a>
|
||||
</h2>
|
||||
<div class="content-reset">
|
||||
<div class="vditor-reset">
|
||||
${article.articleAbstractText}
|
||||
</div>
|
||||
<div data-ico=";" title="${tagLabel}" class="article-tags">
|
||||
|
@@ -98,7 +98,7 @@
|
||||
</div>
|
||||
<div class="fn-clear">
|
||||
<div class="main">
|
||||
<div class="content-reset">
|
||||
<div class="vditor-reset">
|
||||
${article.articleContent}
|
||||
<#if "" != article.articleSign.signHTML?trim>
|
||||
${article.articleSign.signHTML}
|
||||
|
@@ -43,6 +43,6 @@
|
||||
${comment.commentDate2?string("yy-MM-dd HH:mm")}
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-reset">${comment.commentContent}</div>
|
||||
<div class="vditor-reset">${comment.commentContent}</div>
|
||||
</div>
|
||||
</div>
|
File diff suppressed because one or more lines are too long
@@ -20,9 +20,8 @@
|
||||
* skin metro-hot style
|
||||
*
|
||||
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
|
||||
* @version 2.1.0.0, Feb 27, 2019
|
||||
* @version 2.1.0.1, Mar 16, 2019
|
||||
*/
|
||||
@import "../../../scss/reset-content";
|
||||
@import "vditor/src/assets/scss/classic";
|
||||
/* start base */
|
||||
@font-face {
|
||||
@@ -185,11 +184,11 @@ textarea {
|
||||
.article-relative a:hover,
|
||||
.article-abstract .article-title a:hover,
|
||||
.article-abstract .article-tags a:hover,
|
||||
.content-reset a {
|
||||
.vditor-reset a {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.content-reset a:hover {
|
||||
.vditor-reset a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
@@ -439,7 +438,7 @@ textarea {
|
||||
margin: 10px 0 0 10px;
|
||||
}
|
||||
|
||||
.article-abstract > .content-reset {
|
||||
.article-abstract > .vditor-reset {
|
||||
margin: 10px;
|
||||
overflow: hidden;
|
||||
white-space: inherit;
|
||||
@@ -726,7 +725,7 @@ textarea {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.content-reset {
|
||||
.vditor-reset {
|
||||
background-color: #323232;
|
||||
margin-bottom: 30px;
|
||||
overflow: hidden;
|
||||
@@ -737,7 +736,7 @@ textarea {
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.main > .content-reset {
|
||||
.main > .vditor-reset {
|
||||
margin-right: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
@@ -762,7 +761,7 @@ pre.prettyprint {
|
||||
width: 80px;
|
||||
}
|
||||
|
||||
#comments .content-reset {
|
||||
#comments .vditor-reset {
|
||||
margin: 10px 0;
|
||||
width: 800px;
|
||||
}
|
||||
@@ -849,7 +848,7 @@ pre.prettyprint {
|
||||
padding: 25px 15px 15px 25px;
|
||||
}
|
||||
|
||||
#dynamic #comments .content-reset {
|
||||
#dynamic #comments .vditor-reset {
|
||||
width: 743px;
|
||||
}
|
||||
|
||||
|
@@ -42,11 +42,11 @@
|
||||
width: 434px;
|
||||
}
|
||||
|
||||
#comments .content-reset {
|
||||
#comments .vditor-reset {
|
||||
width: 340px;
|
||||
}
|
||||
|
||||
#dynamic #comments .content-reset {
|
||||
#dynamic #comments .vditor-reset {
|
||||
width: 283px;
|
||||
}
|
||||
|
||||
@@ -119,14 +119,14 @@
|
||||
}
|
||||
|
||||
.main .pagination,
|
||||
.main > .content-reset,
|
||||
.main > .vditor-reset,
|
||||
.comment-disabled,
|
||||
#comments > div {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.side > div,
|
||||
#comments .content-reset {
|
||||
#comments .vditor-reset {
|
||||
position: static !important;
|
||||
width: auto !important;
|
||||
}
|
||||
|
@@ -60,7 +60,7 @@
|
||||
${comment.commentDate?string("yy-MM-dd HH:mm")}
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-reset">${comment.commentContent}</div>
|
||||
<div class="vditor-reset">${comment.commentContent}</div>
|
||||
</div>
|
||||
</div>
|
||||
</#if>
|
||||
@@ -206,7 +206,7 @@
|
||||
<span id="goTop" onclick="Util.goTop()" data-ico="" class="side-tile"></span>
|
||||
<#include "footer.ftl"/>
|
||||
<script>
|
||||
$("#comments .content-reset").each(function () {
|
||||
$("#comments .vditor-reset").each(function () {
|
||||
this.innerHTML = Util.replaceEmString($(this).html());
|
||||
});
|
||||
|
||||
|
@@ -26,6 +26,8 @@
|
||||
|
||||
var Label = {
|
||||
"markedAvailable": ${markedAvailable?c},
|
||||
"hljsStyle": "atom-one-light",
|
||||
"langLabel": "${langLabel}",
|
||||
"tag1Label": "${tag1Label}",
|
||||
"viewLabel": "${viewLabel}",
|
||||
"commentLabel": "${commentLabel}",
|
||||
@@ -42,8 +44,6 @@
|
||||
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/${skinDirName}${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
|
||||
<script>
|
||||
Util.initSW();
|
||||
Util.parseMarkdown();
|
||||
Util.previewImg()
|
||||
Util.init()
|
||||
</script>
|
||||
${plugins}
|
||||
|
@@ -47,7 +47,7 @@
|
||||
</div>
|
||||
<div class="fn-clear">
|
||||
<div class="main">
|
||||
<div class="content-reset">
|
||||
<div class="vditor-reset">
|
||||
${page.pageContent}
|
||||
</div>
|
||||
<@comments commentList=pageComments article=page></@comments>
|
||||
|
Reference in New Issue
Block a user