1. Feature: 可關閉圖片懶加載

2. Feature: 增加頁面排版,可選擇把右邊欄放在左邊
3. Feature: 增加 Note (Bootstrap Callout) (移植於next主題)
4. Feature: 手機上能夠查看TOC
5. Feature: 增加直達評論按鈕
6. Fix: 修復post頁在寬度1024px下的顯示bug
7. Fix: 修復代碼框部分語言沒有顯示正確的代碼語言
8. Fix: 修復設置裏把Disqus註釋掉無法運行的bug
This commit is contained in:
hwy0127@gmail.com
2019-08-11 19:57:09 +08:00
Unverified
parent 49a9995a3d
commit 6cdd19e07f
28 changed files with 631 additions and 173 deletions

View File

@@ -62,7 +62,6 @@ h6
position: fixed
right: $go-up-right
bottom: $go-up-bottom
z-index: 100
font-size: $sidebar-icon-size
opacity: 0
cursor: pointer
@@ -212,9 +211,8 @@ table
#rightside
right: -38px
z-index: 100
position: fixed
bottom: 50px
bottom: 30px
padding-bottom: 32px
opacity: 0
transition: all .2s

View File

@@ -2,19 +2,19 @@
@require "theme"
@require "diff"
languages = "js" "javascript" "python" "ruby" "xml" "html" "css" "perl" "sql" "coffeescript" "java" "scala" "kotlin" "c" "c\+\+" "go" "less" "sass" "scss" "stylus" "styl" "typescript" "ts" "bash" "yml" "yaml" "gradle" "groovy" "ejs" "swig" "markdown"
// languages = "js" "javascript" "python" "ruby" "xml" "html" "css" "perl" "sql" "coffeescript" "java" "scala" "kotlin" "c" "c\+\+" "go" "less" "sass" "scss" "stylus" "styl" "typescript" "ts" "bash" "yml" "yaml" "gradle" "groovy" "ejs" "swig" "markdown"
wordWrap = !hexo-config("rootConfig.highlight.line_number") && hexo-config("code_word_wrap")
loopForLanguages()
for lang in languages
.article-container
figure.highlight
&{"." + lang}
table
&:before
content: lang
// loopForLanguages()
// for lang in languages
// .article-container
// figure.highlight
// &{"." + lang}
// table
// &:before
// content: lang
loopForLanguages()
// loopForLanguages()
// Placeholder: $code-block
$code-block
@@ -110,7 +110,7 @@ blockquote
padding: 0 0.7rem
width: 5rem
color: $highlight-foreground
content: "Code"
content: attr(data-content)
font-weight: bold
font-size: 0.8rem
line-height: 1.4rem

View File

@@ -12,7 +12,6 @@
transition: all .3s
background: #fff
margin-top: 20px
margin-left: 15px
overflow: hidden
&:hover
@@ -303,6 +302,14 @@
width: 100% !important
.card_widget
margin-left: 0 !important
margin-left: 0
margin-right: 0
@media screen and (min-width: 900px)
#aside_content
.card_widget
if hexo-config("aside.position") == "right"
margin-left: 15px
else
margin-right: 15px

View File

@@ -134,9 +134,6 @@
display: block
a
color: $light-grey
text-decoration: none

View File

@@ -108,7 +108,6 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable")
background: rgb(27, 38, 59)
.post-cards,.md-links-item
// background: #2d3035
a
color: #99a9bf
@@ -202,7 +201,20 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable")
.more
background-color: #616a6b
#post_bottom
background: #2d3035
box-shadow: 0 -5px 6px -5px rgba(133,133,133,0)
i
color: #99a9bf !important
#toc_mobile
background: #2d3035
a
color: #99a9bf !important
@media screen and (max-width: 768px)
.night-mode
color: #99a9bf

View File

