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

fix https://github.com/b3log/solo/issues/12814

Browse Source
This commit is contained in:
Van 2019-07-15 12:38:17 +08:00
parent 63ea9110d3
commit c23ba44a73
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
6 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bubble/article.ftl
View File

@ -105,6 +105,11 @@
src="${staticServePath}/skins/${skinDirName}/js/TweenMax${miniPostfix}.js?${staticResourceVersion}"
charset="utf-8"></script>
<#include "footer.ftl">
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<svg viewBox="0 0 32 32" width="100%" height="100%" class="side__top side__top--toc">
<path d="M30 18h-28c-1.1 0-2-0.9-2-2s0.9-2 2-2h28c1.1 0 2 0.9 2 2s-0.9 2-2 2zM30 6.25h-28c-1.1 0-2-0.9-2-2s0.9-2 2-2h28c1.1 0 2 0.9 2 2s-0.9 2-2 2zM2 25.75h28c1.1 0 2 0.9 2 2s-0.9 2-2 2h-28c-1.1 0-2-0.9-2-2s0.9-2 2-2z"></path>
</svg>
</#if>
<#if pjax><!---- pjax {#pjax} start ----></#if>
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";

2
Bubble/css/base.css
View File

File diff suppressed because one or more lines are too long

19
Bubble/css/base.scss
View File

@ -19,7 +19,7 @@
* skin style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.1.1.0, Jul 13, 2019
* @version 0.2.0.0, Jul 15, 2019
*/
@import "../../../scss/reset";
@import "../../../scss/usite";
@ -329,6 +329,11 @@ a {
opacity: .5;
transition: all .5s ease-out;
&--toc {
bottom: 54px;
display: none;
}
&--bottom {
transform: rotate(-180deg);
}
@ -898,7 +903,15 @@ a {
}
.post__toc {
z-index: 230;
background: #fff;
left: 0 !important;
top: 0 !important;
width: 100%;
max-width: initial;
box-sizing: border-box;
display: none;
bottom: 0;
}
.articles {
@ -934,4 +947,8 @@ a {
margin: 0 10px 10px 0;
}
}
.side__top--toc {
display: block;
}
}

2
Bubble/footer.ftl
View File

@ -32,7 +32,7 @@
by <a href="http://vanessa.b3log.org" target="_blank">Vanessa</a> <br>
</div>
</footer>
<svg class="side__top" version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<svg class="side__top" id="sideTop" version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<path d="M26.562 13.958c0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303v0c0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303v0zM23.305 10.7c0 0 0 0 0 0 0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303c0-0 0-0 0-0v0c0-0 0-0 0-0 0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303c0 0 0 0 0 0v0zM20.022 7.417c0 0 0 0 0 0 0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303c0-0 0-0 0-0v0c0-0 0-0 0-0 0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303c0 0 0 0 0 0v0zM29.67 0h-27.339c-0.677 0-1.228 0.551-1.228 1.228s0.551 1.228 1.228 1.228h11.151l-10.725 10.725c-0.476 0.476-0.476 1.253 0 1.729 0.226 0.226 0.551 0.351 0.852 0.351s0.626-0.125 0.852-0.351l10.074-10.074v25.936c0 0.677 0.551 1.228 1.228 1.228s1.228-0.551 1.228-1.228v-26.011c0.476 0.426 1.203 0.426 1.679-0.050s0.476-1.253 0-1.729l-0.576-0.576h11.577c0.677 0 1.228-0.551 1.228-1.228 0-0.626-0.551-1.178-1.228-1.178z"></path>
</svg>

29
Bubble/js/common.js
View File

