This commit is contained in:
parent
3ca8f083f2
commit
60a8e6df33
@ -47,6 +47,12 @@
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
<#if article?? && article.articleToC?? && article.articleToC?size > 0>
|
||||
<div class="vditor-reset" style="margin-top: 20px">
|
||||
<#include "../../common-template/toc.ftl"/>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
<a rel="alternate" href="${servePath}/rss.xml" class="atom side-tile">
|
||||
<span data-ico=""></span>
|
||||
<div class="title">
|
||||
|
@ -39,6 +39,8 @@
|
||||
<#include "header.ftl">
|
||||
<div class="wrapper">
|
||||
<div class="container">
|
||||
<div class="fn-clear">
|
||||
<div<#if article?? && article.articleToC?? && article.articleToC?size > 0> class="dynamic-l"</#if>>
|
||||
<div class="module">
|
||||
<article class="article">
|
||||
<time class="article-time">
|
||||
@ -74,7 +76,11 @@
|
||||
</p>
|
||||
</#if>
|
||||
<span class="ico-tags ico" title="${tagLabel}">
|
||||
<#list article.articleTags?split(",") as articleTag><a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if></#list>
|
||||
<#list article.articleTags?split(",") as articleTag>
|
||||
<a rel="tag"
|
||||
href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a>
|
||||
<#if articleTag_has_next>,</#if>
|
||||
</#list>
|
||||
</span>
|
||||
<span class="ico-author ico" title="${authorLabel}">
|
||||
<a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a>
|
||||
@ -125,6 +131,16 @@
|
||||
<@comments commentList=articleComments article=article></@comments>
|
||||
</div>
|
||||
</div>
|
||||
<#if article?? && article.articleToC?? && article.articleToC?size > 0>
|
||||
<div class="dynamic-r">
|
||||
<div class="module">
|
||||
<h3 class="title">${tocLabel}</h3>
|
||||
<#include "../../common-template/toc.ftl"/>
|
||||
</div>
|
||||
</div>
|
||||
</#if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<#include "footer.ftl">
|
||||
<@comment_script oId=article.oId commentable=article.commentable>
|
||||
|
File diff suppressed because one or more lines are too long
@ -19,10 +19,31 @@
|
||||
* timeline skin style.
|
||||
*
|
||||
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
|
||||
* @version 2.0.0.1, Mar 16, 2019
|
||||
* @version 2.1.0.0, Mar 22, 2019
|
||||
*/
|
||||
|
||||
@import "../../../scss/usite";
|
||||
@import "../../../scss/toc";
|
||||
@import "vditor/src/assets/scss/classic";
|
||||
|
||||
.article__toc {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.user__site {
|
||||
display: inline-block;
|
||||
height: 14px;
|
||||
margin: 0 5px 0 0;
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
color: #363A3D;
|
||||
}
|
||||
svg {
|
||||
height: 14px;
|
||||
width: 14px;
|
||||
fill: currentColor;
|
||||
}
|
||||
}
|
||||
|
||||
/* start reset */
|
||||
html, body {
|
||||
-webkit-text-size-adjust: 100%;
|
||||
@ -76,6 +97,7 @@ img {
|
||||
background-color: #D5D5D5;
|
||||
color: #FCFCFC;
|
||||
}
|
||||
|
||||
/* end reset */
|
||||
|
||||
/* start function */
|
||||
@ -111,6 +133,7 @@ img {
|
||||
.fn-clear:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
/* end function */
|
||||
.tags {
|
||||
margin: 0;
|
||||
@ -131,7 +154,6 @@ img {
|
||||
}
|
||||
|
||||
.tags a:hover {
|
||||
text-shadow: 0 0 2px;
|
||||
text-decoration: none;
|
||||
box-shadow: 0 0 4px #D5D5D5;
|
||||
}
|
||||
@ -190,10 +212,12 @@ img {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.module > ul.list > li {
|
||||
.module > ul.list > li,
|
||||
.article__toc li {
|
||||
border-top: 1px solid #EEEEEE;
|
||||
padding: 6px 0;
|
||||
}
|
||||
|
||||
/* end common */
|
||||
|
||||
/* start icon */
|
||||
@ -268,7 +292,7 @@ img {
|
||||
background-color: #363A3D;
|
||||
background-position: 4px -100px;
|
||||
border-radius: 20em 20em 20em 20em;
|
||||
bottom: 60px;
|
||||
bottom: 65px;
|
||||
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
|
||||
height: 25px;
|
||||
position: fixed;
|
||||
@ -302,6 +326,7 @@ a:hover > .ico-next,
|
||||
a:hover > .ico-pre {
|
||||
background-color: #000;
|
||||
}
|
||||
|
||||
/* end icon */
|
||||
|
||||
/* start framework */
|
||||
@ -341,6 +366,7 @@ a:hover > .ico-pre {
|
||||
.footer a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* end framework */
|
||||
|
||||
/* start header */
|
||||
@ -393,6 +419,7 @@ a:hover > .ico-pre {
|
||||
width: 14px;
|
||||
margin: -1px 5px 0 0;
|
||||
}
|
||||
|
||||
/* end header */
|
||||
|
||||
/* start article list */
|
||||
@ -547,6 +574,7 @@ article .article-title a {
|
||||
font-weight: normal;
|
||||
padding: 5px 20px;
|
||||
}
|
||||
|
||||
/* end article list */
|
||||
|
||||
/* start dynamic */
|
||||
@ -568,6 +596,7 @@ article .article-title a {
|
||||
.links a {
|
||||
line-height: 24px;
|
||||
}
|
||||
|
||||
/* end dynamic */
|
||||
|
||||
/* start comments */
|
||||
@ -590,7 +619,6 @@ article .article-title a {
|
||||
}
|
||||
|
||||
.comments > li > div > div.vditor-reset {
|
||||
padding-left: 75px;
|
||||
margin: 12px 0;
|
||||
}
|
||||
|
||||
@ -627,6 +655,8 @@ article .article-title a {
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
|
||||
margin: 5px 5px 5px 0;
|
||||
padding: 6px;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.comment-form input[type='text']:focus,
|
||||
@ -652,6 +682,7 @@ article .article-title a {
|
||||
color: #fff;
|
||||
background-color: #444;
|
||||
}
|
||||
|
||||
/* end comments */
|
||||
|
||||
/* start others */
|
||||
@ -659,7 +690,6 @@ article .article-title a {
|
||||
background-color: #6B6B6B;
|
||||
border: 1px solid #898989;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4) inset, 0 1px 0 rgba(255, 255, 255, 0.7), 0 -1px 0 rgba(255, 255, 255, 0.6);
|
||||
color: #CCCCCC;
|
||||
padding: 5px 10px;
|
||||
position: absolute;
|
||||
@ -668,6 +698,7 @@ article .article-title a {
|
||||
z-index: 1;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.index-nav-abs {
|
||||
@ -707,6 +738,7 @@ article .article-title a {
|
||||
background-color: #353535;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
/* end others */
|
||||
|
||||
/* start responsive */
|
||||
@ -895,7 +927,6 @@ article .article-title a {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@media (max-width: 360px) {
|
||||
.ico {
|
||||
display: block;
|
||||
@ -926,4 +957,5 @@ article .article-title a {
|
||||
bottom: 114px;
|
||||
}
|
||||
}
|
||||
|
||||
/* end responsive */
|
||||
|
@ -19,6 +19,10 @@
|
||||
-->
|
||||
<div class="footer">
|
||||
<div class="container fn-clear">
|
||||
<#include "../../common-template/macro-user_site.ftl"/>
|
||||
<div class="ft__center">
|
||||
<@userSite dir="ne"/>
|
||||
</div>
|
||||
<div class="left">
|
||||
<span>© ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent}
|
||||
Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}
|
||||
|
@ -206,12 +206,15 @@ var timeline = {
|
||||
path = "/articles/";
|
||||
if ($("#tag").length === 1) {
|
||||
var pathnames = location.pathname.split("/");
|
||||
path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/";
|
||||
path = "/articles/tags/" + pathnames[pathnames.length - 1];
|
||||
} else if ($("#author").length === 1) {
|
||||
var pathnames = location.pathname.split("/");
|
||||
path = "/articles/authors/" + pathnames[pathnames.length - 1] + "/";
|
||||
path = "/articles/authors/" + pathnames[pathnames.length - 1];
|
||||
} else if ($("#category").length === 1) {
|
||||
var pathnames = location.pathname.split("/");
|
||||
path = "/articles/category/" + pathnames[pathnames.length - 1];
|
||||
} else if (archive) {
|
||||
path = "/articles/archives/" + archive + "/";
|
||||
path = "/articles/archives/" + archive;
|
||||
}
|
||||
$.ajax({
|
||||
url: Label.servePath + path + '?p=' + currentPage,
|
||||
|
@ -26,7 +26,7 @@
|
||||
<#if article.commentable>
|
||||
<h3>${commentLabel}</h3>
|
||||
<div class="comment-form">
|
||||
<textarea style="width:96%" rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
|
||||
<textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
|
||||
</div>
|
||||
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
|
||||
<div id="externalRelevantArticles"></div>
|
||||
|
Loading…
x
Reference in New Issue
Block a user