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

@@ -55,7 +55,7 @@
</div>
</div>
<div class="clear"></div>
<div class="article-abstract content-reset">
<div class="article-abstract vditor-reset">
${article.articleAbstract}
<div class="clear"></div>
<a class="right underline" href="${servePath}${article.articlePermalink}">

View File

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

View File

@@ -36,7 +36,7 @@
onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
</#if>
&nbsp;${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
<div class="comment-content content-reset">
<div class="comment-content vditor-reset">
${comment.commentContent}
</div>
<#if article.commentable>

File diff suppressed because one or more lines are too long

View File

@@ -19,9 +19,8 @@
* skin andrea style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.1.0.0, Mar 1, 2019
* @version 2.1.0.1, Mar 16, 2019
*/
@import "../../../scss/reset-content";
@import "vditor/src/assets/scss/classic";
.left {
float: left;
@@ -520,7 +519,7 @@ img {
}
/* article */
.content-reset {
.vditor-reset {
border-top: 2px dashed #F1EEE9;
margin-top: 15px;
overflow: hidden;
@@ -528,7 +527,7 @@ img {
line-height: 145%;
}
.content-reset p:first-child:first-letter, .content-reset:first-letter{
.vditor-reset p:first-child:first-letter, .vditor-reset:first-letter{
font-size: 48px;
float: left;
font-weight: bold;

View File

@@ -32,6 +32,8 @@
var Label = {
"markedAvailable": ${markedAvailable?c},
"hljsStyle": "atom-one-light",
"langLabel": "${langLabel}",
"adminLabel": "${adminLabel}",
"logoutLabel": "${logoutLabel}",
"skinDirName": "${skinDirName}"
@@ -46,6 +48,7 @@
// init
$(document).ready(function () {
Util.init();
Util.setTopBar()
Util.replaceSideEm($("#naviComments li .side-comment"));
// brush

View File

@@ -37,7 +37,7 @@
<div class="main">
<div class="main-content">
<div class="article">
<div class="content-reset" style="margin-top: 0px;">
<div class="vditor-reset" style="margin-top: 0px;">
${page.pageContent}
</div>
</div>