This commit is contained in:
Van 2019-07-17 19:24:09 +08:00
parent 90a0d0c577
commit 1c3224f3de
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
35 changed files with 83 additions and 61 deletions

View File

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

File diff suppressed because one or more lines are too long

View File

@ -531,6 +531,10 @@ aside {
margin-bottom: 20px; margin-bottom: 20px;
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
&__content {
padding-bottom: 10px;
}
} }
.post h1 { .post h1 {

View File

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

File diff suppressed because one or more lines are too long

View File

@ -542,20 +542,9 @@ img {
} }
/* article */ /* article */
//.vditor-reset { .vditor-reset--article {
// border-top: 2px dashed #F1EEE9; padding-bottom: 20px;
// margin-top: 15px; }
// overflow: hidden;
// padding: 20px 0 25px;
// line-height: 145%;
//}
//
//.vditor-reset p:first-child:first-letter, .vditor-reset:first-letter{
// font-size: 48px;
// float: left;
// font-weight: bold;
// margin: 0 3px 3px 0;
//}
.article-relative { .article-relative {
margin: 15px 0; margin: 15px 0;

View File

@ -63,7 +63,7 @@
</div> </div>
<div class="row article-content code-highlight"> <div class="row article-content code-highlight">
<div class="col-sm-12 vditor-reset" id="abstract${article.oId}"> <div class="col-sm-12 vditor-reset vditor-reset--article" id="abstract${article.oId}">
${article.articleContent} ${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<p> <p>

File diff suppressed because one or more lines are too long

View File

@ -29,6 +29,10 @@
@import "../../../scss/function"; @import "../../../scss/function";
@import "vditor/src/assets/scss/classic"; @import "vditor/src/assets/scss/classic";
.vditor-reset--article {
padding-bottom: 10px;
}
.article__toc { .article__toc {
position: fixed; position: fixed;
top: 90px; top: 90px;
@ -78,7 +82,7 @@ h4, h5, h6 {
} }
.article { .article {
margin-bottom: 90px; margin-bottom: 80px;
} }
.article-title { .article-title {

View File

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

File diff suppressed because one or more lines are too long

View File

@ -271,6 +271,9 @@ a.header-title {
.vditor-reset { .vditor-reset {
line-height: 145%; line-height: 145%;
&--article {
padding-bottom: 20px;
}
} }
.vditor-reset a { .vditor-reset a {
@ -356,7 +359,11 @@ a.header-title {
margin-right: 0px; margin-right: 0px;
} }
.article-detail-body .tags, #replyForm { .article-detail-body .tags {
margin-bottom: 20px;
}
#replyForm {
margin: 20px 0; margin: 20px 0;
} }

View File

@ -68,7 +68,7 @@
<time>${article.articleCreateDate?string("yyyy-MM-dd")}</time> <time>${article.articleCreateDate?string("yyyy-MM-dd")}</time>
</section> </section>
</header> </header>
<section class="post-content vditor-reset"> <section class="post-content post-content--article vditor-reset">
${article.articleContent} ${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<div class="marginTop12"> <div class="marginTop12">

File diff suppressed because one or more lines are too long

View File

@ -214,21 +214,6 @@ code, tt {
border-radius: 2px; border-radius: 2px;
} }
pre {
-moz-box-sizing: border-box;
box-sizing: border-box;
margin: 0 0 1.75em 0;
border: #E3EDF3 1px solid;
width: 100%;
padding: 10px;
font-family: Inconsolata, monospace, "Microsoft Yahei", 'Helvetica';
font-size: 0.9em;
white-space: pre;
overflow: auto;
background: #F7FAFB;
border-radius: 3px;
}
pre code, pre tt { pre code, pre tt {
font-size: inherit; font-size: inherit;
white-space: pre-wrap; white-space: pre-wrap;
@ -779,6 +764,10 @@ article.post {
} }
} }
.post-content--article {
padding-bottom: 10px;
}
article.post:after { article.post:after {
display: block; display: block;
content: ""; content: "";

File diff suppressed because one or more lines are too long

View File

@ -459,7 +459,11 @@
.post { .post {
max-width: 740px; max-width: 740px;
margin: 50px auto 20px; margin: 50px auto 20px;
position: relative position: relative;
.vditor-reset {
padding-bottom: 16px;
}
} }
.post__main { .post__main {

View File

@ -77,7 +77,7 @@
</a> </a>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div class="vditor-reset"> <div class="vditor-reset vditor-reset--article">
${article.articleContent} ${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<div> <div>
@ -85,7 +85,7 @@
</div> </div>
</#if> </#if>
</div> </div>
<div class="article-element"> <div class="article-element article-element--article">
<span class="tag-ico" title="${tagsLabel}"> <span class="tag-ico" title="${tagsLabel}">
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}"> <a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">

File diff suppressed because one or more lines are too long

View File

@ -491,6 +491,13 @@ textarea, input {
font-size: 11px; font-size: 11px;
line-height: 16px; line-height: 16px;
margin: 12px 0; margin: 12px 0;
&--article {
margin-top: 0;
}
}
.vditor-reset--article {
padding-bottom: 12px;
} }
.article-element a { .article-element a {

File diff suppressed because one or more lines are too long

View File

@ -394,6 +394,10 @@ a:active, a:focus, a:hover {
} }
.post { .post {
.vditor-reset {
padding-bottom: 15px;
}
&__fix { &__fix {
position: fixed; position: fixed;
box-sizing: border-box; box-sizing: border-box;

View File

@ -77,7 +77,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="vditor-reset"> <div class="vditor-reset vditor-reset--article">
${article.articleContent} ${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<div class="marginTop12"> <div class="marginTop12">
@ -85,7 +85,7 @@
</div> </div>
</#if> </#if>
</div> </div>
<div class="margin5 paddingTop12"> <div class="margin5">
<a rel="nofollow" class="left" href="${servePath}${article.articlePermalink}"> <a rel="nofollow" class="left" href="${servePath}${article.articlePermalink}">
<span title="${viewLabel}" class="left article-browserIcon"></span> <span title="${viewLabel}" class="left article-browserIcon"></span>
${article.articleViewCount} ${article.articleViewCount}

File diff suppressed because one or more lines are too long

View File

@ -326,6 +326,10 @@ h5 {
.vditor-reset { .vditor-reset {
line-height: 145%; line-height: 145%;
padding: 5px 0 0 5px; padding: 5px 0 0 5px;
&--article {
padding-bottom: 7px;
}
} }
.article-footer { .article-footer {

View File

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

File diff suppressed because one or more lines are too long

View File

@ -688,6 +688,10 @@ img {
.post-body { .post-body {
word-wrap: break-word; word-wrap: break-word;
&--article {
padding-bottom: 40px;
}
} }
.post-body img { .post-body img {
@ -695,10 +699,6 @@ img {
margin: auto; margin: auto;
} }
.posts-expand .post-tags {
margin-top: 40px;
}
.posts-expand .post-tags a { .posts-expand .post-tags a {
padding: 1px 5px; padding: 1px 5px;
background: #f5f5f5; background: #f5f5f5;

File diff suppressed because one or more lines are too long

View File

@ -417,6 +417,11 @@ a {
} }
} }
#articlePage .vditor-reset {
padding-bottom: 15px;
margin-bottom: -15px;
}
// pagination // pagination
.pagination { .pagination {
&__item { &__item {

View File

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

File diff suppressed because one or more lines are too long

View File

@ -34,6 +34,10 @@ Update: Dongxu Wang 2011-02-24
@import "../../../scss/toc"; @import "../../../scss/toc";
@import "vditor/src/assets/scss/classic"; @import "vditor/src/assets/scss/classic";
.vditor-reset--article {
padding-bottom: 10px;
}
.left { .left {
float: left; float: left;
} }

File diff suppressed because one or more lines are too long

View File

@ -297,7 +297,8 @@ img {
} }
.vditor-reset { .vditor-reset {
margin: 0 12px 12px; margin: 0 12px;
padding-bottom: 12px;
} }
.vditor-reset a, .article-abstract a { .vditor-reset a, .article-abstract a {