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

View File

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

View File

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

View File

@ -36,131 +36,132 @@
</head>
<body>
<#include "header.ftl">
<div class="main">
<div id="pjax" class="content">
<div class="main" id="pjax">
<#if pjax><!---- pjax {#pjax} start ----></#if>
<main id="articlePage">
<div class="article-list">
<div class="item item--active">
<time class="vditor-tooltipped vditor-tooltipped__n item__date"
aria-label="${article.articleCreateDate?string("yyyy")}${yearLabel}">
${article.articleCreateDate?string("MM")}${monthLabel}
<span class="item__day">${article.articleCreateDate?string("dd")}</span>
</time>
<div class="content">
<main id="articlePage">
<div class="article-list">
<div class="item item--active">
<time class="vditor-tooltipped vditor-tooltipped__n item__date"
aria-label="${article.articleCreateDate?string("yyyy")}${yearLabel}">
${article.articleCreateDate?string("MM")}${monthLabel}
<span class="item__day">${article.articleCreateDate?string("dd")}</span>
</time>
<h2 class="item__title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</h2>
<h2 class="item__title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
${updatedLabel}
</sup>
</#if>
</h2>
<div class="item__date--m fn__none">
<i class="icon__date"></i>
${article.articleCreateDate?string("yyyy-MM-dd")}
</div>
<div class="ft__center">
<span class="tag">
<i class="icon__tags"></i>
<#list article.articleTags?split(",") as articleTag>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a><#if articleTag_has_next>,</#if>
</#list>
</span>
<a class="tag" href="${servePath}${article.articlePermalink}#comments">
<i class="icon__comments"></i> ${article.articleCommentCount} ${commentLabel}
</a>
<span class="tag">
<i class="icon__views"></i>
${article.articleViewCount} ${viewLabel}
</span>
</div>
<div class="vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
<div class="item__date--m fn__none">
<i class="icon__date"></i>
${article.articleCreateDate?string("yyyy-MM-dd")}
</div>
<div class="ft__center">
<span class="tag">
<i class="icon__tags"></i>
<#list article.articleTags?split(",") as articleTag>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a><#if articleTag_has_next>,</#if>
</#list>
</span>
<a class="tag" href="${servePath}${article.articlePermalink}#comments">
<i class="icon__comments"></i> ${article.articleCommentCount} ${commentLabel}
</a>
<span class="tag">
<i class="icon__views"></i>
${article.articleViewCount} ${viewLabel}
</span>
</div>
<div class="vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
</div>
</div>
</div>
<#if previousArticlePermalink?? || nextArticlePermalink??>
<div class="module mobile__hidden">
<div class="module__content fn__clear">
<#if previousArticlePermalink??>
<a href="${servePath}${previousArticlePermalink}" rel="prev" class="fn__left breadcrumb">
${previousArticleLabel}: ${previousArticleTitle}
</a>
</#if>
<#if nextArticlePermalink??>
<a href="${servePath}${nextArticlePermalink}" rel="next"
class="fn__right breadcrumb">
${nextArticleTitle}: ${nextArticleLabel}
</a>
</#if>
</div>
</div>
</div>
</#if>
<#if previousArticlePermalink?? || nextArticlePermalink??>
<div class="module mobile__hidden">
<div class="module__content fn__clear">
<#if previousArticlePermalink??>
<a href="${servePath}${previousArticlePermalink}" rel="prev" class="fn__left breadcrumb">
<#if previousArticlePermalink??>
<div class="module mobile__hidden fn__none">
<div class="module__content">
<a href="${servePath}${previousArticlePermalink}" rel="prev" class="breadcrumb">
${previousArticleLabel}: ${previousArticleTitle}
</a>
</#if>
<#if nextArticlePermalink??>
</div>
</div>
</#if>
<#if nextArticlePermalink??>
<div class="module mobile__hidden fn__none">
<div class="module__content">
<a href="${servePath}${nextArticlePermalink}" rel="next"
class="fn__right breadcrumb">
${nextArticleTitle}: ${nextArticleLabel}
class="breadcrumb">
${nextArticleLabel}: ${nextArticleTitle}
</a>
</#if>
</div>
</div>
</#if>
<#if previousArticlePermalink??>
<div class="module mobile__hidden fn__none">
<div class="module__content">
<a href="${servePath}${previousArticlePermalink}" rel="prev" class="breadcrumb">
${previousArticleLabel}: ${previousArticleTitle}
</a>
</div>
</div>
</#if>
<#if nextArticlePermalink??>
<div class="module mobile__hidden fn__none">
<div class="module__content">
<a href="${servePath}${nextArticlePermalink}" rel="next"
class="breadcrumb">
${nextArticleLabel}: ${nextArticleTitle}
</a>
</div>
</div>
</#if>
<@comments commentList=articleComments article=article></@comments>
<div class="fn__flex article__relevant">
<div class="fn__flex-1" id="externalRelevantArticlesWrap">
<div class="module">
<div id="externalRelevantArticles" class="module__list"></div>
</div>
</div>
<div class="mobile__hidden">&nbsp; &nbsp; &nbsp; &nbsp; </div>
<div class="fn__flex-1" id="randomArticlesWrap">
<div class="module">
<div id="randomArticles" class="module__list"></div>
</#if>
<@comments commentList=articleComments article=article></@comments>
<div class="fn__flex article__relevant">
<div class="fn__flex-1" id="externalRelevantArticlesWrap">
<div class="module">
<div id="externalRelevantArticles" class="module__list"></div>
</div>
</div>
<div class="mobile__hidden">&nbsp; &nbsp; &nbsp; &nbsp; </div>
<div class="fn__flex-1" id="randomArticlesWrap">
<div class="module">
<div id="randomArticles" class="module__list"></div>
</div>
</div>
<div class="mobile__hidden">&nbsp; &nbsp; &nbsp; &nbsp; </div>
<div class="fn__flex-1" id="relevantArticlesWrap">
<div class="module">
<div id="relevantArticles" class="module__list"></div>
</div>
</div>
</div>
<div class="mobile__hidden">&nbsp; &nbsp; &nbsp; &nbsp; </div>
<div class="fn__flex-1" id="relevantArticlesWrap">
<div class="module">
<div id="relevantArticles" class="module__list"></div>
</div>
</div>
</div>
</main>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</main>
</div>
<#include "side.ftl">
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
</div>
<#include "footer.ftl">
<#if pjax><!---- pjax {#pjax} start ----></#if>

