yexuejc
/
solo-skins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

🎇 fix https://github.com/b3log/solo-skins/issues/30

This commit is contained in:
Van 2019-09-23 22:47:49 +08:00
parent 999f05c024
commit b661ebc480
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
3 changed files with 113 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
9IPHP/article.ftl
View File

@ -35,7 +35,7 @@
</@head>
</head>
<body>
<#include "header.ftl">
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main>
@ -43,16 +43,17 @@
<header>
<h2>
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>${updateDateLabel}<#else>${createDateLabel}</#if>">
<span class="vditor-tooltipped vditor-tooltipped__n"
aria-label="<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>${updateDateLabel}<#else>${createDateLabel}</#if>">
<i class="icon-date"></i>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}
@ -73,71 +74,72 @@
</header>
<div class="vditor-reset post__content">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
</div>
<footer class="tags">
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
<#-- div class="copyright">
${articleCP1Label}
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a> -
<a href="${servePath}">
${blogTitle}
</a>
</div -->
<#-- div class="copyright">
${articleCP1Label}
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a> -
<a href="${servePath}">
${blogTitle}
</a>
</div -->
<div class="rel fn-clear">
<#if previousArticlePermalink??>
<a href="${servePath}${previousArticlePermalink}" rel="prev"
class="fn-left vditor-tooltipped vditor-tooltipped__n"
aria-label="${previousArticleTitle}">
${previousArticleLabel}
</a>
</#if>
<#if nextArticlePermalink??>
<a href="${servePath}${nextArticlePermalink}" rel="next"
class="fn-right vditor-tooltipped vditor-tooltipped__n"
aria-label="${nextArticleTitle}">
${nextArticleLabel}
</a>
</#if>
<div class="rel fn-clear ft__center">
<#if previousArticlePermalink??>
<a href="${servePath}${previousArticlePermalink}" rel="prev"
class="fn-left vditor-tooltipped vditor-tooltipped__n"
aria-label="${previousArticleTitle}">
${previousArticleLabel}
</a>
</#if>
<#include "../../common-template/share.ftl">
<#if nextArticlePermalink??>
<a href="${servePath}${nextArticlePermalink}" rel="next"
class="fn-right vditor-tooltipped vditor-tooltipped__n"
aria-label="${nextArticleTitle}">
${nextArticleLabel}
</a>
</#if>
</div>
</footer>
<@comments commentList=articleComments article=article></@comments>
<@comments commentList=articleComments article=article></@comments>
<br>
<div id="externalRelevantArticles" class="list"></div>
<div id="relevantArticles" class="list"></div>
<div id="randomArticles" class="list"></div>
</article>
</main>
<#include "side.ftl">
<#include "side.ftl">
</div>
</div>
<#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != randomArticlesDisplayCount>
<#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != randomArticlesDisplayCount>
page.loadRandomArticles();
</#if>
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>"
, "<header class='title'><h2>${externalRelevantArticlesLabel}</h2></header>");
</#if>
<#if 0 != relevantArticlesDisplayCount>
</#if>
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>", "<header class='title'><h2>${externalRelevantArticlesLabel}</h2></header>");
</#if>
<#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticlesLabel}</h4>');
</#if>
Skin.initToc()
</@comment_script>
</#if>
Skin.initToc()
page.share()
</@comment_script>
</body>
</html>

2
9IPHP/css/base.css
View File

File diff suppressed because one or more lines are too long

55
9IPHP/css/base.scss
View File

@ -19,7 +19,7 @@
* skin style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.3.0.0, Aug 2, 2019
* @version 1.4.0.0, Sep 23, 2019
*/
/* start common */
@import "../../../scss/reset";
@ -556,15 +556,18 @@ aside {
}
.post sup,
.post sup {
.post sup {
color: #aaa;
font-weight: 300;
a {
color: #aaa;
cursor: text;
&:hover {
color: #aaa;
}
&:visited {
color: #fff;
}
@ -650,6 +653,50 @@ aside {
}
}
.article__share {
margin: 20px 0;
display: inline-block;
position: relative;
.item {
float: left;
text-align: center;
padding: 5px 10px;
box-sizing: border-box;
color: #fdc200;
cursor: pointer;
transition: all .3s ease;
opacity: .86;
svg {
height: 20px;
width: 20px;
}
&[data-type="wechat"] {
color: #3caf36;
}
&[data-type="twitter"] {
color: #18a3fa;
}
&[data-type="weibo"] {
color: #f93;
}
&:hover {
opacity: 1;
}
&__qr {
position: absolute;
top: 33px;
left: 60px;
}
}
}
/* end article list */
/* start comments */
@ -792,6 +839,10 @@ aside {
.responsive .list li.current {
background-color: #eee;
}
.post {
padding: 10px;
}
}
/* end responsive */