@@ -0,0 +1,256 @@
.note
$note-icons = hexo-config('note.icons')
$note-style = hexo-config('note.style')
margin: 10px 0
padding: 15px
position: relative
if ($note-style == 'simple')
border: 1px solid $light-grey
border-left-width: 5px
if ($note-style == 'modern')
background-color: $whitesmoke
border: 1px solid transparent
if ($note-style == 'flat')
background-color: lighten($light-grey, 65%)
border: initial
border-left: 5px solid $light-grey
if (hexo-config('note.border_radius') is a 'unit')
border-radius: unit(hexo-config('note.border_radius'), px)
h2, h3, h4, h5, h6
if ($note-icons)
margin-top: 3px
else
margin-top: 0
border-bottom: initial
margin-bottom: 0
padding-top: 0 !important
p, ul, ol, table, pre, blockquote, img
&:first-child
margin-top: 0
&:last-child
margin-bottom: 0
if ($note-icons)
&:not(.no-icon)
padding-left: 45px
&::before
font-family: 'FontAwesome'
font-size: larger
left: 15px
position: absolute
top: 13px
&.default
if ($note-style == 'flat')
background-color: $note-default-bg
if ($note-style == 'modern')
background-color: $note-modern-default-bg
border-color: $note-modern-default-border
color: $note-modern-default-text
a, span.exturl
&:not(.btn)
border-bottom: 1px solid $note-modern-default-text
color: $note-modern-default-text
&:hover
border-bottom: 1px solid $note-modern-default-hover
color: $note-modern-default-hover
if ($note-style != 'modern')
border-left-color: $note-default-border
h2, h3, h4, h5, h6
color: $note-default-text
if ($note-icons)
&:not(.no-icon)
&::before
content: $note-default-icon
if ($note-style != 'modern')
color: $note-default-text
&.primary
if ($note-style == 'flat')
background-color: $note-primary-bg
if ($note-style == 'modern')
background-color: $note-modern-primary-bg
border-color: $note-modern-primary-border
color: $note-modern-primary-text
a, span.exturl
&:not(.btn)
border-bottom: 1px solid $note-modern-primary-text
color: $note-modern-primary-text
&:hover
border-bottom: 1px solid $note-modern-primary-hover
color: $note-modern-primary-hover
if ($note-style != 'modern')
border-left-color: $note-primary-border
h2, h3, h4, h5, h6
color: $note-primary-text
if ($note-icons)
&:not(.no-icon)
&::before
content: $note-primary-icon
if ($note-style != 'modern')
color: $note-primary-text
&.info
if ($note-style == 'flat')
background-color: $note-info-bg
if ($note-style == 'modern')
background-color: $note-modern-info-bg
border-color: $note-modern-info-border
color: $note-modern-info-text
a, span.exturl
&:not(.btn)
border-bottom: 1px solid $note-modern-info-text
color: $note-modern-info-text
&:hover
border-bottom: 1px solid $note-modern-info-hover
color: $note-modern-info-hover
if ($note-style != 'modern')
border-left-color: $note-info-border
h2, h3, h4, h5, h6
color: $note-info-text
if ($note-icons)
&:not(.no-icon)
&::before
content: $note-info-icon
if ($note-style != 'modern')
color: $note-info-text
&.success
if ($note-style == 'flat')
background-color: $note-success-bg
if ($note-style == 'modern')
background-color: $note-modern-success-bg
border-color: $note-modern-success-border
color: $note-modern-success-text
a, span.exturl
&:not(.btn)
border-bottom: 1px solid $note-modern-success-text
color: $note-modern-success-text
&:hover
border-bottom: 1px solid $note-modern-success-hover
color: $note-modern-success-hover
if ($note-style != 'modern')
border-left-color: $note-success-border
h2, h3, h4, h5, h6
color: $note-success-text
if ($note-icons)
&:not(.no-icon)
&::before
content: $note-success-icon
if ($note-style != 'modern')
color: $note-success-text
&.warning
if ($note-style == 'flat')
background-color: $note-warning-bg
if ($note-style == 'modern')
background-color: $note-modern-warning-bg
border-color: $note-modern-warning-border
color: $note-modern-warning-text
a, span.exturl
&:not(.btn)
border-bottom: 1px solid $note-modern-warning-text
color: $note-modern-warning-text
&:hover
border-bottom: 1px solid $note-modern-warning-hover
color: $note-modern-warning-hover
if ($note-style != 'modern')
border-left-color: $note-warning-border
h2, h3, h4, h5, h6
color: $note-warning-text
if ($note-icons)
&:not(.no-icon)
&::before
content: $note-warning-icon
if ($note-style != 'modern')
color: $note-warning-text
&.danger
if ($note-style == 'flat')
background-color: $note-danger-bg
if ($note-style == 'modern')
background-color: $note-modern-danger-bg
border-color: $note-modern-danger-border
color: $note-modern-danger-text
a, span.exturl
&:not(.btn)
border-bottom: 1px solid $note-modern-danger-text
color: $note-modern-danger-text
&:hover
border-bottom: 1px solid $note-modern-danger-hover
color: $note-modern-danger-hover
if ($note-style != 'modern')
border-left-color: $note-danger-border
h2, h3, h4, h5, h6
color: $note-danger-text
if ($note-icons)
&:not(.no-icon)
&::before
content: $note-danger-icon
if ($note-style != 'modern')
color: $note-danger-text

View File

@@ -25,7 +25,6 @@
img.prev_cover, img.next_cover
position: absolute
padding: 0
z-index: 50
top: 0
left: 0
width: 100%

View File

@@ -249,7 +249,7 @@ img
@media screen and (max-width: 900px)
@media screen and (max-width: 1024px)
.layout
margin: 0 15px
width: auto

View File

@@ -0,0 +1,57 @@
#post_bottom
position: fixed
bottom: -50px
background: alpha($white, 0.8)
width: 100%
border: none
box-shadow: 0 -5px 6px -5px alpha($grey, 0.6)
display: none
transition: all .2s
cursor: pointer
&.toc_mobile_show
bottom: 0
#to_comment,#mobile_toc
width: 50%
text-align: center
font-size: 18px
padding: 7px 0
display: inline-block
color: $light-black
a
text-decoration: none
color: $light-black
#toc_mobile
box-shadow: 0 0 4px alpha($grey, 0.6)
background: $white
width: 50%
height: 70%
position: fixed
bottom: 65px
right: 10px
overflow: scroll
padding: 15px 10px
font-size: 15px
border-radius: 10px
display: none
ol,li
list-style: none
padding: 0 0 0 5px
margin: 0
a
&:hover
color: $light-blue
.toc_mobile_headline
text-align: center
font-size: 18px
font-weight: bold
@media screen and (max-width:768px)
#post_bottom
display: block

View File

@@ -1,12 +1,10 @@
#recent-posts
width: 75%
.recent-post-item
padding: 0
box-shadow: 0 4px 8px 6px rgba(7,17,27,0.06)
border-radius: 8px
-webkit-transition: all 0.3s
-moz-transition: all 0.3s
-o-transition: all 0.3s
-ms-transition: all 0.3s
transition: all 0.3s
background: #fff
margin-top: 20px
@@ -34,9 +32,6 @@
height: 280px
overflow: hidden
img.post_bg
border: 0
transition: all .6s
@@ -130,8 +125,6 @@ a.article-meta__categories
align-items: flex-start
padding: 0 15px
#recent-posts
width: 75%
#page,.category-content,.flink
padding: 40px 44px 44px
@@ -155,12 +148,18 @@ a.article-meta__categories
#site-title
font-family: PingFang SC, Hiragino Sans GB, "Microsoft JhengHei", "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
@media screen and (max-width: 900px)
#page,.category-content,#archive,.tag-cloud,.flink,#tag,#category
width: 100% !important
@media screen and (min-width: 900px)
if hexo-config("aside.position") == "left"
#recent-posts
order: 2
// .recent-post-info
// padding: 40px 30px 20px
#page,.category-content,#archive,.tag-cloud,.flink,#tag,#category
order: 2
@media screen and (max-width: 900px)
#page,.category-content,#archive,.tag-cloud,.flink,#tag,#category
width: 100% !important
@media screen and (max-width:768px)
@@ -209,15 +208,7 @@ a.article-meta__categories
#aside_content
display: none !important
// .card_widget
// box-shadow: none
// border-radius: 0
// border-top: 1px dashed #a4d8fa
// &:hover
// box-shadow: none
.category-lists
padding: 0
@@ -282,14 +273,9 @@ footer
@keyframes pulse{
0%,to{
// -ms-filter:"alpha(opacity=40)"
// filter:alpha(opacity=40)
opacity:.4
top:0}
50%{
// -ms-filter:none
// -webkit-filter:none
// filter:none
opacity:1
top:-16px}
}

View File

@@ -80,6 +80,7 @@ $light-grey = #EEEEEE
$grey = $theme-meta-color
$pale-yellow = $theme-read-mode-bg-color
$white = #FFFFFF
$whitesmoke = #f5f5f5;
$dark-white = #F9F9F9
$font-black = #4C4948
$selection = $theme-text-selection-color
@@ -104,4 +105,73 @@ $img-border-padding = 4px
$sidebar-width = 300px
$sidebar-background = #f6f8fa
// Note colors
// --------------------------------------------------
hexo-config('note.light_bg_offset') is a 'unit' ? ($lbg = unit(hexo-config('note.light_bg_offset'),"%")) : ($lbg = 0);
// Default
$note-default-border = #777;
$note-default-bg = lighten(spin($note-default-border, 0), 94% + $lbg);
$note-default-text = $note-default-border;
$note-default-icon = "\f0a9";
$note-modern-default-border = #e1e1e1;
$note-modern-default-bg = lighten(spin($note-modern-default-border, 10), 60% + ($lbg * 4));
$note-modern-default-text = #666;
$note-modern-default-hover = darken(spin($note-modern-default-text, -10), 32%);
// Primary
$note-primary-border = #6f42c1;
$note-primary-bg = lighten(spin($note-primary-border, 10), 92% + $lbg);
$note-primary-text = $note-primary-border;
$note-primary-icon = "\f055";
$note-modern-primary-border = #e1c2ff;
$note-modern-primary-bg = lighten(spin($note-modern-primary-border, 10), 40% + ($lbg * 4));
$note-modern-primary-text = #6f42c1;
$note-modern-primary-hover = darken(spin($note-modern-primary-text, -10), 22%);
// Info
$note-info-border = #428bca;
$note-info-bg = lighten(spin($note-info-border, -10), 91% + $lbg);
$note-info-text = $note-info-border;
$note-info-icon = "\f05a";
$note-modern-info-border = #b3e5ef;
$note-modern-info-bg = lighten(spin($note-modern-info-border, 10), 50% + ($lbg * 4));
$note-modern-info-text = #31708f;
$note-modern-info-hover = darken(spin($note-modern-info-text, -10), 32%);
// Success
$note-success-border = #5cb85c;
$note-success-bg = lighten(spin($note-success-border, 10), 90% + $lbg);
$note-success-text = $note-success-border;
$note-success-icon = "\f058";
$note-modern-success-border = #d0e6be;
$note-modern-success-bg = lighten(spin($note-modern-success-border, 10), 40% + ($lbg * 4));
$note-modern-success-text = #3c763d;
$note-modern-success-hover = darken(spin($note-modern-success-text, -10), 27%);
// Warning
$note-warning-border = #f0ad4e;
$note-warning-bg = lighten(spin($note-warning-border, 10), 88% + $lbg);
$note-warning-text = $note-warning-border;
$note-warning-icon = "\f06a";
$note-modern-warning-border = #fae4cd;
$note-modern-warning-bg = lighten(spin($note-modern-warning-border, 10), 43% + ($lbg * 4));
$note-modern-warning-text = #8a6d3b;
$note-modern-warning-hover = darken(spin($note-modern-warning-text, -10), 18%);
// Danger
$note-danger-border = #d9534f;
$note-danger-bg = lighten(spin($note-danger-border, -10), 92% + $lbg);
$note-danger-text = $note-danger-border;
$note-danger-icon = "\f056";
$note-modern-danger-border = #ebcdd2;
$note-modern-danger-bg = lighten(spin($note-modern-danger-border, 10), 35% + ($lbg * 4));
$note-modern-danger-text = #a94442;
$note-modern-danger-hover = darken(spin($note-modern-danger-text, -10), 22%);

