This commit is contained in:
Van 2019-03-22 12:04:02 +08:00
parent 50417e9a54
commit 5245aafcca
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
6 changed files with 53 additions and 31 deletions

View File

@ -115,6 +115,9 @@
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles" class="article__near"></div>
</#if>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<#include "../../common-template/toc.ftl"/>
</#if>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
<#include "footer.ftl">

File diff suppressed because one or more lines are too long

View File

@ -19,17 +19,54 @@
* skin style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.2.0.1, Mar 16, 2019
* @version 0.3.0.0, Mar 22, 2019
*/
@import "../../../scss/reset";
@import "../../../scss/function";
@import "../../../scss/nprogress";
@import "../../../scss/usite";
@import "../../../scss/toc";
@import "icon";
@import "vditor/src/assets/scss/classic";
$red: #991a1a !default;
$gray: #999 !default;
.user__sites {
padding-top: 30px;
border-top: 1px dashed #d9d9d9;
}
.user__site {
display: inline-block;
color: $gray !important;
margin: 0 5px 20px 0;
&:hover {
color: $red !important;
}
}
.article__toc {
position: fixed;
right: -200px;
background-color: #2a2a2a;
top: 0;
margin: 0 !important;
height: 100vh;
overflow: auto;
width: 200px;
padding: 10px !important;
box-sizing: border-box;
transition: all 1s ease;
opacity: 0;
color: #fff;
font-size: 14px !important;
a {
color: #fff;
}
}
// reset
body {
&::-webkit-scrollbar {
@ -73,31 +110,6 @@ a {
}
}
.b3-solo-list {
position: fixed;
right: -200px;
background-color: #2a2a2a;
top: 0;
margin: 0 !important;
height: 100vh;
overflow: auto;
width: 200px;
padding: 10px !important;
box-sizing: border-box;
transition: all 1s ease;
opacity: 0;
color: #fff;
font-size: 14px !important;
a {
color: #fff;
}
&::-webkit-scrollbar {
display: none;
}
}
// header
.header {
padding: 10px 0;
@ -159,6 +171,9 @@ a {
margin: 50px 0;
border-bottom: 1px dashed #d9d9d9;
text-align: justify;
&:last-child {
border-bottom: 0;
}
}
&__title {

View File

@ -18,6 +18,10 @@
-->
<footer class="footer wrapper fn__clear">
<#include "../../common-template/macro-user_site.ftl"/>
<div class="ft__center user__sites">
<@userSite dir="n"/>
</div>
&copy; ${year}
${footerContent}
<a href="${servePath}">${blogTitle}</a> <span class="fn__none--m">&nbsp; • &nbsp;</span>

View File

@ -19,7 +19,7 @@
* @fileoverview util and every page should be used.
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.2.0.0, Jan 30, 2019
* @version 0.2.0.1, Mar 22, 2019
*/
/**
@ -28,8 +28,8 @@
*/
var Skin = {
initToc: function () {
if ($('.b3-solo-list li').length > 0 && $(window).width() > 768) {
$('.b3-solo-list').css({
if ($('.article__toc li').length > 0 && $(window).width() > 768) {
$('.article__toc').css({
right: '50px',
'border-right': '1px solid #fff',
opacity: 1,

View File

@ -1 +1 @@
var Skin={initToc:function(){0<$(".b3-solo-list li").length&&768<$(window).width()?($(".b3-solo-list").css({right:"50px","border-right":"1px solid #fff",opacity:1}),$("#pjax.wrapper").css({"max-width":"968px","padding-right":"270px"})):$("#pjax.wrapper").removeAttr("style")},init:function(){Skin.initToc(),Util.initPjax(function(){$(".header a").each(function(){this.href===location.href?this.className="current vditor-tooltipped vditor-tooltipped__w":this.className="vditor-tooltipped vditor-tooltipped__w"}),Skin.initToc()}),$(".header a").each(function(){this.href===location.href&&(this.className="current vditor-tooltipped vditor-tooltipped__w")}).click(function(){$(".header a").removeClass("current"),this.className="current vditor-tooltipped vditor-tooltipped__w"})}};Skin.init();
var Skin={initToc:function(){0<$(".article__toc li").length&&768<$(window).width()?($(".article__toc").css({right:"50px","border-right":"1px solid #fff",opacity:1}),$("#pjax.wrapper").css({"max-width":"968px","padding-right":"270px"})):$("#pjax.wrapper").removeAttr("style")},init:function(){Skin.initToc(),Util.initPjax(function(){$(".header a").each(function(){this.href===location.href?this.className="current vditor-tooltipped vditor-tooltipped__w":this.className="vditor-tooltipped vditor-tooltipped__w"}),Skin.initToc()}),$(".header a").each(function(){this.href===location.href&&(this.className="current vditor-tooltipped vditor-tooltipped__w")}).click(function(){$(".header a").removeClass("current"),this.className="current vditor-tooltipped vditor-tooltipped__w"})}};Skin.init();