This commit is contained in:
Van
parent
1558900384
commit
ad7e12ef30
|
|
@ -41,12 +41,10 @@
|
|||
<#if curYear != archiveDate.archiveDateYear?number></div>
|
||||
|
||||
<div class="row"><hr/><h2>${archiveDate.archiveDateYear} ${yearLabel}</h2></#if>
|
||||
<span>
|
||||
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
|
||||
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
|
||||
${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
|
||||
<span class="gray">•<span>
|
||||
</span>
|
||||
<span class="gray">•</span>
|
||||
|
||||
<#assign curYear = archiveDate.archiveDateYear?number>
|
||||
</#list>
|
||||
|
|
|
|||
|
|
@ -86,9 +86,13 @@
|
|||
</#if>
|
||||
<div class="col-sm-2"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<#if article?? && article.articleToC?? && article.articleToC?size > 0>
|
||||
<#include "../../common-template/toc.ftl"/>
|
||||
</#if>
|
||||
|
||||
<#include "footer.ftl">
|
||||
<@comment_script oId=article.oId commentable=article.commentable>
|
||||
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
-->
|
||||
<div class="row comment" id="${comment.oId}">
|
||||
<div class="comment fn__clear" id="${comment.oId}">
|
||||
<img class="col-sm-1" title="${comment.commentName}"
|
||||
alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
|
||||
<div class="col-sm-11">
|
||||
|
|
|
|||
|
|
@ -2365,7 +2365,7 @@ output {
|
|||
display: block;
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
padding: 6px 12px;
|
||||
padding: 6px 8px;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
color: #555;
|
||||
|
|
@ -3943,6 +3943,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
|||
line-height: 20px;
|
||||
}
|
||||
@media (max-width: 767px) {
|
||||
.comment > img {
|
||||
display: none !important;
|
||||
}
|
||||
.navbar-nav .open .dropdown-menu {
|
||||
position: static;
|
||||
float: none;
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -21,11 +21,47 @@
|
|||
*
|
||||
* @author <a href="http://88250.b3log.org">Liang Ding</a>
|
||||
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
|
||||
* @version 2.0.0.1, Mar 16, 2019
|
||||
* @version 2.1.0.0, Mar 21, 2019
|
||||
*/
|
||||
|
||||
@import "bootstrap";
|
||||
@import "../../../scss/usite";
|
||||
@import "../../../scss/toc";
|
||||
@import "../../../scss/function";
|
||||
@import "vditor/src/assets/scss/classic";
|
||||
|
||||
.article__toc {
|
||||
position: fixed;
|
||||
top: 90px;
|
||||
bottom: 198px;
|
||||
padding-left: 0;
|
||||
left: 100%;
|
||||
}
|
||||
#comments {
|
||||
position: relative;
|
||||
}
|
||||
.comment-body-ref {
|
||||
position: absolute;
|
||||
background-color: #fff;
|
||||
width: 100%;
|
||||
left: 64px;
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
|
||||
border-radius: 5px;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.user__site {
|
||||
display: inline-block;
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
margin: 0 5px 15px 0;
|
||||
svg {
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
fill: currentColor;
|
||||
}
|
||||
}
|
||||
|
||||
body, button, input, select, textarea {
|
||||
font: 400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;
|
||||
letter-spacing: 0.01rem;
|
||||
|
|
@ -61,19 +97,6 @@ h4, h5, h6 {
|
|||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.article-content {
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
||||
.article-content .task-list-item {
|
||||
list-style: none;
|
||||
margin-left: -1em;
|
||||
}
|
||||
|
||||
.article-content img {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.header {
|
||||
border-bottom: 1px solid #ddd;
|
||||
background-color: #f9f9f9;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,10 @@
|
|||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
-->
|
||||
<#include "../../common-template/macro-user_site.ftl">
|
||||
<div class="footer">
|
||||
<@userSite dir="n"></@userSite>
|
||||
<br>
|
||||
© ${year} - <a href="${servePath}">${blogTitle}</a>${footerContent} Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}
|
||||
<div>
|
||||
Theme <a rel="friend" href="https://github.com/b3log/solo-skins" target="_blank">${skinDirName}</a>
|
||||
|
|
|
|||
|
|
@ -2109,6 +2109,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
|||
// ==============
|
||||
|
||||
$(window).on('load', function () {
|
||||
|
||||
$('.article__toc').animate({
|
||||
'left': ($('.site').outerWidth() + $('.site').offset().left) + 'px'
|
||||
}, 600)
|
||||
$('[data-spy="affix"]').each(function () {
|
||||
var $spy = $(this)
|
||||
var data = $spy.data()
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<#include "header.ftl">
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="container" style="min-height: 70vh">
|
||||
<div class="row">
|
||||
<div class="col-sm-2"></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,15 +18,15 @@
|
|||
|
||||
-->
|
||||
<#macro comments commentList article>
|
||||
<div class="row" id="comments">
|
||||
<div id="comments">
|
||||
<#list commentList as comment>
|
||||
<#include "common-comment.ftl"/>
|
||||
</#list>
|
||||
</div>
|
||||
|
||||
<#if article.commentable>
|
||||
<div class="row cmtForm">
|
||||
<textarea rows="3" placeholder="${postCommentsLabel}" id="comment" class="form-control"></textarea>
|
||||
</div>
|
||||
</#if>
|
||||
<#if article.commentable>
|
||||
<div class="cmtForm">
|
||||
<textarea rows="3" placeholder="${postCommentsLabel}" id="comment" class="form-control"></textarea>
|
||||
</div>
|
||||
</#if>
|
||||
</#macro>
|
||||
|
|
|
|||
|
|
@ -33,10 +33,8 @@
|
|||
<div class="col-sm-2"></div>
|
||||
<div class="col-sm-8 site article-list">
|
||||
<h2>
|
||||
<a id="tag" rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
|
||||
${tag.tagTitle}
|
||||
(${tag.tagPublishedRefCount})
|
||||
</a>
|
||||
</h2>
|
||||
<#include "article-list.ftl">
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue