💄 https://github.com/b3log/solo/issues/12816

2019-07-17 19:24:09 +08:00 · 2019-07-17 19:24:09 +08:00 · 1c3224f3de
parent 90a0d0c577
commit 1c3224f3de
35 changed files with 83 additions and 61 deletions
--- a/9IPHP/article.ftl
+++ b/9IPHP/article.ftl
@ -77,7 +77,7 @@
                    </div>
                </header>

-                <div class="vditor-reset">
+                <div class="vditor-reset post__content">
                ${article.articleContent}
                            <#if "" != article.articleSign.signHTML?trim>
                                <div>
--- a/9IPHP/css/base.css
+++ b/9IPHP/css/base.css
--- a/9IPHP/css/base.scss
+++ b/9IPHP/css/base.scss
@ -531,6 +531,10 @@ aside {
  margin-bottom: 20px;
  padding: 20px;
  box-sizing: border-box;
+
+  &__content {
+    padding-bottom: 10px;
+  }
 }

 .post h1 {
--- a/Andrea/article.ftl
+++ b/Andrea/article.ftl
@ -76,7 +76,7 @@
                                </div>
                            </div>
                            <div class="clear"></div>
-                            <div class="vditor-reset">
+                            <div class="vditor-reset vditor-reset--article">
                                ${article.articleContent}
                                <#if "" != article.articleSign.signHTML?trim>
                                <div class="marginTop12">
--- a/Andrea/css/base.css
+++ b/Andrea/css/base.css
--- a/Andrea/css/base.scss
+++ b/Andrea/css/base.scss
@ -542,20 +542,9 @@ img {
 }

 /* article */
-//.vditor-reset {
-//    border-top: 2px dashed #F1EEE9;
-//    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;
-//}
+.vditor-reset--article {
+   padding-bottom: 20px;
+}

 .article-relative {
  margin: 15px 0;
--- a/Bruce/article.ftl
+++ b/Bruce/article.ftl
@ -63,7 +63,7 @@
                            </div>

                            <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}
                                    <#if "" != article.articleSign.signHTML?trim>
                                    <p>
--- a/Bruce/css/base.css
+++ b/Bruce/css/base.css
--- a/Bruce/css/base.scss
+++ b/Bruce/css/base.scss
@ -29,6 +29,10 @@
@import "../../../scss/function";
@import "vditor/src/assets/scss/classic";

+.vditor-reset--article {
+    padding-bottom: 10px;
+}
+
 .article__toc {
    position: fixed;
    top: 90px;
@ -78,7 +82,7 @@ h4, h5, h6 {
 } 

 .article {
-    margin-bottom: 90px;
+    margin-bottom: 80px;
 }

 .article-title {
--- a/Community/article.ftl
+++ b/Community/article.ftl
@ -96,7 +96,7 @@
                        </sup>
                        </#if>
                    </h2>
-                    <div class="vditor-reset">
+                    <div class="vditor-reset vditor-reset--article">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div class="marginTop12">
--- a/Community/css/base.css
+++ b/Community/css/base.css
--- a/Community/css/base.scss
+++ b/Community/css/base.scss
@ -271,6 +271,9 @@ a.header-title {

 .vditor-reset {
  line-height: 145%;
+  &--article {
+    padding-bottom: 20px;
+  }
 }

 .vditor-reset a {
@ -356,7 +359,11 @@ a.header-title {
  margin-right: 0px;
 }

-.article-detail-body .tags, #replyForm {
+.article-detail-body .tags {
+  margin-bottom: 20px;
+}
+
+#replyForm {
  margin: 20px 0;
 }

--- a/Finding/article.ftl
+++ b/Finding/article.ftl
@ -68,7 +68,7 @@
                            <time>${article.articleCreateDate?string("yyyy-MM-dd")}</time>
                        </section>
                    </header>
-                    <section class="post-content vditor-reset">
+                    <section class="post-content post-content--article vditor-reset">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div class="marginTop12">
--- a/Finding/css/base.css
+++ b/Finding/css/base.css
--- a/Finding/css/base.scss
+++ b/Finding/css/base.scss
@ -214,21 +214,6 @@ code, tt {
  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 {
  font-size: inherit;
  white-space: pre-wrap;
@ -779,6 +764,10 @@ article.post {
  }
 }

+.post-content--article {
+  padding-bottom: 10px;
+}
+
 article.post:after {
  display: block;
  content: "";
--- a/Medium/css/base.css
+++ b/Medium/css/base.css
--- a/Medium/css/base.scss
+++ b/Medium/css/base.scss
@ -459,7 +459,11 @@
 .post {
  max-width: 740px;
  margin: 50px auto 20px;
-  position: relative
+  position: relative;
+
+  .vditor-reset {
+    padding-bottom: 16px;
+  }
 }

 .post__main {
--- a/NeoEase/article.ftl
+++ b/NeoEase/article.ftl
@ -77,7 +77,7 @@
                            </a>
                        </div>
                        <div class="clear"></div>
-                        <div class="vditor-reset">
+                        <div class="vditor-reset vditor-reset--article">
                            ${article.articleContent}
                            <#if "" != article.articleSign.signHTML?trim>
                            <div>
@ -85,7 +85,7 @@
                            </div>
                            </#if>
                        </div>
-                        <div class="article-element">
+                        <div class="article-element article-element--article">
                            <span class="tag-ico" title="${tagsLabel}">
                                <#list article.articleTags?split(",") as articleTag>
                                <a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
--- a/NeoEase/css/base.css
+++ b/NeoEase/css/base.css
--- a/NeoEase/css/base.scss
+++ b/NeoEase/css/base.scss
@ -491,6 +491,13 @@ textarea, input {
  font-size: 11px;
  line-height: 16px;
  margin: 12px 0;
+  &--article {
+    margin-top: 0;
+  }
+}
+
+.vditor-reset--article {
+  padding-bottom: 12px;
 }

 .article-element a {
--- a/Pinghsu/css/base.css
+++ b/Pinghsu/css/base.css
--- a/Pinghsu/css/base.scss
+++ b/Pinghsu/css/base.scss
@ -394,6 +394,10 @@ a:active, a:focus, a:hover {
 }

 .post {
+  .vditor-reset {
+    padding-bottom: 15px;
+  }
+
  &__fix {
    position: fixed;
    box-sizing: border-box;
--- a/i-nove/article.ftl
+++ b/i-nove/article.ftl
@ -77,7 +77,7 @@
                                    </div>
                                    <div class="clear"></div>
                                </div>
-                                <div class="vditor-reset">
+                                <div class="vditor-reset vditor-reset--article">
                                    ${article.articleContent}
                                    <#if "" != article.articleSign.signHTML?trim>
                                    <div class="marginTop12">
@ -85,7 +85,7 @@
                                    </div>
                                    </#if>
                                </div>
-                                <div class="margin5 paddingTop12">
+                                <div class="margin5">
                                    <a rel="nofollow" class="left" href="${servePath}${article.articlePermalink}">
                                        <span title="${viewLabel}" class="left article-browserIcon"></span>
                                        ${article.articleViewCount}
--- a/i-nove/css/base.css
+++ b/i-nove/css/base.css
--- a/i-nove/css/base.scss
+++ b/i-nove/css/base.scss
@ -326,6 +326,10 @@ h5 {
 .vditor-reset {
  line-height: 145%;
  padding: 5px 0 0 5px;
+
+  &--article {
+    padding-bottom: 7px;
+  }
 }

 .article-footer {
--- a/next/article.ftl
+++ b/next/article.ftl
@ -71,7 +71,7 @@
                        </div>
                    </header>

-                    <div class="post-body vditor-reset">
+                    <div class="post-body post-body--article vditor-reset">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div>
--- a/next/css/base.css
+++ b/next/css/base.css
--- a/next/css/base.scss
+++ b/next/css/base.scss
@ -688,6 +688,10 @@ img {

 .post-body {
  word-wrap: break-word;
+
+  &--article {
+    padding-bottom: 40px;
+  }
 }

 .post-body img {
@ -695,10 +699,6 @@ img {
  margin: auto;
 }

-.posts-expand .post-tags {
-  margin-top: 40px;
-}
-
 .posts-expand .post-tags a {
  padding: 1px 5px;
  background: #f5f5f5;
--- a/nijigen/css/base.css
+++ b/nijigen/css/base.css
--- a/nijigen/css/base.scss
+++ b/nijigen/css/base.scss
@ -417,6 +417,11 @@ a {
  }
 }

+#articlePage .vditor-reset {
+  padding-bottom: 15px;
+  margin-bottom: -15px;
+}
+
 // pagination
 .pagination {
  &__item {
--- a/owmx-3.0/article.ftl
+++ b/owmx-3.0/article.ftl
@ -79,7 +79,7 @@
                            </#list>
                        </p>
                    </section>
-                    <div class="vditor-reset">
+                    <div class="vditor-reset vditor-reset--article">
                        ${article.articleContent}
                        <#if "" != article.articleSign.signHTML?trim>
                        <div class="marginTop12">
--- a/owmx-3.0/css/base.css
+++ b/owmx-3.0/css/base.css
--- a/owmx-3.0/css/base.scss
+++ b/owmx-3.0/css/base.scss
@ -34,6 +34,10 @@ Update: 	Dongxu Wang 2011-02-24
@import "../../../scss/toc";
@import "vditor/src/assets/scss/classic";

+.vditor-reset--article {
+  padding-bottom: 10px;
+}
+
 .left {
  float: left;
 }
--- a/tree-house/css/base.css
+++ b/tree-house/css/base.css
--- a/tree-house/css/base.scss
+++ b/tree-house/css/base.scss
@ -297,7 +297,8 @@ img {
 }

 .vditor-reset {
-  margin: 0 12px 12px;
+  margin: 0 12px;
+  padding-bottom: 12px;
 }

 .vditor-reset a, .article-abstract a {