View File

@@ -1,5 +1,5 @@
$(function () {
if ($('#sidebar').hasClass('auto_open') ) {
if ($('#sidebar').hasClass('auto_open')) {
if ($(".sidebar-toc__content").children().length > 0) {
$(".layout_post").animate({}, function () {
{
@@ -81,7 +81,7 @@ $(function () {
//-----------------------------------------------------------------------------------------------------
// 首页fullpage添加
// 添加class
if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {} else {
if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) { } else {
$('.full_page').css('background-attachment', 'fixed')
}
@@ -215,15 +215,18 @@ $(function () {
if (imgList.length === 0) {
imgList = $("#post-content img").not('.no-fancybox');
}
for (var i = 0; i < imgList.length; i++) {
var lazyload_src = imgList[i].src ? imgList[i].src : imgList.eq(i).attr("data-src")
var $a = $(
'<a href="' +
imgList[i].src +
lazyload_src +
'" data-fancybox="group" data-caption="' +
imgList[i].alt +
'" class="fancybox"></a>'
)
var alt = imgList[i].alt
var $wrap = $(imgList[i]).wrap($a)
if (alt) {
@@ -261,27 +264,13 @@ $(function () {
});
//--------------------------------------------------------------------------------------------------------
//lazy懶加載
//把img的src删除添加data-src,用于lozad.js
var $img = $("#post img");
$img.addClass("lozad");
$img.each(function () {
var src_link = $(this).attr("src");
$(this).attr("data-src", src_link);
$(this).removeAttr("src");
})
const observer = lozad(); // lazy loads elements with default selector as '.lozad'
observer.observe();
//---------------------------------------------------------------------------------------------------------
/** head点击*/
$('.toggle-menu').on('click', function () {
if ($(".toggle-menu").hasClass("open")) {
$(".toggle-menu").removeClass("open").addClass("close");
$("#page-header #site-name,#page-header .search").css({'color':'#3b3a3a','text-shadow': 'none'})
$("#page-header #site-name,#page-header .search").css({ 'color': '#3b3a3a', 'text-shadow': 'none' })
$(".toggle-menu *").css({ 'background-color': '#3b3a3a', 'text-shadow': 'none' });
$('body').addClass("is_hidden");
$('.menus').addClass("menu_open");
@@ -342,14 +331,16 @@ $(function () {
$(window).on('resize', function (e) {
if (!$('.toggle-menu').is(':visible')) {
if ($(".toggle-menu").hasClass("close")) {
$(".toggle-menu").removeClass("close").addClass("open");
$("#page-header #site-name,#page-header .search").css({ 'color': '', 'text-shadow': '' });
$(".toggle-menu *").css({ 'background-color': '', 'text-shadow': '' });
$('body').removeClass("is_hidden");
$('.menus').removeClass("menu_open");
}
$(".toggle-menu").removeClass("close").addClass("open");
$("#page-header #site-name,#page-header .search").css({ 'color': '', 'text-shadow': '' });
$(".toggle-menu *").css({ 'background-color': '', 'text-shadow': '' });
$('body').removeClass("is_hidden");
$('.menus').removeClass("menu_open");
}
}
})
} )
//---------------------------------------------------------------------------------------------------------
/** scroll 滚动 toc*/
@@ -367,13 +358,19 @@ $(function () {
}
var isUp = scrollDirection(currentTop)
if($(".toggle-menu").hasClass("open")){
if ($(".toggle-menu").hasClass("open")) {
if (currentTop > 56) {
if (isUp) {
$('#page-header').hasClass('visible') ? $('#page-header').removeClass('visible') : console.log()
$('#post_bottom').removeClass('toc_mobile_show')
$('#toc_mobile').hasClass('is_visible') ? $('#toc_mobile').removeClass('is_visible') : console.log()
} else {
$('#page-header').hasClass('visible') ? console.log() : $('#page-header').addClass('visible')
$('#post_bottom').addClass('toc_mobile_show')
$('#toc_mobile').hasClass('is_visible') ? $('#toc_mobile').removeClass('is_visible') : console.log()
}
$('#page-header').addClass('fixed')
if ($('#go-up').css('opacity') === '0') {
@@ -399,6 +396,8 @@ $(function () {
} else {
if (currentTop === 0) {
$('#page-header').removeClass('fixed').removeClass('visible')
$('#post_bottom').removeClass('toc_mobile_show')
}
$('#go-up').animate({}, function () {
@@ -414,8 +413,19 @@ $(function () {
'transform': 'translateX(0)'
})
})
}
}
if ( $(window).width() <= 768 && $('#post_bottom').hasClass('toc_mobile_show') ){
$('#rightside,#go-up').css('bottom', '80px')
$('#rightside,#go-up').css('bottom', '70px')
} else {
$('#rightside,#go-up').css('bottom', '30px')
$('#rightside,#go-up').css('bottom', '20px')
}
}, 50, 100))
// go up smooth scroll
@@ -424,9 +434,9 @@ $(function () {
})
// head scroll
$('#post-content').find('h1,h2,h3,h4,h5,h6').on('click', function (e) {
scrollToHead('#' + $(this).attr('id'))
})
// $('#post-content').find('h1,h2,h3,h4,h5,h6').on('click', function (e) {
// scrollToHead('#' + $(this).attr('id'))
// })
// head scroll
$('.toc-link').on('click', function (e) {
@@ -520,15 +530,14 @@ $(function () {
.find('.toc-child').hide()
}
if ($('.toc-link').hasClass('active')){
if ($('.toc-link').hasClass('active')) {
var active_position = $(".active").offset().top;
var sidebar_scrolltop = $("#sidebar").scrollTop();
if (active_position > (top + $(window).height() - 50)) {
if (active_position > (top + $(window).height() - 50)) {
$("#sidebar").scrollTop(sidebar_scrolltop + 100);
} else if (active_position < top + 50)
{
} else if (active_position < top + 50) {
$("#sidebar").scrollTop(sidebar_scrolltop - 100);
}
}
}
}
@@ -568,4 +577,27 @@ $(function () {
var font_size_record = parseFloat($('body').css('font-size'))
$('body').css('font-size', font_size_record - 1)
});
$('#mobile_toc').on('click', function () {
$("#toc_mobile").toggleClass('is_visible')
})
//代碼框語言識別
$('figure').each(function () {
var lang_name_index;
var lang_name;
lang_name_index = lang_name = $(this).attr('class').split(' ')[1];
if (lang_name_index == 'js')
lang_name = 'javascript'
if (lang_name_index == 'md')
lang_name = 'markdown'
if (lang_name_index == 'plain')
lang_name = 'code'
if (lang_name_index == 'py')
lang_name = 'python'
$('figure.' + lang_name_index + ' table').attr('data-content', lang_name);
})
});