@ -39,10 +39,10 @@ var Skin = {
if ($(window).scrollTop() > $(window).height() / 2 - 20) {
$('.side__menu').addClass('side__menu--edge')
$('.side__top').removeClass('side__top--bottom')
$('#sideTop').removeClass('side__top--bottom')
} else {
$('.side__menu').removeClass('side__menu--edge')
$('.side__top').addClass('side__top--bottom')
$('#sideTop').addClass('side__top--bottom')
}
})
@ -55,7 +55,7 @@ var Skin = {
$('.side__main').hide()
}, 1000)
})
$('.side__top').click(function () {
$('#sideTop').click(function () {
if ($(this).hasClass('side__top--bottom')) {
Util.goBottom()
} else {
@ -110,12 +110,18 @@ var Skin = {
initCanvas('articleTop')
$('.post__toc').css({
left: document.querySelector('.article__content').
getBoundingClientRect().right + 20,
right: 'auto',
display: 'block'
})
if ($(window).width() >= 768) {
$('.post__toc').css({
left: document.querySelector('.article__content').
getBoundingClientRect().right + 20,
right: 'auto',
display: 'block',
})
} else {
$('.side__top--toc').click(function () {
$('.post__toc').slideToggle()
})
}
var $articleTocs = $('.vditor-reset [id^=b3_solo_h]')
var $articleToc = $('.article__toc')
@ -124,6 +130,9 @@ var Skin = {
var id = $(this).attr('href')
window.location.hash = id
$(window).scrollTop($(id).offset().top)
if ($(window).width() < 768) {
$('.post__toc').slideToggle()
}
event.preventDefault()
event.stopPropagation()
return false
@ -144,7 +153,7 @@ var Skin = {
})
// 当前目录样式
var scrollTop = $(window).scrollTop()
var scrollTop = $(window).scrollTop() + 10
for (var i = 0, iMax = toc.length; i < iMax; i++) {
if (scrollTop < toc[i].offsetTop) {
$articleToc.find('li').removeClass('current')

2
Bubble/js/common.min.js vendored
View File

@ -1 +1 @@
var Skin={init:function(){$("#headerDown").click(function(){$("html, body").animate({scrollTop:$(window).height()},300)}),$(window).scroll(function(e){$(".fn__progress").attr("value",parseInt($(window).scrollTop())).attr("max",parseInt($("body").outerHeight()-$(window).height())),$(window).scrollTop()>$(window).height()/2-20?($(".side__menu").addClass("side__menu--edge"),$(".side__top").removeClass("side__top--bottom")):($(".side__menu").removeClass("side__menu--edge"),$(".side__top").addClass("side__top--bottom"))}),$(".side__menu").click(function(){$(".side__main").addClass("side__main--show").show()}),$(".side__bg, .side__close").click(function(){$(".side__main").removeClass("side__main--show"),setTimeout(function(){$(".side__main").hide()},1e3)}),$(".side__top").click(function(){$(this).hasClass("side__top--bottom")?Util.goBottom():Util.goTop()});var e=0,t=$(".header__h1").text();document.addEventListener("visibilitychange",function(){e&&clearTimeout(e),e=document.hidden?setTimeout(function(){document.title="(◍´꒳`◍) - "+t},500):(document.title="(*´∇｀*) 欢迎回来！",setTimeout(function(){document.title=t},1e3))},!1),new Ribbons({colorSaturation:"60%",colorBrightness:"50%",colorAlpha:.5,colorCycleSpeed:5,verticalPosition:"random",horizontalSpeed:200,ribbonCount:3,strokeSize:0,parallaxAmount:-.2,animateSections:!0}),1!==$("#comments").length&&($(window).scroll(),$(".header").circleMagic({clearOffset:.3,color:"rgba(255,255,255, .2)",density:.2,radius:15}))},initArticle:function(){page.share(),initCanvas("articleTop"),$(".post__toc").css({left:document.querySelector(".article__content").getBoundingClientRect().right+20,right:"auto",display:"block"});var r=$(".vditor-reset [id^=b3_solo_h]"),a=$(".article__toc");a.find("a").click(function(e){var t=$(this).attr("href");return window.location.hash=t,$(window).scrollTop($(t).offset().top),e.preventDefault(),e.stopPropagation(),!1}),$(window).scroll(function(e){if(0===$(".article__toc li").length)return!1;var t=[];r.each(function(e){t.push({id:this.id,offsetTop:$(this).offset().top})});for(var o=$(window).scrollTop(),i=0,n=t.length;i<n;i++)if(o<t[i].offsetTop){a.find("li").removeClass("current");var s=0<i?i-1:0;a.find('a[href="#'+t[s].id+'"]').parent().addClass("current");break}o>=t[t.length-1].offsetTop&&(a.find("li").removeClass("current"),a.find("li:last").addClass("current"))}),$(window).scroll()}};$(document).ready(function(){Skin.init()});
var Skin={init:function(){$("#headerDown").click(function(){$("html, body").animate({scrollTop:$(window).height()},300)}),$(window).scroll(function(o){$(".fn__progress").attr("value",parseInt($(window).scrollTop())).attr("max",parseInt($("body").outerHeight()-$(window).height())),$(window).scrollTop()>$(window).height()/2-20?($(".side__menu").addClass("side__menu--edge"),$("#sideTop").removeClass("side__top--bottom")):($(".side__menu").removeClass("side__menu--edge"),$("#sideTop").addClass("side__top--bottom"))}),$(".side__menu").click(function(){$(".side__main").addClass("side__main--show").show()}),$(".side__bg, .side__close").click(function(){$(".side__main").removeClass("side__main--show"),setTimeout(function(){$(".side__main").hide()},1e3)}),$("#sideTop").click(function(){$(this).hasClass("side__top--bottom")?Util.goBottom():Util.goTop()});var o=0,e=$(".header__h1").text();document.addEventListener("visibilitychange",function(){o&&clearTimeout(o),o=document.hidden?setTimeout(function(){document.title="(◍´꒳`◍) - "+e},500):(document.title="(*´∇｀*) 欢迎回来！",setTimeout(function(){document.title=e},1e3))},!1),new Ribbons({colorSaturation:"60%",colorBrightness:"50%",colorAlpha:.5,colorCycleSpeed:5,verticalPosition:"random",horizontalSpeed:200,ribbonCount:3,strokeSize:0,parallaxAmount:-.2,animateSections:!0}),1!==$("#comments").length&&($(window).scroll(),$(".header").circleMagic({clearOffset:.3,color:"rgba(255,255,255, .2)",density:.2,radius:15}))},initArticle:function(){page.share(),initCanvas("articleTop"),768<=$(window).width()?$(".post__toc").css({left:document.querySelector(".article__content").getBoundingClientRect().right+20,right:"auto",display:"block"}):$(".side__top--toc").click(function(){$(".post__toc").slideToggle()});var d=$(".vditor-reset [id^=b3_solo_h]"),l=$(".article__toc");l.find("a").click(function(o){var e=$(this).attr("href");return window.location.hash=e,$(window).scrollTop($(e).offset().top),$(window).width()<768&&$(".post__toc").slideToggle(),o.preventDefault(),o.stopPropagation(),!1}),$(window).scroll(function(o){if(0===$(".article__toc li").length)return!1;var e=[];d.each(function(o){e.push({id:this.id,offsetTop:$(this).offset().top})});for(var t=$(window).scrollTop()+10,i=0,n=e.length;i<n;i++)if(t<e[i].offsetTop){l.find("li").removeClass("current");var s=0<i?i-1:0;l.find('a[href="#'+e[s].id+'"]').parent().addClass("current");break}t>=e[e.length-1].offsetTop&&(l.find("li").removeClass("current"),l.find("li:last").addClass("current"))}),$(window).scroll()}};$(document).ready(function(){Skin.init()});