This commit is contained in:
Van 2019-03-22 19:27:08 +08:00
parent b2fe147b13
commit 04be872d8c
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
7 changed files with 43 additions and 20 deletions

View File

@ -64,7 +64,7 @@
</#list>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
<img class="avatar prevent" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</a>
</section>
</header>

View File

@ -29,7 +29,7 @@
<#include "side.ftl">
<main>
<h2 class="classify-name">
${categoryLabel}
${categoryLabel}
${category.categoryTitle}
(${category.categoryTagCnt})<small> ${category.categoryDescription}</small>
</h2>

File diff suppressed because one or more lines are too long

View File

@ -21,9 +21,26 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.2.0.1, Mar 16, 2019
* @version 2.3.0.0, Mar 22, 2019
*/
@import "../../../scss/toc";
@import "../../../scss/usite";
@import "vditor/src/assets/scss/classic";
.user__sites {
position: absolute;
left: 10px;
right: 10px;
top: 27px;
.user__site {
svg {
height: 20px;
width: 20px;
fill: currentColor;
}
}
}
/* start reset */
html {
height: 100%;
@ -329,6 +346,10 @@ pre code, pre tt {
font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
}
.form textarea {
margin-bottom: 30px;
}
.form button {
width: auto;
vertical-align: bottom;
@ -476,19 +497,17 @@ pre code, pre tt {
display: block;
}
.side .b3-solo-list {
.side .article__toc {
padding: 0;
margin-top: 50px;
}
.abstract .b3-solo-list {
display: none;
height: 100%;
margin: 0;
}
.side .toc .close {
color: #fff;
float: right;
padding: 0 10px;
position: absolute;
right: 0;
}
/* end side */

View File

@ -59,14 +59,9 @@ var Yilia = {
$(window).scroll();
},
_initToc: function () {
if ($('.b3-solo-list li').length === 0) {
if ($('.article__toc li').length === 0) {
return false;
}
$('.side footer').after('<div class="toc"><a onclick="$(\'.side .toc\').hide();" href="javascript:void(0)" class="close">X</a></div>');
$('.side .toc a').after($('.b3-solo-list'));
$('.side .toc-btn').show();
},
resetTags: function () {

View File

@ -1 +1 @@
var Yilia={init:function(){Util.killIE(),this._initToc(),this.resetTags(),$(window).scroll(function(){0<$("article").length&&0===$("article.post").length&&$("article:not(.show)").each(function(){$(this).offset().top<=$(window).scrollTop()+$(window).height()-$(this).height()/7&&$(this).addClass("show")}),$(window).scrollTop()>$(window).height()?$(".icon-goup").show():$(".icon-goup").hide(),1===$("article.post").length&&$("article.post").addClass("show")}),$(window).scroll()},_initToc:function(){if(0===$(".b3-solo-list li").length)return!1;$(".side footer").after('<div class="toc"><a onclick="$(\'.side .toc\').hide();" href="javascript:void(0)" class="close">X</a></div>'),$(".side .toc a").after($(".b3-solo-list")),$(".side .toc-btn").show()},resetTags:function(){$("a.tag").each(function(t){$(this).addClass("color"+Math.ceil(4*Math.random()))})},share:function(){var t=$(".share .fn-right"),i=t.find(".icon-wechat"),e=i.data("url"),o=i.data("avatar"),a=encodeURIComponent(i.data("title")+" - "+i.data("blogtitle")),s=encodeURIComponent(e),n={};n.weibo="http://v.t.sina.com.cn/share/share.php?title="+a+"&url="+s+"&pic="+o,n.qqz="https://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url="+s+"&sharesource=qzone&title="+a+"&pics="+o,n.twitter="https://twitter.com/intent/tweet?status="+a+" "+s,t.find("span").click(function(){var t=$(this).data("type");if(t)return"wechat"===t?(0===i.find("canvas").length?$.ajax({method:"GET",url:Label.staticServePath+"/js/lib/jquery.qrcode.min.js",dataType:"script",cache:!0,success:function(){i.qrcode({width:128,height:128,text:e})}}):i.find("canvas").slideToggle(),!1):void window.open(n[t],"_blank","top=100,left=200,width=648,height=618")})}};Yilia.init();
var Yilia={init:function(){Util.killIE(),this._initToc(),this.resetTags(),$(window).scroll(function(){0<$("article").length&&0===$("article.post").length&&$("article:not(.show)").each(function(){$(this).offset().top<=$(window).scrollTop()+$(window).height()-$(this).height()/7&&$(this).addClass("show")}),$(window).scrollTop()>$(window).height()?$(".icon-goup").show():$(".icon-goup").hide(),1===$("article.post").length&&$("article.post").addClass("show")}),$(window).scroll()},_initToc:function(){if(0===$(".article__toc li").length)return!1;$(".side footer").after('<div class="toc"><a onclick="$(\'.side .toc\').hide();" href="javascript:void(0)" class="close">X</a></div>'),$(".side .toc a").after($(".article__toc")),$(".side .toc-btn").show()},resetTags:function(){$("a.tag").each(function(t){$(this).addClass("color"+Math.ceil(4*Math.random()))})},share:function(){var t=$(".share .fn-right"),i=t.find(".icon-wechat"),e=i.data("url"),o=i.data("avatar"),a=encodeURIComponent(i.data("title")+" - "+i.data("blogtitle")),s=encodeURIComponent(e),n={};n.weibo="http://v.t.sina.com.cn/share/share.php?title="+a+"&url="+s+"&pic="+o,n.qqz="https://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url="+s+"&sharesource=qzone&title="+a+"&pics="+o,n.twitter="https://twitter.com/intent/tweet?status="+a+" "+s,t.find("span").click(function(){var t=$(this).data("type");if(t)return"wechat"===t?(0===i.find("canvas").length?$.ajax({method:"GET",url:Label.staticServePath+"/js/lib/jquery.qrcode.min.js",dataType:"script",cache:!0,success:function(){i.qrcode({width:128,height:128,text:e})}}):i.find("canvas").slideToggle(),!1):void window.open(n[t],"_blank","top=100,left=200,width=648,height=618")})}};Yilia.init();

View File

@ -21,6 +21,10 @@
<div class="overlay">
<a onclick="$('.side .toc').show()" href="javascript:void(0)" class="toc-btn">${tocLabel}</a>
</div>
<#include "../../common-template/macro-user_site.ftl"/>
<div class="user__sites">
<@userSite dir=""/>
</div>
<header class="content">
<a href="${servePath}">
<img class="avatar" src="${adminUser.userAvatar}" title="${userName}"/>
@ -44,8 +48,7 @@
</#list>
<li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li>
<li>
&nbsp; &nbsp;
<a href="${servePath}/tags.html">${allTagsLabel}</a>
&nbsp; &nbsp;
<a href="${servePath}/archives.html">${archiveLabel}</a>
@ -73,4 +76,10 @@
</#if> &nbsp; &nbsp;
<a rel="alternate" href="${servePath}/rss.xml" title="${subscribeLabel}" class="icon-rss"></a>
</footer>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="toc">
<a onclick="$('.side .toc').hide();" href="javascript:void(0)" class="close">X</a>
<#include "../../common-template/toc.ftl"/>
</div>
</#if>
</div>