View File

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

File diff suppressed because one or more lines are too long

View File

@ -19,11 +19,13 @@
* skin style
*
* @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/function";
@import "../../../scss/nprogress";
@import "../../../scss/toc";
@import "../../../scss/usite";
@import "icon";
@import "vditor/src/assets/scss/classic";
@ -32,6 +34,13 @@ $purple-dark: #6658b8 !default;
$red: #b94a48 !default;
$black: #3d4450 !default;
.user__site {
color: rgba(10, 10, 0, 0.7);
&:hover {
color: $red;
}
}
// reset
body {
cursor: url(../images/cursor.cur), url(../images/cursor.cur), auto

View File

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

View File

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

View File

@ -35,7 +35,7 @@ var Skin = {
$goTop.hide()
}
if ($('.side .b3-solo-list').length > 0) {
if ($('.side .article__toc').length > 0 && $(window).width() > 768) {
if ($(window).scrollTop() > 50) {
$('.side').css('position', 'fixed')
} else {
@ -80,9 +80,6 @@ var Skin = {
init: function () {
Util.initPjax(function () {
Skin._initAnimation()
if ($('#articlePage').length === 0) {
$('.b3-solo-list').closest('.module').remove()
}
})
Skin._initAnimation()
@ -105,8 +102,7 @@ var Skin = {
},
_initArticleCommon: function () {
if ($(window).width() > 768) {
if ($('#articlePage .b3-solo-list li').length === 0) {
$('.side .b3-solo-list').closest('.module').remove()
if ($('.article__toc li').length === 0) {
$('.side').css({
height: 'auto',
position: 'initial',
@ -115,29 +111,15 @@ var Skin = {
}
$('#articlePage').width($('.main').width() - 310)
if ($('.side .b3-solo-list').length === 0) {
$('.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'))
$('.side').css({
right: ($(window).width() - $('.main').width()) / 2,
position: 'fixed',
overflow: 'auto',
height: $(window).height() - 30,
top: 30,
})
$(window).scroll()
$('.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 () {

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();

View File

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

View File

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

View File

@ -18,6 +18,13 @@
-->
<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??>
<section class="vditor-reset module">
<main class="module__content">
@ -41,7 +48,9 @@
</header>
<main class="module__content ft__center">
<img class="side__avatar" src="${adminUser.userAvatar}" alt="${adminUser.userName}"/>
${blogSubtitle}
${blogSubtitle} <br> <br>
<#include "../../common-template/macro-user_site.ftl"/>
<@userSite dir=""/>
</main>
</div>

View File

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

View File

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