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

https://github.com/b3log/solo/issues/12720 nijigen

Browse Source
This commit is contained in:
Van 2019-03-22 17:10:56 +08:00
parent 53f713a45d
commit 32b7923774
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
15 changed files with 167 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nijigen/archive-articles.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div id="pjax" class="main">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -49,9 +49,9 @@
</div> </div>
<#include "article-list.ftl"> <#include "article-list.ftl">
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

6
nijigen/archives.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div id="pjax" class="main">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -64,9 +64,9 @@
</div> </div>
</div> </div>
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

7
nijigen/article.ftl
View File

@ -36,9 +36,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div class="main" id="pjax">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main id="articlePage"> <main id="articlePage">
<div class="article-list"> <div class="article-list">
<div class="item item--active"> <div class="item item--active">
@ -158,9 +158,10 @@
</div> </div>
</div> </div>
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>

6
nijigen/category-articles.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div id="pjax" class="main">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -45,9 +45,9 @@
</div> </div>
<#include "article-list.ftl"> <#include "article-list.ftl">
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

2
nijigen/css/base.css
View File

File diff suppressed because one or more lines are too long

11
nijigen/css/base.scss
View File

@ -19,11 +19,13 @@
* skin style * skin style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.4.0.1, Mar 16, 2019 * @version 0.5.0.0, Mar 22, 2019
*/ */
@import "../../../scss/reset"; @import "../../../scss/reset";
@import "../../../scss/function"; @import "../../../scss/function";
@import "../../../scss/nprogress"; @import "../../../scss/nprogress";
@import "../../../scss/toc";
@import "../../../scss/usite";
@import "icon"; @import "icon";
@import "vditor/src/assets/scss/classic"; @import "vditor/src/assets/scss/classic";
@ -32,6 +34,13 @@ $purple-dark: #6658b8 !default;
$red: #b94a48 !default; $red: #b94a48 !default;
$black: #3d4450 !default; $black: #3d4450 !default;
.user__site {
color: rgba(10, 10, 0, 0.7);
&:hover {
color: $red;
}
}
// reset // reset
body { body {
cursor: url(../images/cursor.cur), url(../images/cursor.cur), auto cursor: url(../images/cursor.cur), url(../images/cursor.cur), auto

8
nijigen/dynamic.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div id="pjax" class="main">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -47,9 +47,9 @@
</ul> </ul>
</#if> </#if>
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
<script> <script>

6
nijigen/index.ftl
View File

@ -27,15 +27,15 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div class="main" id="pjax">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<#include "article-list.ftl"> <#include "article-list.ftl">
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

24
nijigen/js/common.js
View File

@ -35,7 +35,7 @@ var Skin = {
$goTop.hide() $goTop.hide()
} }
if ($('.side .b3-solo-list').length > 0) { if ($('.side .article__toc').length > 0 && $(window).width() > 768) {
if ($(window).scrollTop() > 50) { if ($(window).scrollTop() > 50) {
$('.side').css('position', 'fixed') $('.side').css('position', 'fixed')
} else { } else {
@ -80,9 +80,6 @@ var Skin = {
init: function () { init: function () {
Util.initPjax(function () { Util.initPjax(function () {
Skin._initAnimation() Skin._initAnimation()
if ($('#articlePage').length === 0) {
$('.b3-solo-list').closest('.module').remove()
}
}) })
Skin._initAnimation() Skin._initAnimation()
@ -105,8 +102,7 @@ var Skin = {
}, },
_initArticleCommon: function () { _initArticleCommon: function () {
if ($(window).width() > 768) { if ($(window).width() > 768) {
if ($('#articlePage .b3-solo-list li').length === 0) { if ($('.article__toc li').length === 0) {
$('.side .b3-solo-list').closest('.module').remove()
$('.side').css({ $('.side').css({
height: 'auto', height: 'auto',
position: 'initial', position: 'initial',
@ -115,29 +111,15 @@ var Skin = {
} }
$('#articlePage').width($('.main').width() - 310) $('#articlePage').width($('.main').width() - 310)
if ($('.side .b3-solo-list').length === 0) { $('.side').css({
$('.side').
prepend('<div class="module"><div class="module__list"></div></div>').
css({
right: ($(window).width() - $('.main').width()) / 2, right: ($(window).width() - $('.main').width()) / 2,
position: 'fixed', position: 'fixed',
overflow: 'auto', overflow: 'auto',
height: $(window).height() - 30, height: $(window).height() - 30,
top: 30, top: 30,
}) })
}
$('.side .module:eq(0) .module__list').html($('.b3-solo-list'))
$(window).scroll() $(window).scroll()
$('.side').scrollTop(0) $('.side').scrollTop(0)
} else {
if ($('#articlePage .b3-solo-list li').length === 0) {
$('.header__m .icon__list').hide().next().hide()
return
}
$('.header__m .icon__list').show().next().html($('.b3-solo-list'))
$('.b3-solo-list a').click(function () {
$(this).closest('.module__list').hide()
})
} }
}, },
initArticle: function () { initArticle: function () {

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

@ -1 +1 @@
var Skin={_initCommon:function(e){$(window).scroll(function(){125<$(window).scrollTop()?e.show():e.hide(),0<$(".side .b3-solo-list").length&&(50<$(window).scrollTop()?$(".side").css("position","fixed"):$(".side").css("position","initial"))})},_initAnimation:function(){if(!("IntersectionObserver"in window))return $(".item").addClass("item--active"),!1;window.imageIntersectionObserver?window.imageIntersectionObserver.disconnect():window.imageIntersectionObserver=new IntersectionObserver(function(e){e.forEach(function(e){if(void 0===e.isIntersecting?0!==e.intersectionRatio:e.isIntersecting)$(e.target).addClass("item--active");else{if(1===$(e.target).closest(".side").length||1===$(e.target).closest("#articlePage").length||768<$(e.target).outerHeight())return;$(e.target).removeClass("item--active")}})}),$(".item").each(function(){window.imageIntersectionObserver.observe(this)})},init:function(){Util.initPjax(function(){Skin._initAnimation(),0===$("#articlePage").length&&$(".b3-solo-list").closest(".module").remove()}),Skin._initAnimation(),this._initCommon($(".icon__up")),$(".header__nav a, .header__m a").each(function(){this.href===location.href&&(this.className="current")}).click(function(){$(".header__nav a, .header__m a").removeClass("current"),this.className="current",$(".header__m .module__list").hide()}),$(".header__logo").click(function(){$(".header__nav a, .header__m a").removeClass("current")})},_initArticleCommon:function(){if(768<$(window).width()){if(0===$("#articlePage .b3-solo-list li").length)return $(".side .b3-solo-list").closest(".module").remove(),void $(".side").css({height:"auto",position:"initial"});$("#articlePage").width($(".main").width()-310),0===$(".side .b3-solo-list").length&&$(".side").prepend('<div class="module"><div class="module__list"></div></div>').css({right:($(window).width()-$(".main").width())/2,position:"fixed",overflow:"auto",height:$(window).height()-30,top:30}),$(".side .module:eq(0) .module__list").html($(".b3-solo-list")),$(window).scroll(),$(".side").scrollTop(0)}else{if(0===$("#articlePage .b3-solo-list li").length)return void $(".header__m .icon__list").hide().next().hide();$(".header__m .icon__list").show().next().html($(".b3-solo-list")),$(".b3-solo-list a").click(function(){$(this).closest(".module__list").hide()})}},initArticle:function(){this._initArticleCommon(),setTimeout(function(){0===$("#externalRelevantArticlesWrap li").length&&($("#externalRelevantArticlesWrap").next().remove(),$("#externalRelevantArticlesWrap").remove()),0===$("#relevantArticlesWrap li").length&&($("#relevantArticlesWrap").prev().remove(),$("#relevantArticlesWrap").remove()),0===$("#randomArticlesWrap li").length&&($("#randomArticlesWrap").prev().remove(),$("#randomArticlesWrap").remove())},1e3)}};Skin.init(); var Skin={_initCommon:function(e){$(window).scroll(function(){125<$(window).scrollTop()?e.show():e.hide(),0<$(".side .article__toc").length&&(50<$(window).scrollTop()?$(".side").css("position","fixed"):$(".side").css("position","initial"))})},_initAnimation:function(){if(!("IntersectionObserver"in window))return $(".item").addClass("item--active"),!1;window.imageIntersectionObserver?window.imageIntersectionObserver.disconnect():window.imageIntersectionObserver=new IntersectionObserver(function(e){e.forEach(function(e){if(void 0===e.isIntersecting?0!==e.intersectionRatio:e.isIntersecting)$(e.target).addClass("item--active");else{if(1===$(e.target).closest(".side").length||1===$(e.target).closest("#articlePage").length||768<$(e.target).outerHeight())return;$(e.target).removeClass("item--active")}})}),$(".item").each(function(){window.imageIntersectionObserver.observe(this)})},init:function(){Util.initPjax(function(){Skin._initAnimation(),0===$("#articlePage").length&&$(".article__toc").closest(".module").remove()}),Skin._initAnimation(),this._initCommon($(".icon__up")),$(".header__nav a, .header__m a").each(function(){this.href===location.href&&(this.className="current")}).click(function(){$(".header__nav a, .header__m a").removeClass("current"),this.className="current",$(".header__m .module__list").hide()}),$(".header__logo").click(function(){$(".header__nav a, .header__m a").removeClass("current")})},_initArticleCommon:function(){if(768<$(window).width()){if(0===$("#articlePage .article__toc li").length)return $(".side .article__toc").closest(".module").remove(),void $(".side").css({height:"auto",position:"initial"});$("#articlePage").width($(".main").width()-310),0===$(".side .article__toc").length&&$(".side").prepend('<div class="module"><div class="module__list"></div></div>').css({right:($(window).width()-$(".main").width())/2,position:"fixed",overflow:"auto",height:$(window).height()-30,top:30}),$(".side .module:eq(0) .module__list").html($(".article__toc")),$(window).scroll(),$(".side").scrollTop(0)}else{if(0===$("#articlePage .article__toc li").length)return void $(".header__m .icon__list").hide().next().hide();$(".header__m .icon__list").show().next().html($(".article__toc")),$(".article__toc a").click(function(){$(this).closest(".module__list").hide()})}},initArticle:function(){this._initArticleCommon(),setTimeout(function(){0===$("#externalRelevantArticlesWrap li").length&&($("#externalRelevantArticlesWrap").next().remove(),$("#externalRelevantArticlesWrap").remove()),0===$("#relevantArticlesWrap li").length&&($("#relevantArticlesWrap").prev().remove(),$("#relevantArticlesWrap").remove()),0===$("#randomArticlesWrap li").length&&($("#randomArticlesWrap").prev().remove(),$("#randomArticlesWrap").remove())},1e3)}};Skin.init();

6
nijigen/links.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div id="pjax" class="main">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -57,9 +57,9 @@
</div> </div>
</div> </div>
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

6
nijigen/page.ftl
View File

@ -29,9 +29,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div class="main" id="pjax">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<article class="module"> <article class="module">
<div class="module__content"> <div class="module__content">
@ -42,9 +42,9 @@
</article> </article>
<@comments commentList=pageComments article=page></@comments> <@comments commentList=pageComments article=page></@comments>
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>

11
nijigen/side.ftl
View File

@ -18,6 +18,13 @@
--> -->
<aside class="side"> <aside class="side">
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="module">
<div class="module__list">
<#include "../../common-template/toc.ftl"/>
</div>
</div>
</#if>
<#if noticeBoard??> <#if noticeBoard??>
<section class="vditor-reset module"> <section class="vditor-reset module">
<main class="module__content"> <main class="module__content">
@ -41,7 +48,9 @@
</header> </header>
<main class="module__content ft__center"> <main class="module__content ft__center">
<img class="side__avatar" src="${adminUser.userAvatar}" alt="${adminUser.userName}"/> <img class="side__avatar" src="${adminUser.userAvatar}" alt="${adminUser.userName}"/>
${blogSubtitle} ${blogSubtitle} <br> <br>
<#include "../../common-template/macro-user_site.ftl"/>
<@userSite dir=""/>
</main> </main>
</div> </div>

6
nijigen/tag-articles.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div class="main" id="pjax">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -44,9 +44,9 @@
</div> </div>
<#include "article-list.ftl"> <#include "article-list.ftl">
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

6
nijigen/tags.ftl
View File

@ -27,9 +27,9 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<div class="main"> <div class="main" id="pjax">
<div id="pjax" class="content">
<#if pjax><!---- pjax {#pjax} start ----></#if> <#if pjax><!---- pjax {#pjax} start ----></#if>
<div class="content">
<main> <main>
<div class="module"> <div class="module">
<div class="module__content ft__center"> <div class="module__content ft__center">
@ -52,9 +52,9 @@
</div> </div>
</div> </div>
</main> </main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>