diff --git a/README.md b/README.md
index fac6714..3c590d4 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) t
### GIT
+> If you are in Mainland China, you can download in [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)
+
Stable branch [recommend]:
```
diff --git a/README_CN.md b/README_CN.md
index b8b7890..1dbdc37 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -17,6 +17,8 @@
### Git 安裝
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+
在博客根目錄裡安裝穩定版【推薦】
```powershell
diff --git a/_config.yml b/_config.yml
index 338d7ec..3f92437 100644
--- a/_config.yml
+++ b/_config.yml
@@ -94,23 +94,33 @@ avatar:
img:
effect: false
-# the banner image of home page
+# The banner image of home page
index_img:
-# if the banner of page not setting, it will show the top_img
+# If the banner of page not setting, it will show the top_img
default_top_img:
-# the banner image of archive page
+# The banner image of archive page
archive_img:
-# the banner image of tag page
+# If the banner of tag page not setting, it will show the top_img
# note: tag page, not tags page (子標籤頁面的 top_img)
tag_img:
-# the banner image of category page
+# The banner image of tag page
+# format:
+# - tag name: xxxxx
+tag_per_img:
+
+# If the banner of category page not setting, it will show the top_img
# note: category page, not categories page (子分類頁面的 top_img)
category_img:
+# The banner image of category page
+# format:
+# - category name: xxxxx
+category_per_img:
+
# If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個)
# douban:
# meta: false
@@ -144,11 +154,13 @@ error_404:
post_meta:
page: # Home Page
date_type: created # created or updated or both 主頁文章日期是創建日或者更新日或都顯示
+ date_format: date # date/relative 顯示日期還是相對日期
categories: true # true or false 主頁是否顯示分類
tags: false # true or false 主頁是否顯示標籤
label: true # true or false 顯示描述性文字
post:
date_type: both # created or updated or both 文章頁日期是創建日或者更新日或都顯示
+ date_format: date # date/relative 顯示日期還是相對日期
categories: true # true or false 文章頁是否顯示分類
tags: true # true or false 文章頁是否顯示標籤
label: true # true or false 顯示描述性文字
@@ -164,6 +176,7 @@ wordcount:
# 1: description
# 2: both (if the description exists, it will show description, or show the auto_excerpt)
# 3: auto_excerpt (default)
+# false: do not show the article introduction
index_post_content:
method: 3
length: 500 # if you set method to 2 or 3, the length need to config
@@ -473,17 +486,18 @@ tag_ui: # 留空或 index
# Website Background (設置網站背景)
# can set it to color or image (可設置圖片 或者 顔色)
-# The formal of color: '#49B202'
# The formal of image: url(http://xxxxxx.com/xxx.jpg)
-# White color will be shown as default
background:
-# Show the footer background image (same as top_img)
+# Footer Background
footer_bg: false
# the position of bottom right button/default unit: px (右下角按鈕距離底部的距離/默認單位為px)
rightside-bottom:
+# Enter transitions (開啓網頁進入效果)
+enter_transitions: true
+
# Background effects (背景特效)
# --------------------------------------
@@ -497,8 +511,8 @@ canvas_ribbon:
click_to_change: false
mobile: false
-# Dynamic ribbon (動態彩帶)
-canvas_ribbon_piao:
+# Fluttering Ribbon (動態彩帶)
+canvas_fluttering_ribbon:
enable: false
mobile: false
@@ -518,14 +532,18 @@ activate_power_mode:
enable: false
colorful: true # open particle animation (冒光特效)
shake: true # open shake (抖動特效)
+ mobile: false
# Mouse click effects: fireworks (鼠標點擊效果: 煙火特效)
fireworks:
enable: false
zIndex: 9999 # -1 or 9999
+ mobile: false
# Mouse click effects: Heart symbol (鼠標點擊效果: 愛心)
-click_heart: false
+click_heart:
+ enable: false
+ mobile: false
# Mouse click effects: words (鼠標點擊效果: 文字)
ClickShowText:
@@ -535,6 +553,7 @@ ClickShowText:
# - LOVE
# - YOU
fontSize: 15px
+ mobile: false
# Default display mode (網站默認的顯示模式)
# light (default) / dark
@@ -733,6 +752,13 @@ note:
# other
# --------------------------------------
+# Artitalk
+# see https://artitalk.js.org/
+artitalk:
+ appId:
+ appKey:
+ option:
+
# Pjax [Beta]
# It may contain bugs and unstable, give feedback when you find the bugs.
# https://github.com/MoOx/pjax
@@ -849,9 +875,9 @@ CDN:
busuanzi: //busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js
# background effect
- canvas_ribbon: /js/third-party/canvas-ribbon.js
- canvas_ribbon_piao: /js/third-party/piao.js
- canvas_nest: /js/third-party/canvas-nest.js
+ canvas_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js
+ canvas_fluttering_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js
+ canvas_nest: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js
lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js
instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js
@@ -868,11 +894,10 @@ CDN:
snackbar: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js
# effect
- anime: https://cdn.jsdelivr.net/npm/animejs@latest/anime.min.js
- activate_power_mode: /js/third-party/activate-power-mode.js
- fireworks: /js/third-party/fireworks.js
- click_heart: /js/third-party/click_heart.js
- ClickShowText: /js/third-party/ClickShowText.js
+ activate_power_mode: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js
+ fireworks: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js
+ click_heart: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js
+ ClickShowText: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js
# fontawesome
fontawesome: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css
@@ -893,3 +918,5 @@ CDN:
prismjs_js: https://cdn.jsdelivr.net/npm/prismjs/prism.min.js
prismjs_lineNumber_js: https://cdn.jsdelivr.net/npm/prismjs/plugins/line-numbers/prism-line-numbers.min.js
prismjs_autoloader: https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js
+
+ artitalk: https://cdn.jsdelivr.net/npm/artitalk
\ No newline at end of file
diff --git a/languages/default.yml b/languages/default.yml
index 53d40e7..b8ba13a 100644
--- a/languages/default.yml
+++ b/languages/default.yml
@@ -77,23 +77,20 @@ aside:
card_newest_comments:
heading: Newest Comments
loading_text: loading...
- zero_day: Today
- day: days ago
+ error: Unable to get the data, please make sure the settings are correct.
date_suffix:
- one_hour: Just
- hours: hours ago
+ just: Just
+ min: minutes ago
+ hour: hours ago
day: days ago
+ month: months ago
donate: Donate
share: Share
-bookmark:
- title: Bookmark
rightside:
readmode_title: Read Mode
- font_plus_title: Increase Font Size
- font_minus_title: Decrease Font Size
translate_title: Switch Between Traditional Chinese And Simplified Chinese
night_mode_title: Switch Between Light And Dark Mode
back_to_top: Back To Top
@@ -108,9 +105,6 @@ copy_copyright:
info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
Snackbar:
- bookmark:
- message_prev: Press
- message_next: to bookmark this page
chs_to_cht: Traditional Chinese Activated Manually
cht_to_chs: Simplified Chinese Activated Manually
day_to_night: Dark Mode Activated Manually
diff --git a/languages/en.yml b/languages/en.yml
index 53d40e7..b8ba13a 100644
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -77,23 +77,20 @@ aside:
card_newest_comments:
heading: Newest Comments
loading_text: loading...
- zero_day: Today
- day: days ago
+ error: Unable to get the data, please make sure the settings are correct.
date_suffix:
- one_hour: Just
- hours: hours ago
+ just: Just
+ min: minutes ago
+ hour: hours ago
day: days ago
+ month: months ago
donate: Donate
share: Share
-bookmark:
- title: Bookmark
rightside:
readmode_title: Read Mode
- font_plus_title: Increase Font Size
- font_minus_title: Decrease Font Size
translate_title: Switch Between Traditional Chinese And Simplified Chinese
night_mode_title: Switch Between Light And Dark Mode
back_to_top: Back To Top
@@ -108,9 +105,6 @@ copy_copyright:
info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
Snackbar:
- bookmark:
- message_prev: Press
- message_next: to bookmark this page
chs_to_cht: Traditional Chinese Activated Manually
cht_to_chs: Simplified Chinese Activated Manually
day_to_night: Dark Mode Activated Manually
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
index 0b10cbc..9ea8cd1 100644
--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -79,23 +79,20 @@ aside:
card_newest_comments:
heading: 最新评论
loading_text: 正在加载中...
- zero_day: 今天
- day: 天前
+ error: 无法获取资料，请确认相关配置是否正确
date_suffix:
- one_hour: 刚刚
- hours: 小时前
+ just: 刚刚
+ min: 分钟前
+ hour: 小时前
day: 天前
+ month: 个月前
donate: 打赏
share: 分享
-bookmark:
- title: 添加书签
rightside:
readmode_title: 阅读模式
- font_plus_title: 放大字体
- font_minus_title: 缩小字体
translate_title: 简繁转换
night_mode_title: 浅色和深色模式转换
back_to_top: 回到顶部
@@ -110,9 +107,6 @@ copy_copyright:
info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
Snackbar:
- bookmark:
- message_prev: 按
- message_next: 键将本页加入书签
chs_to_cht: 你已切换为繁体
cht_to_chs: 你已切换为简体
day_to_night: 你已切换为深色模式
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
index 47f6d86..b7b0124 100644
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@@ -79,23 +79,20 @@ aside:
card_newest_comments:
heading: 最新評論
loading_text: 正在加載中...
- zero_day: 今天
- day: 天前
+ error: 無法獲取資料，請確認相關配置是否正確
date_suffix:
- one_hour: 剛剛
- hours: 小時前
+ just: 剛剛
+ min: 分鐘前
+ hour: 小時前
day: 天前
+ month: 個月前
donate: 打賞
share: 分享
-bookmark:
- title: 新增書籤
rightside:
readmode_title: 閱讀模式
- font_plus_title: 放大字型
- font_minus_title: 縮小字型
translate_title: 簡繁轉換
night_mode_title: 淺色和深色模式轉換
back_to_top: 回到頂部
@@ -110,9 +107,6 @@ copy_copyright:
info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
Snackbar:
- bookmark:
- message_prev: 按
- message_next: 鍵將本頁加入書籤
chs_to_cht: 你已切換為繁體
cht_to_chs: 你已切換為簡體
day_to_night: 你已切換為深色模式
diff --git a/layout/404.pug b/layout/404.pug
index 1e7191b..aaaa169 100644
--- a/layout/404.pug
+++ b/layout/404.pug
@@ -13,8 +13,7 @@ html(lang=config.language data-theme=theme.display_mode)
canvas.fireworks
if theme.background
- - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
- #web_bg(data-type=is_photo)
+ #web_bg
#error-wrap
.error-content
diff --git a/layout/flink.pug b/layout/flink.pug
deleted file mode 100644
index fab186c..0000000
--- a/layout/flink.pug
+++ /dev/null
@@ -1,24 +0,0 @@
-#page
- .flink#article-container
- if site.data.link
- each i in site.data.link
- if i.class_name
- h2!= i.class_name
- if i.class_desc
- .flink-desc!=i.class_desc
- .flink-list
- each item in i.link_list
- .flink-list-item
- a(href=url_for(item.link) title=item.name target="_blank")
- if theme.lazyload.enable
- img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
- else
- img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
- span.flink-item-name= item.name
- span.flink-item-desc(title=item.descr)= item.descr
- != page.content
- if page.comments !== false && theme.comments && theme.comments.use
- - var commentsJsLoad = true
- !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
-
-
diff --git a/layout/includes/additional-js.pug b/layout/includes/additional-js.pug
index 0979f90..214badc 100644
--- a/layout/includes/additional-js.pug
+++ b/layout/includes/additional-js.pug
@@ -33,8 +33,11 @@ div
!=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
.js-pjax
- if is_home() && theme.subtitle.enable
+ if theme.subtitle.enable && is_home() && theme.index_img !== false
include ./third-party/subtitle.pug
+
+ if page.type === 'artitalk'
+ include ./third-party/artitalk.pug
include ./third-party/math/index.pug
@@ -65,4 +68,7 @@ div
include ./head/aplayer.pug
if theme.pjax.enable
- !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
\ No newline at end of file
+ !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
+
+ !=partial('includes/third-party/baidu_push', {}, {cache:theme.fragment_cache})
+
\ No newline at end of file
diff --git a/layout/includes/head.pug b/layout/includes/head.pug
index 84374ab..9ec57e9 100644
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -10,7 +10,6 @@
- var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
- var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
-- var pageDescription = page_description()
- var pageKeywords
- if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') : ([]).join(',') || page.keywords
- else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
@@ -23,7 +22,6 @@ meta(charset='UTF-8')
meta(http-equiv="X-UA-Compatible" content="IE=edge")
meta(name="viewport" content="width=device-width,initial-scale=1")
title= tabTitle
-meta(name="description" content!=pageDescription)
if pageKeywords
meta(name="keywords" content=pageKeywords)
meta(name="author" content=pageAuthor)
@@ -35,6 +33,9 @@ if theme.disable_baidu_transformation
meta(http-equiv="Cache-Control" content="no-transform")
meta(http-equiv="Cache-Control" content="no-siteapp")
+//- Open_Graph
+include ./head/Open_Graph.pug
+
!=favicon_tag(theme.favicon || config.favicon)
link(rel="canonical" href=urlNoIndex())
@@ -44,14 +45,6 @@ link(rel="canonical" href=urlNoIndex())
//- 網站驗證
!=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
-//- Open_Graph
-include ./head/Open_Graph.pug
-
-if theme.facebook_comments.app_id
- meta(property="fb:app_id" content=theme.facebook_comments.app_id )
-if theme.facebook_comments.user_id
- meta(property="fb:admins" content=theme.facebook_comments.user_id)
-
//- PWA
if (theme.pwa && theme.pwa.enable)
!=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
diff --git a/layout/includes/head/Open_Graph.pug b/layout/includes/head/Open_Graph.pug
index 78d04c8..7d5c59c 100644
--- a/layout/includes/head/Open_Graph.pug
+++ b/layout/includes/head/Open_Graph.pug
@@ -1,12 +1,11 @@
-- var contentType = is_post() ? 'article' : 'website'
-
if theme.Open_Graph_meta
- meta(property="og:type" content=contentType)
- meta(property="og:title" content=pageTitle)
- meta(property="og:url" content=urlNoIndex())
- meta(property="og:site_name" content=config.title)
- meta(property="og:description" content!=pageDescription)
- meta(property="og:image" content=full_url_for(page.cover || theme.avatar.img))
- meta(property="article:published_time" content=date_xml(page.date))
- meta(property="article:modified_time" content=date_xml(page.updated))
- meta(name="twitter:card" content="summary")
+ - let contentType = is_post() ? 'article' : 'website'
+ - let metaImage = full_url_for(page.cover || theme.avatar.img)
+ - let fb_appId = theme.facebook_comments.app_id || ''
+ - let fb_admins = theme.facebook_comments.user_id || ''
+
+ != open_graph({type: contentType, image: metaImage, fb_admins: fb_admins, fb_app_id: fb_appId})
+
+else
+ meta(name="description" content=page_description())
+
diff --git a/layout/includes/head/config.pug b/layout/includes/head/config.pug
index fc6512c..cfb04ba 100644
--- a/layout/includes/head/config.pug
+++ b/layout/includes/head/config.pug
@@ -61,10 +61,6 @@
let Snackbar = 'undefined';
if (theme.snackbar && theme.snackbar.enable) {
Snackbar = JSON.stringify({
- bookmark: {
- message_prev: _p("Snackbar.bookmark.message_prev"),
- message_next: _p("Snackbar.bookmark.message_next")
- },
chs_to_cht: _p("Snackbar.chs_to_cht"),
cht_to_chs: _p("Snackbar.cht_to_chs"),
day_to_night: _p("Snackbar.day_to_night"),
@@ -94,12 +90,6 @@
})
}
- let date_suffix = JSON.stringify({
- one_hour: _p("date_suffix.one_hour"),
- hours: _p("date_suffix.hours"),
- day: _p('date_suffix.day')
- })
-
script.
var GLOBAL_CONFIG = {
root: '!{config.root}',
@@ -114,22 +104,26 @@ script.
error: '!{_p("copy.error")}',
noSupport: '!{_p("copy.noSupport")}'
},
- bookmark: {
- message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
- message_next: '!{_p("Snackbar.bookmark.message_next")}'
+ relativeDate: {
+ homepage: !{theme.post_meta.page.date_format === 'relative'},
+ post: !{theme.post_meta.post.date_format === 'relative'}
},
runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
- date_suffix: !{date_suffix},
+ date_suffix: {
+ just: '!{_p("date_suffix.just")}',
+ min: '!{_p("date_suffix.min")}',
+ hour: '!{_p("date_suffix.hour")}',
+ day: '!{_p("date_suffix.day")}',
+ month: '!{_p("date_suffix.month")}'
+ },
copyright: !{copyright},
ClickShowText: !{ClickShowText},
- medium_zoom: !{theme.medium_zoom},
- fancybox: !{theme.fancybox},
+ lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
Snackbar: !{Snackbar},
justifiedGallery: {
js: '!{theme.CDN.justifiedGallery_js}',
css: '!{theme.CDN.justifiedGallery_css}'
},
- baiduPush: !{theme.baidu_push},
isPhotoFigcaption: !{theme.photofigcaption},
islazyload: !{theme.lazyload.enable},
isanchor: !{theme.anchor}
@@ -144,7 +138,7 @@ script.
expiry: now.getTime() + expiryDay,
}
localStorage.setItem(key, JSON.stringify(item))
- },
+ },
get: function getWithExpiry(key) {
const itemStr = localStorage.getItem(key)
diff --git a/layout/includes/head/darkmode.pug b/layout/includes/head/darkmode.pug
index c3e775d..c80a902 100644
--- a/layout/includes/head/darkmode.pug
+++ b/layout/includes/head/darkmode.pug
@@ -1,50 +1,53 @@
if theme.darkmode.enable
script.
- var activateDarkMode = function () {
- document.documentElement.setAttribute('data-theme', 'dark')
- if (document.querySelector('meta[name="theme-color"]') !== null) {
- document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
- }
- }
- var activateLightMode = function () {
- document.documentElement.setAttribute('data-theme', 'light')
- if (document.querySelector('meta[name="theme-color"]') !== null) {
- document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
- }
- }
-
- var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
- var t = saveToLocal.get('theme')
- if (autoChangeMode === '1') {
- var isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
- var isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
- var isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
- var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
- if (t === undefined) {
- if (isLightMode) activateLightMode()
- else if (isDarkMode) activateDarkMode()
- else if (isNotSpecified || hasNoSupport) {
- var now = new Date()
- var hour = now.getHours()
- var isNight = hour <= 6 || hour >= 18
- isNight ? activateDarkMode() : activateLightMode()
+ (function () {
+ window.activateDarkMode = function () {
+ document.documentElement.setAttribute('data-theme', 'dark')
+ if (document.querySelector('meta[name="theme-color"]') !== null) {
+ document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
}
- window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
- if (saveToLocal.get('theme') === undefined) {
- e.matches ? activateDarkMode() : activateLightMode()
+ }
+ window.activateLightMode = function () {
+ document.documentElement.setAttribute('data-theme', 'light')
+ if (document.querySelector('meta[name="theme-color"]') !== null) {
+ document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
+ }
+ }
+
+ const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
+ const t = saveToLocal.get('theme')
+ if (autoChangeMode === '1') {
+ const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
+ const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
+ const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
+ const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
+
+ if (t === undefined) {
+ if (isLightMode) activateLightMode()
+ else if (isDarkMode) activateDarkMode()
+ else if (isNotSpecified || hasNoSupport) {
+ const now = new Date()
+ const hour = now.getHours()
+ const isNight = hour <= 6 || hour >= 18
+ isNight ? activateDarkMode() : activateLightMode()
}
- })
- } else if (t === 'light') activateLightMode()
- else activateDarkMode()
- } else if (autoChangeMode === '2') {
- now = new Date()
- hour = now.getHours()
- isNight = hour <= 6 || hour >= 18
- if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
- else if (t === 'light') activateLightMode()
- else activateDarkMode()
- } else {
- if (t === 'dark') activateDarkMode()
- else if (t === 'light') activateLightMode()
- }
+ window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+ if (saveToLocal.get('theme') === undefined) {
+ e.matches ? activateDarkMode() : activateLightMode()
+ }
+ })
+ } else if (t === 'light') activateLightMode()
+ else activateDarkMode()
+ } else if (autoChangeMode === '2') {
+ const now = new Date()
+ const hour = now.getHours()
+ const isNight = hour <= 6 || hour >= 18
+ if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
+ else if (t === 'light') activateLightMode()
+ else activateDarkMode()
+ } else {
+ if (t === 'dark') activateDarkMode()
+ else if (t === 'light') activateLightMode()
+ }
+ })()
+
diff --git a/layout/includes/head/noscript.pug b/layout/includes/head/noscript.pug
index b0f6e1d..cc3befa 100644
--- a/layout/includes/head/noscript.pug
+++ b/layout/includes/head/noscript.pug
@@ -1,9 +1,14 @@
noscript.
\ No newline at end of file
diff --git a/layout/includes/header/index.pug b/layout/includes/header/index.pug
index 16f6ab3..c4ed6e6 100644
--- a/layout/includes/header/index.pug
+++ b/layout/includes/header/index.pug
@@ -1,43 +1,60 @@
-if is_home()
- - var top_img = theme.index_img || theme.default_top_img
-else if is_post()
- - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
-else if is_archive()
- - var top_img = theme.archive_img || theme.default_top_img
-else if is_tag()
- - var top_img = theme.tag_img || theme.default_top_img
-else if is_category()
- - var top_img = theme.category_img || theme.default_top_img
+if page.top_img !== false
+ if is_post()
+ - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+ else if is_page()
+ - var top_img = page.top_img || theme.default_top_img
+ else if is_tag()
+ - var top_img = theme.tag_per_img && theme.tag_per_img[page.tag]
+ - top_img = top_img ? top_img : (theme.tag_img !== false ? theme.tag_img || theme.default_top_img : false)
+ else if is_category()
+ - var top_img = theme.category_per_img && theme.category_per_img[page.category]
+ - top_img = top_img ? top_img : (theme.category_img !== false ? theme.category_img || theme.default_top_img : false)
+ else if is_home()
+ - var top_img = theme.index_img !== false ? theme.index_img || theme.default_top_img : false
+ else if is_archive()
+ - var top_img = theme.archive_img !== false ? theme.archive_img || theme.default_top_img : false
+ else
+ - var top_img = page.top_img || theme.default_top_img
+
+ if theme.douban
+ - var doubanExist = false
+ if is_current('/movies/', [strict])
+ - var top_img = theme.douban.movies_img !== false ? theme.douban.movies_img || theme.default_top_img : false
+ - doubanExist = true
+ else if is_current('/books/', [strict])
+ - var top_img = theme.douban.books_img !== false ? theme.douban.books_img || theme.default_top_img : false
+ - doubanExist = true
+ else if is_current('/games/', [strict])
+ - var top_img = theme.douban.games_img !== false ? theme.douban.games_img || theme.default_top_img : false
+ - doubanExist = true
+
+ if top_img !== false
+ - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
+ - var bg_img = top_img ? imgSource : ''
+ - var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
+ - var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
+ - is_post() ? isHomeClass = 'post-bg' : isHomeClass
+ else
+ - var isHomeClass = 'no-top-img'
else
- - var top_img = page.top_img || theme.default_top_img
-
-if theme.douban
- if is_current('/movies/', [strict])
- - var top_img = theme.douban.movies_img || theme.default_top_img
- else if is_current('/books/', [strict])
- - var top_img = theme.douban.books_img || theme.default_top_img
- else if is_current('/games/', [strict])
- - var top_img = theme.douban.games_img || theme.default_top_img
-
-- var bg_img = top_img && top_img !== true ? `background-image: url(${url_for(top_img)})` : ''
-- var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
-- var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
-- is_post() ? isHomeClass = 'post-bg' : isHomeClass
+ - var top_img = false
+ - var isHomeClass = 'no-top-img'
header#page-header(class=isHomeClass style=bg_img)
!=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
- if is_home()
- #site-info
- h1#site_title=site_title
- #site_subtitle
- span#subtitle
- if(theme.social)
- #site_social_icons
- !=fragment_cache('social', function(){return partial('includes/header/social')})
- #scroll_down
- i.fas.fa-angle-down.scroll-down-effects
- else if is_post()
- include ./post-info.pug
- else
- #page_site-info
- h1#site_title=site_title
+ if top_img !== false
+ if is_post()
+ include ./post-info.pug
+ else if is_home()
+ #site-info
+ h1#site-title=site_title
+ #site-subtitle
+ span#subtitle
+ if(theme.social)
+ #site_social_icons
+ !=fragment_cache('social', function(){return partial('includes/header/social')})
+ #scroll-down
+ i.fas.fa-angle-down.scroll-down-effects
+ else
+ #page-site-info
+ h1#site-title=site_title
diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug
index 106c490..5787521 100644
--- a/layout/includes/layout.pug
+++ b/layout/includes/layout.pug
@@ -12,8 +12,7 @@ html(lang=config.language data-theme=theme.display_mode)
#body-wrap
if theme.background
- - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
- #web_bg(data-type=is_photo)
+ #web_bg
include ./sidebar.pug
include ./header/index.pug
@@ -33,9 +32,16 @@ html(lang=config.language data-theme=theme.display_mode)
else
block content
- - var footer_bg = theme.footer_bg == false ? '' : bg_img
- - var is_bg = theme.footer_bg == false ? 'color' : 'photo'
- footer#footer(style=footer_bg data-type=is_bg)
+ - var footerBg = theme.footer_bg
+ if (footerBg)
+ if (footerBg === true)
+ - var footer_bg = bg_img
+ else
+ - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url(${url_for(footerBg)})` : `background: ${footerBg}`
+ else
+ - var footer_bg = ''
+
+ footer#footer(style=footer_bg)
!=partial('includes/footer', {}, {cache:theme.fragment_cache})
include ./rightside.pug
diff --git a/layout/includes/loading/loading-js.pug b/layout/includes/loading/loading-js.pug
index 93054c5..6bf7f2d 100644
--- a/layout/includes/loading/loading-js.pug
+++ b/layout/includes/loading/loading-js.pug
@@ -1,6 +1,13 @@
script.
- var endLoading = function () {
- document.body.style.overflow = 'auto';
- document.getElementById('loading-box').classList.add("loaded")
+ var preloader = {
+ endLoading: () => {
+ document.body.style.overflow = 'auto';
+ document.getElementById('loading-box').classList.add("loaded")
+ },
+ initLoading: () => {
+ document.body.style.overflow = '';
+ document.getElementById('loading-box').classList.remove("loaded")
+
+ }
}
- window.addEventListener('load',endLoading)
\ No newline at end of file
+ window.addEventListener('load',()=> {preloader.endLoading()})
\ No newline at end of file
diff --git a/layout/includes/mixins/post-ui.pug b/layout/includes/mixins/post-ui.pug
index 51543c6..7748b8e 100644
--- a/layout/includes/mixins/post-ui.pug
+++ b/layout/includes/mixins/post-ui.pug
@@ -57,22 +57,25 @@ mixin postUI(posts)
span.article-meta__link #[='•']
//- Display the article introduction on homepage
- if theme.index_post_content.method == 1
- .content!= article.description
- else if theme.index_post_content.method == 2
- if article.description
+ case theme.index_post_content.method
+ when false
+ - break
+ when 1
.content!= article.description
- else
+ when 2
+ if article.description
+ .content!= article.description
+ else
+ - const content = strip_html(article.content)
+ - let expert = content.substring(0, theme.index_post_content.length)
+ - content.length > theme.index_post_content.length ? expert += ' ...' : ''
+ .content!= expert
+ default
- const content = strip_html(article.content)
- let expert = content.substring(0, theme.index_post_content.length)
- content.length > theme.index_post_content.length ? expert += ' ...' : ''
.content!= expert
- else
- - const content = strip_html(article.content)
- - let expert = content.substring(0, theme.index_post_content.length)
- - content.length > theme.index_post_content.length ? expert += ' ...' : ''
- .content!= expert
if theme.ad && theme.ad.index
if (index + 1) % 3 == 0
- .recent-post-item.ad_height!=theme.ad.index
+ .recent-post-item.ad-height!=theme.ad.index
diff --git a/layout/includes/page/artitalk.pug b/layout/includes/page/artitalk.pug
new file mode 100644
index 0000000..c5128bb
--- /dev/null
+++ b/layout/includes/page/artitalk.pug
@@ -0,0 +1,4 @@
+if top_img === false
+ h1.page-title= page.title
+
+#artitalk_main
\ No newline at end of file
diff --git a/layout/includes/page/categories.pug b/layout/includes/page/categories.pug
new file mode 100644
index 0000000..dbdc980
--- /dev/null
+++ b/layout/includes/page/categories.pug
@@ -0,0 +1,5 @@
+.category-lists
+ .category-title.is-center= _p('page.category')
+ | -
+ span.category-amount= site.categories.length
+ div!= list_categories()
\ No newline at end of file
diff --git a/layout/includes/page/default-page.pug b/layout/includes/page/default-page.pug
new file mode 100644
index 0000000..f995e44
--- /dev/null
+++ b/layout/includes/page/default-page.pug
@@ -0,0 +1,6 @@
+if theme.douban && theme.douban.meta && doubanExist
+ meta(name="referrer" content="no-referrer")
+#article-container
+ if top_img === false
+ h1.page-title= page.title
+ != page.content
\ No newline at end of file
diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug
new file mode 100644
index 0000000..48bcf32
--- /dev/null
+++ b/layout/includes/page/flink.pug
@@ -0,0 +1,19 @@
+.flink#article-container
+ if site.data.link
+ each i in site.data.link
+ if i.class_name
+ h2!= i.class_name
+ if i.class_desc
+ .flink-desc!=i.class_desc
+ .flink-list
+ each item in i.link_list
+ .flink-list-item
+ a(href=url_for(item.link) title=item.name target="_blank")
+ if theme.lazyload.enable
+ img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+ else
+ img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+ span.flink-item-name= item.name
+ span.flink-item-desc(title=item.descr)= item.descr
+ != page.content
+
diff --git a/layout/includes/page/tags.pug b/layout/includes/page/tags.pug
new file mode 100644
index 0000000..4d57e43
--- /dev/null
+++ b/layout/includes/page/tags.pug
@@ -0,0 +1,5 @@
+.tag-cloud-title.is-center= _p('page.tag')
+ | -
+ span.tag-cloud-amount= site.tags.length
+.tag-cloud-list.is-center
+ !=cloudTags({source: site.tags, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})
\ No newline at end of file
diff --git a/layout/includes/rightside.pug b/layout/includes/rightside.pug
index 8c53cee..f37a815 100644
--- a/layout/includes/rightside.pug
+++ b/layout/includes/rightside.pug
@@ -1,28 +1,31 @@
section#rightside
#rightside-config-hide
- if is_post()
- if theme.readmode
- button#readmode(type="button" title=_p('rightside.readmode_title'))
- i.fas.fa-book-open
- if theme.translate && theme.translate.enable
+ if is_post() && theme.readmode
+ button#readmode(type="button" title=_p('rightside.readmode_title'))
+ i.fas.fa-book-open
+ if theme.translate.enable
button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
if theme.darkmode.enable && theme.darkmode.button
button#darkmode(type="button" title=_p('rightside.night_mode_title'))
i.fas.fa-adjust
#rightside-config-show
- button#rightside_config(type="button" title=_p("rightside.setting"))
- i.fas.fa-cog
- if is_post() && page.comments !== false && theme.comments.use
- a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
- i.fas.fa-comments
- if showToc
- button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
- i.fas.fa-list-ul
+ if is_post()
+ if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button))
+ button#rightside_config(type="button" title=_p("rightside.setting"))
+ i.fas.fa-cog
+ if commentsJsLoad
+ a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+ i.fas.fa-comments
+ if showToc
+ button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
+ i.fas.fa-list-ul
+ else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button)
+ button#rightside_config(type="button" title=_p("rightside.setting"))
+ i.fas.fa-cog
+
if theme.chat_btn
button#chat_btn(type="button" title=_p("rightside.chat_btn"))
i.fas.fa-sms
button#go-up(type="button" title=_p("rightside.back_to_top"))
- i.fas.fa-arrow-up
-
-
+ i.fas.fa-arrow-up
\ No newline at end of file
diff --git a/layout/includes/third-party/artitalk.pug b/layout/includes/third-party/artitalk.pug
new file mode 100644
index 0000000..40490fb
--- /dev/null
+++ b/layout/includes/third-party/artitalk.pug
@@ -0,0 +1,24 @@
+- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
+
+script.
+ (()=>{
+ let setting = {
+ appId: '!{theme.artitalk.appId}',
+ appKey: '!{theme.artitalk.appKey}',
+ }
+
+ if (!{Boolean(option)}) {
+ const otherSetting = !{option}
+ setting = Object.assign({}, setting, otherSetting)
+ }
+
+ const init = () => {
+ new Artitalk(setting)
+ }
+
+ if (typeof Artitalk === 'function') {
+ init()
+ } else {
+ $.getScript('!{theme.CDN.artitalk}',init)
+ }
+ })()
\ No newline at end of file
diff --git a/layout/includes/third-party/baidu_push.pug b/layout/includes/third-party/baidu_push.pug
new file mode 100644
index 0000000..13faf11
--- /dev/null
+++ b/layout/includes/third-party/baidu_push.pug
@@ -0,0 +1,15 @@
+if theme.baidu_push
+ script.
+ (function(){
+ const bp = document.createElement('script');
+ const curProtocol = window.location.protocol.split(':')[0];
+ if (curProtocol === 'https'){
+ bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
+ }
+ else{
+ bp.src = 'http://push.zhanzhang.baidu.com/push.js';
+ }
+ bp.dataset.pjax = ''
+ const s = document.getElementsByTagName("script")[0];
+ s.parentNode.insertBefore(bp, s);
+ })()
\ No newline at end of file
diff --git a/layout/includes/third-party/comments/valine.pug b/layout/includes/third-party/comments/valine.pug
index f2bf9e9..ac7e3d1 100644
--- a/layout/includes/third-party/comments/valine.pug
+++ b/layout/includes/third-party/comments/valine.pug
@@ -5,7 +5,7 @@ if site.data.valine
script.
function loadValine () {
function initValine () {
- window.valine = new Valine({
+ const initData = {
el: '#vcomment',
appId: '#{theme.valine.appId}',
appKey: '#{theme.valine.appKey}',
@@ -20,8 +20,13 @@ script.
emojiMaps: !{emojiMaps},
enableQQ: #{theme.valine.enableQQ},
path: window.location.pathname,
- });
- if ('#{theme.valine.requiredFields}') { valine.config.requiredFields= '#{theme.valine.requiredFields}'.split(',') }
+ }
+
+ if (!{Boolean(theme.valine.requiredFields)}) {
+ initData.requiredFields= ('!{theme.valine.requiredFields}'.split(','))
+ }
+
+ const valine = new Valine(initData)
}
if (typeof Valine === 'function') initValine()
diff --git a/layout/includes/third-party/effect.pug b/layout/includes/third-party/effect.pug
index 0a6d527..9cd4051 100644
--- a/layout/includes/third-party/effect.pug
+++ b/layout/includes/third-party/effect.pug
@@ -1,14 +1,13 @@
if theme.fireworks && theme.fireworks.enable
- canvas.fireworks
- script(src=url_for(theme.CDN.anime))
+ canvas.fireworks(mobile=`${theme.fireworks.mobile}`)
script(src=url_for(theme.CDN.fireworks))
if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`)
-if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
- script(defer id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao))
+if (theme.canvas_fluttering_ribbon && theme.canvas_fluttering_ribbon.enable)
+ script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.CDN.canvas_fluttering_ribbon))
if (theme.canvas_nest && theme.canvas_nest.enable)
script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest))
@@ -18,11 +17,12 @@ if theme.activate_power_mode.enable
script.
POWERMODE.colorful = !{theme.activate_power_mode.colorful};
POWERMODE.shake = !{theme.activate_power_mode.shake};
+ POWERMODE.mobile = !{theme.activate_power_mode.mobile};
document.body.addEventListener('input', POWERMODE);
//- 鼠標特效
-if theme.click_heart
- script(src=url_for(theme.CDN.click_heart) async)
+if theme.click_heart && theme.click_heart.enable
+ script#click-heart(src=url_for(theme.CDN.click_heart) async mobile=`${theme.click_heart.mobile}`)
if theme.ClickShowText && theme.ClickShowText.enable
- script(src=url_for(theme.CDN.ClickShowText) async)
+ script#click-show-text(src=url_for(theme.CDN.ClickShowText) async mobile=`${theme.ClickShowText.mobile}`)
diff --git a/layout/includes/third-party/newest-comments/disqus-comment.pug b/layout/includes/third-party/newest-comments/disqus-comment.pug
index 334f352..5ed18db 100644
--- a/layout/includes/third-party/newest-comments/disqus-comment.pug
+++ b/layout/includes/third-party/newest-comments/disqus-comment.pug
@@ -28,6 +28,9 @@ script.
// set expiry to 10 min
saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
generateHtml(disqusArray)
+ }).fail(()=>{
+ const $dom = document.querySelector('#card-newest-comments .aside-list')
+ $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
})
}
@@ -38,7 +41,7 @@ script.
result += ''
if (!{theme.newest_comments.avatar}) {
- result += `
`
+ result += `
`
}
result += `
@@ -47,13 +50,13 @@ script.
'
if (!{theme.newest_comments.avatar}) {
- result += `
`
+ result += `
`
}
result += `
@@ -46,13 +49,13 @@ script.
'
if (!{theme.newest_comments.avatar}) {
- result += `
})
`
+ result += `
`
}
result += `
@@ -37,58 +37,59 @@ script.
${hexo.render.renderSync({ text: content, engine: 'markdown' })}
`
+ const styleConfig = hexo.theme.config.note.style
+ const lastArgs = args[args.length - 1]
+ if (!(lastArgs === 'flat' || lastArgs === 'modern' || lastArgs === 'simple' || lastArgs === 'disabled')) {
+ args.push(styleConfig)
+ }
+
+ let icon = ''
+ const iconArray = args[args.length - 2]
+ if (iconArray && iconArray.startsWith('fa')) {
+ icon = ``
+ args[args.length - 2] = 'icon'
+ }
+
+ return `${icon + hexo.render.renderSync({ text: content, engine: 'markdown' })}
`
}
hexo.extend.tag.register('note', postNote, { ends: true })
diff --git a/source/css/_global/function.styl b/source/css/_global/function.styl
index 2b2bc62..d404aa7 100644
--- a/source/css/_global/function.styl
+++ b/source/css/_global/function.styl
@@ -45,31 +45,189 @@ minWidth2000()
@media screen and (min-width: 2000px)
{block}
-[data-theme='light']
- --global-bg: $body-bg
- --font-color: $font-black
- --hr-border: lighten($theme-hr-color, 50%)
- --hr-before-color: lighten($theme-hr-color, 30%)
- --search-bg: $search-bg
- --search-input-color: $search-input-color
- --search-result-title: $search-result-title
- --preloader-bg: $preloader-bg
- --preloader-color: $preloader-word-color
- --tab-border-color: $tab-border-color
- --tab-botton-bg: $tab-botton-bg
- --tab-botton-color: $tab-botton-color
- --tab-button-hover-bg: $tab-button-hover-bg
- --tab-button-active-bg: $tab-button-active-bg
- --card-bg: $card-bg
- --sidebar-bg: $sidebar-background
- --btn-hover-color: $button-hover-color
- --btn-color: $button-color
- --btn-bg: $button-bg
- --text-bg-hover: $text-bg-hover
- --light-grey: $light-grey
- --white: $white
- --text-highlight-color: $text-highlight-color
- --blockquote-color: $blockquote-color
- --blockquote-bg: $blockquote-background-color
- --reward-pop: $reward-pop-up-bg
- --sidebar-icon-color: $sidebar-icon-color
\ No newline at end of file
+// animation
+if hexo-config('enter_transitions')
+ #content-inner,
+ #footer
+ animation: main 1s
+
+ #page-header
+ animation: header-effect 1s
+
+ #site-title,
+ #site-subtitle
+ animation: titlescale 1s
+
+ #nav.show
+ animation: headerNoOpacity 1s
+
+ canvas:not(#ribbon-canvas),
+ #web_bg
+ animation: to_show 4s
+
+ #ribbon-canvas
+ animation: ribbon_to_show 4s
+
+ .tocOpenPc
+ .sidebar-toc__title
+ animation: tocsidebarLtoR .5s
+
+ .sidebar-toc__progress
+ animation: tocsidebarLtoR .7s
+
+ .sidebar-toc__content
+ animation: tocsidebarLtoR .9s
+
+ .tocOpenMobile
+ .sidebar-toc__title
+ animation: tocsidebarRtoL .4s
+
+ .sidebar-toc__progress
+ animation: tocsidebarRtoL .6s
+
+ .sidebar-toc__content
+ animation: tocsidebarRtoL .7s
+
+ #mobile-sidebar-menus
+ &.open
+ for i in 1 2 3 4
+ > :nth-child({i})
+ animation: sidebarItem (i / 5)s
+
+.card-announcement-animation
+ color: #FF0000
+ animation: announ_animation .8s linear infinite
+
+.scroll-down-effects
+ animation: scroll-down-effect 1.5s infinite
+
+if hexo-config('avatar.effect') == true
+ .avatar-img
+ animation: avatar_turn_around 2s linear infinite
+
+.reward-main
+ animation: donate_effcet .3s .1s ease both
+
+@keyframes scroll-down-effect
+ 0%
+ top: 0
+ opacity: .4
+
+ 50%
+ top: -16px
+ opacity: 1
+
+ 100%
+ top: 0
+ opacity: .4
+
+@keyframes header-effect
+ 0%
+ opacity: 0
+ transform: translateY(-50px)
+
+ 100%
+ opacity: 1
+ transform: translateY(0)
+
+@keyframes headerNoOpacity
+ 0%
+ transform: translateY(-50px)
+
+ 100%
+ transform: translateY(0)
+
+@keyframes main
+ 0%
+ opacity: 0
+ transform: translateY(50px)
+
+ 100%
+ opacity: 1
+ transform: translateY(0)
+
+@keyframes titlescale
+ 0%
+ opacity: 0
+ transform: scale(.7)
+
+ 100%
+ opacity: 1
+ transform: scale(1)
+
+@keyframes search_close
+ 0%
+ opacity: 1
+ transform: scale(1)
+
+ 100%
+ opacity: 0
+ transform: scale(.7)
+
+@keyframes to_show
+ 0%
+ opacity: 0
+
+ 100%
+ opacity: 1
+
+@keyframes ribbon_to_show
+ 0%
+ opacity: 0
+
+ 100%
+ opacity: hexo-config('canvas_ribbon.alpha')
+
+@keyframes avatar_turn_around
+ from
+ transform: rotate(0)
+
+ to
+ transform: rotate(360deg)
+
+@keyframes sub_menus
+ 0%
+ opacity: 0
+ transform: translateY(10px)
+
+ 100%
+ opacity: 1
+ transform: translateY(0)
+
+@keyframes donate_effcet
+ 0%
+ opacity: 0
+ transform: translateY(-20px)
+
+ 100%
+ opacity: 1
+ transform: translateY(0)
+
+@keyframes announ_animation
+ 0%,
+ to
+ transform: scale(1)
+
+ 50%
+ transform: scale(1.2)
+
+@keyframes sidebarItem
+ 0%
+ transform: translateX(200px)
+
+ 100%
+ transform: translateX(0)
+
+@keyframes tocsidebarRtoL
+ 0%
+ transform: translateX(200px)
+
+ 100%
+ transform: translateX(0)
+
+@keyframes tocsidebarLtoR
+ 0%
+ transform: translateX(-200px)
+
+ 100%
+ transform: translateX(0)
\ No newline at end of file
diff --git a/source/css/_global/index.styl b/source/css/_global/index.styl
index b9a8ccf..0e24ddd 100644
--- a/source/css/_global/index.styl
+++ b/source/css/_global/index.styl
@@ -1,3 +1,32 @@
+[data-theme='light']
+ --global-bg: $body-bg
+ --font-color: $font-black
+ --hr-border: lighten($theme-hr-color, 50%)
+ --hr-before-color: lighten($theme-hr-color, 30%)
+ --search-bg: $search-bg
+ --search-input-color: $search-input-color
+ --search-result-title: $search-result-title
+ --preloader-bg: $preloader-bg
+ --preloader-color: $preloader-word-color
+ --tab-border-color: $tab-border-color
+ --tab-botton-bg: $tab-botton-bg
+ --tab-botton-color: $tab-botton-color
+ --tab-button-hover-bg: $tab-button-hover-bg
+ --tab-button-active-bg: $tab-button-active-bg
+ --card-bg: $card-bg
+ --sidebar-bg: $sidebar-background
+ --btn-hover-color: $button-hover-color
+ --btn-color: $button-color
+ --btn-bg: $button-bg
+ --text-bg-hover: $text-bg-hover
+ --light-grey: $light-grey
+ --white: $white
+ --text-highlight-color: $text-highlight-color
+ --blockquote-color: $blockquote-color
+ --blockquote-bg: $blockquote-background-color
+ --reward-pop: $reward-pop-up-bg
+ --sidebar-icon-color: $sidebar-icon-color
+
html
height: 100%
font-size: 20px
@@ -112,8 +141,8 @@ button
cursor: pointer
// font
-#page-header #site_title,
-#page-header #site_subtitle,
+#site-title,
+#site-subtitle,
#site-name,
#aside_content .author-info__name,
#aside_content .author-info__description
@@ -168,191 +197,6 @@ img:not([src])
.post-ad
margin: 2rem 0
-.ad_height
+.ad-height
display: block !important
- height: auto !important
-
-// animation
-#content-inner,
-#footer
- animation: main 1s
-
-#page-header
- animation: header-effect 1s
-
-#site_title,
-#site_subtitle
- animation: titlescale 1s
-
-canvas:not(#ribbon-canvas),
-#web_bg
- animation: to_show 4s
-
-#ribbon-canvas
- animation: ribbon_to_show 4s
-
-.card-announcement-animation
- color: #FF0000
- animation: announ_animation .8s linear infinite
-
-.scroll-down-effects
- animation: scroll-down-effect 1.5s infinite
-
-if hexo-config('avatar.effect') == true
- .avatar-img
- animation: avatar_turn_around 2s linear infinite
-
-.reward-main
- animation: donate_effcet .3s .1s ease both
-
-.tocOpenPc
- .sidebar-toc__title
- animation: tocsidebarLtoR .5s
-
- .sidebar-toc__progress
- animation: tocsidebarLtoR .7s
-
- .sidebar-toc__content
- animation: tocsidebarLtoR .9s
-
-.tocOpenMobile
- .sidebar-toc__title
- animation: tocsidebarRtoL .4s
-
- .sidebar-toc__progress
- animation: tocsidebarRtoL .6s
-
- .sidebar-toc__content
- animation: tocsidebarRtoL .7s
-
-#mobile-sidebar-menus
- &.open
- transform: translate3d(-100%, 0, 0)
-
- for i in 1 2 3 4
- > :nth-child({i})
- animation: sidebarItem (i / 5)s
-
-@keyframes scroll-down-effect
- 0%
- top: 0
- opacity: .4
-
- 50%
- top: -16px
- opacity: 1
-
- 100%
- top: 0
- opacity: .4
-
-@keyframes header-effect
- 0%
- opacity: 0
- transform: translateY(-50px)
-
- 100%
- opacity: 1
- transform: translateY(0)
-
-@keyframes headerNoOpacity
- 0%
- transform: translateY(-50px)
-
- 100%
- transform: translateY(0)
-
-@keyframes main
- 0%
- opacity: 0
- transform: translateY(50px)
-
- 100%
- opacity: 1
- transform: translateY(0)
-
-@keyframes titlescale
- 0%
- opacity: 0
- transform: scale(.7)
-
- 100%
- opacity: 1
- transform: scale(1)
-
-@keyframes search_close
- 0%
- opacity: 1
- transform: scale(1)
-
- 100%
- opacity: 0
- transform: scale(.7)
-
-@keyframes to_show
- 0%
- opacity: 0
-
- 100%
- opacity: 1
-
-@keyframes ribbon_to_show
- 0%
- opacity: 0
-
- 100%
- opacity: hexo-config('canvas_ribbon.alpha')
-
-@keyframes avatar_turn_around
- from
- transform: rotate(0)
-
- to
- transform: rotate(360deg)
-
-@keyframes sub_menus
- 0%
- opacity: 0
- transform: translateY(10px)
-
- 100%
- opacity: 1
- transform: translateY(0)
-
-@keyframes donate_effcet
- 0%
- opacity: 0
- transform: translateY(-20px)
-
- 100%
- opacity: 1
- transform: translateY(0)
-
-@keyframes announ_animation
- 0%,
- to
- transform: scale(1)
-
- 50%
- transform: scale(1.2)
-
-@keyframes sidebarItem
- 0%
- transform: translateX(200px)
-
- 100%
- transform: translateX(0)
-
-@keyframes tocsidebarRtoL
- 0%
- transform: translateX(200px)
-
- 100%
- transform: translateX(0)
-
-@keyframes tocsidebarLtoR
- 0%
- transform: translateX(-200px)
-
- 100%
- transform: translateX(0)
\ No newline at end of file
+ height: auto !important
\ No newline at end of file
diff --git a/source/css/_layout/aside.styl b/source/css/_layout/aside.styl
index 9604a38..eb007be 100644
--- a/source/css/_layout/aside.styl
+++ b/source/css/_layout/aside.styl
@@ -150,6 +150,7 @@
& > time,
& > .name
+ display: block
color: $theme-meta-color
font-size: 85%
@@ -164,13 +165,8 @@
&:hover
color: $text-hover
- .card-recent-post
- .thumbnail
- border-radius: 0 !important
-
- .no-aside-cover
- title
- height: auto
+ &.no-cover
+ min-height: 4.4em
.card-archives ul.card-archive-list,
.card-categories ul.card-category-list
diff --git a/source/css/_layout/head.styl b/source/css/_layout/head.styl
index 9f30688..5d58619 100644
--- a/source/css/_layout/head.styl
+++ b/source/css/_layout/head.styl
@@ -2,7 +2,6 @@
position: relative
width: 100%
background-color: $light-blue
- background-attachment: scroll
background-position: center center
background-size: cover
background-repeat: no-repeat
@@ -19,14 +18,14 @@
padding: 0 .5rem
width: 100%
- #site_title,
- #site_subtitle,
- #scroll_down .scroll-down-effects
+ #site-title,
+ #site-subtitle,
+ #scroll-down .scroll-down-effects
text-align: center
text-shadow: .1rem .1rem .2rem rgba(0, 0, 0, .15)
line-height: 1.5
- #site_title
+ #site-title
margin: 0
color: var(--white)
font-size: 1.85em
@@ -34,7 +33,7 @@
+minWidth768()
font-size: 2.85em
- #site_subtitle
+ #site-subtitle
color: var(--light-grey)
font-size: 1.15em
@@ -57,7 +56,7 @@
font-size: 1.43em
cursor: pointer
- #scroll_down
+ #scroll-down
position: absolute
bottom: 0
width: 100%
@@ -76,7 +75,7 @@
+maxWidth768()
height: 14rem
- #page_site-info
+ #page-site-info
position: absolute
top: 10rem
padding: 0 .5rem
@@ -102,66 +101,101 @@
background-color: alpha($dark-black, .5)
content: ''
+ &.no-top-img
+ margin-bottom: .5rem
+ height: 60px
+ background: 0
+
+ #nav
+ background: rgba(255, 255, 255, .8)
+ box-shadow: 0 5px 6px -5px rgba(133, 133, 133, .6)
+
+ a
+ color: var(--font-color)
+ text-shadow: none
+
+ #post-info
+ position: absolute
+ bottom: 1.5rem
+ padding: 0 8%
+ width: 100%
+ text-align: left
+
+ +maxWidth768()
+ bottom: 1.1rem
+ padding: 0 1.1rem
+
+#post-info
+ #post-title
+ margin-bottom: .4rem
+ font-size: 2.15em
+
+ +maxWidth768()
+ font-size: 1.72em
+
+ .posttitle
+ @extend .limit-more-line
+ color: var(--white)
+ line-height: 1.5
+ -webkit-line-clamp: 3
+
+ #post-meta
+ color: var(--light-grey)
+ font-size: 95%
+
+ +minWidth768()
+ > .meta-secondline
+ > span:first-child
+ display: none
+
+ +maxWidth768()
+ font-size: 90%
+
+ > .meta-firstline,
+ > .meta-secondline
+ display: inline
+
+ .post-meta
+ &-separator
+ margin: 0 .25rem
+
+ &-icon
+ margin-right: .2rem
+
+ &-label
+ if hexo-config('post_meta.post.label')
+ margin-right: .2rem
+ else
+ display: none
+
+ a
+ color: var(--light-grey)
+ transition: all .3s ease-out
+
+ &:hover
+ color: $text-hover
+ text-decoration: underline
+
+ if hexo-config('post_meta.post.date_format') == 'relative'
+ time
+ display: none
+
+// for not top_img
+#post
+ & > #post-info
+ margin-bottom: 1.5rem
+
+ .posttitle
+ padding-bottom: .2rem
+ border-bottom: 1px solid var(--light-grey)
+ color: var(--text-highlight-color)
+
+[data-theme='light']
+ #post
#post-info
- position: absolute
- bottom: 1.5rem
- padding: 0 8%
- width: 100%
- text-align: left
-
- +maxWidth768()
- bottom: 1.1rem
- padding: 0 1.1rem
-
- #post-title
- margin-bottom: .4rem
- font-size: 2.15em
-
- +maxWidth768()
- font-size: 1.72em
-
- .posttitle
- @extend .limit-more-line
- color: var(--white)
- line-height: 1.5
- -webkit-line-clamp: 3
-
- #post-meta
- color: var(--light-grey)
- font-size: 95%
-
- +minWidth768()
- > .meta-secondline
- > span:first-child
- display: none
-
- +maxWidth768()
- font-size: 90%
-
- > .meta-firstline,
- > .meta-secondline
- display: inline
-
- .post-meta
- &-separator
- margin: 0 .25rem
-
- &-icon
- margin-right: .2rem
-
- &-label
- if hexo-config('post_meta.post.label')
- margin-right: .2rem
- else
- display: none
-
- a
- color: var(--light-grey)
- transition: all .3s ease-out
-
- &:hover
- color: $text-hover
- text-decoration: underline
+ #post-meta,
+ #post-meta a
+ color: #78818a
// css hack
// all browser in ios and safari in all apple device
@@ -191,6 +225,9 @@ _:future,
#menus
padding-right: 0 !important
+ &.show
+ opacity: 1
+
#blog_name
flex: 1
@@ -210,7 +247,7 @@ _:future,
&.fixed
position: fixed
- top: -62px
+ top: -60px
z-index: 91
background: rgba(255, 255, 255, .8)
box-shadow: 0 5px 6px -5px alpha($grey, .6)
diff --git a/source/css/_layout/loading.styl b/source/css/_layout/loading.styl
index 3319a9a..dc5d191 100644
--- a/source/css/_layout/loading.styl
+++ b/source/css/_layout/loading.styl
@@ -5,7 +5,6 @@ if hexo-config('preloader')
width: 50%
height: 100%
background-color: var(--preloader-bg)
- transition: all .5s
#loading-box
.loading-left-bg
@@ -53,9 +52,11 @@ if hexo-config('preloader')
&.loaded
.loading-left-bg
+ transition: all .5s
transform: translate(-100%, 0)
.loading-right-bg
+ transition: all .5s
transform: translate(100%, 0)
.spinner-box
diff --git a/source/css/_layout/mobile-sidebar.styl b/source/css/_layout/mobile-sidebar.styl
index 2c1970e..57a40eb 100644
--- a/source/css/_layout/mobile-sidebar.styl
+++ b/source/css/_layout/mobile-sidebar.styl
@@ -19,6 +19,9 @@
background: var(--sidebar-bg)
transition: all .5s
+ &.open
+ transform: translate3d(-100%, 0, 0)
+
& > .mobile_author_icon
padding: 1.3rem 1.5rem 0
text-align: center
diff --git a/source/css/_layout/third-party.styl b/source/css/_layout/third-party.styl
index 7a3014a..f4fa222 100644
--- a/source/css/_layout/third-party.styl
+++ b/source/css/_layout/third-party.styl
@@ -1,5 +1,5 @@
#vcomment
- font-size: 1.15em
+ font-size: 1.1em
.vbtn
border: none
@@ -13,6 +13,9 @@
textarea
background: url(hexo-config('valine.bg')) 100% 100% no-repeat
+ &:focus
+ background: none
+
.vimg
transition: all .3s
diff --git a/source/css/_mode/darkmode.styl b/source/css/_mode/darkmode.styl
index d7d4955..fc38a7b 100644
--- a/source/css/_mode/darkmode.styl
+++ b/source/css/_mode/darkmode.styl
@@ -1,49 +1,42 @@
if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
[data-theme='dark']
--global-bg: darken(#121212, 2)
- --font-color: alpha(#FFFFFF, .6)
- --hr-border: alpha(#FFFFFF, .3)
- --hr-before-color: alpha(#FFFFFF, .6)
+ --font-color: alpha(#FFFFFF, .7)
+ --hr-border: alpha(#FFFFFF, .4)
+ --hr-before-color: alpha(#FFFFFF, .7)
--search-bg: #121212
- --search-input-color: alpha(#FFFFFF, .6)
- --search-result-title: alpha(#FFFFFF, .8)
+ --search-input-color: alpha(#FFFFFF, .7)
+ --search-result-title: alpha(#FFFFFF, .9)
--preloader-bg: darken(#121212, 2)
- --preloader-color: alpha(#FFFFFF, .6)
+ --preloader-color: alpha(#FFFFFF, .7)
--tab-border-color: #2c2c2c
--tab-botton-bg: #2c2c2c
- --tab-botton-color: alpha(#FFFFFF, .6)
+ --tab-botton-color: alpha(#FFFFFF, .7)
--tab-button-hover-bg: lighten(#121212, 15)
--tab-button-active-bg: #121212
--card-bg: #121212
--sidebar-bg: #121212
--btn-hover-color: lighten(#121212, 40)
- --btn-color: alpha(#FFFFFF, .6)
+ --btn-color: alpha(#FFFFFF, .7)
--btn-bg: lighten(#121212, 5)
--text-bg-hover: lighten(#121212, 15)
- --light-grey: alpha(#FFFFFF, .6)
- --white: alpha(#FFFFFF, .8)
- --text-highlight-color: alpha(#FFFFFF, .8)
- --blockquote-color: alpha(#FFFFFF, .6)
+ --light-grey: alpha(#FFFFFF, .7)
+ --white: alpha(#FFFFFF, .9)
+ --text-highlight-color: alpha(#FFFFFF, .9)
+ --blockquote-color: alpha(#FFFFFF, .7)
--blockquote-bg: lighten(#121212, 10)
--reward-pop: lighten(#121212, 10)
- --sidebar-icon-color: alpha(#FFFFFF, .6)
+ --sidebar-icon-color: alpha(#FFFFFF, .7)
- // 網站背景，footer背景
- #web_bg[data-type=color],
- #footer[data-type=color]
- background: darken(#121212, 2)
-
- #web_bg[data-type=photo]:before,
- #footer[data-type=photo]:before
+ #web_bg:before,
+ #footer:before,
+ #page-header:before
position: absolute
width: 100%
height: 100%
background-color: alpha($dark-black, .7)
content: ''
- #page-header
- background-color: #121212
-
#article-container
code
background: #2c2c2c
@@ -57,27 +50,17 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
// 頭部
#page-header
- &:before
- position: absolute
- top: 0
- left: 0
- display: block
- width: 100%
- height: 100%
- background-color: alpha($dark-black, .7)
- content: ''
-
- & > #nav
- &.fixed
- background: alpha(#121212, .8)
- box-shadow: 0 5px 6px -5px rgba(133, 133, 133, 0)
+ & > #nav.fixed,
+ &.no-top-img #nav
+ background: alpha(#121212, .8)
+ box-shadow: 0 5px 6px -5px rgba(133, 133, 133, 0)
// 代碼框
#article-container
pre,
.highlight:not(.js-file-line-container)
background-color: lighten(#121212, 2) !important
- color: alpha(#FFFFFF, .6) !important
+ color: alpha(#FFFFFF, .7) !important
figure.highlight
box-shadow: none
@@ -87,7 +70,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
background: lighten(#121212, 5)
.line:before
- color: alpha(#FFFFFF, .6) !important
+ color: alpha(#FFFFFF, .7) !important
.hljs
background-color: lighten(#121212, 2) !important
@@ -105,12 +88,12 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
background: #2c2c2c !important
label
- filter: brightness(.7)
+ filter: brightness(.8)
// note
if hexo-config('note.style') == 'modern' || hexo-config('note.style') == 'flat'
.note
- filter: brightness(.7)
+ filter: brightness(.8)
// hide-tags
.hide-button,
@@ -122,7 +105,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
img,
.gist,
.aplayer
- filter: brightness(.7)
+ filter: brightness(.8)
#aside_content .aside-list > .aside-list-item:not(:last-child)
border-bottom: 1px dashed alpha(#FFFFFF, .1)
@@ -132,7 +115,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
#hexo-blog-encrypt
label,
input
- color: alpha(#FFFFFF, .6) !important
+ color: alpha(#FFFFFF, .7) !important
input
background-color: #121212
@@ -142,24 +125,30 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
filter: brightness(.8)
svg
- fill: alpha(#FFFFFF, .8) !important
+ fill: alpha(#FFFFFF, .9) !important
// Disqus and Disqusjs
#disqus_thread
#dsqjs
.dsqjs-tab-active,
.dsqjs-no-comment
- color: alpha(#FFFFFF, .6)
+ color: alpha(#FFFFFF, .7)
.dsqjs-order-label
background-color: lighten(#121212, 5)
.dsqjs-post-body
- color: alpha(#FFFFFF, .6)
+ color: alpha(#FFFFFF, .7)
code,
pre
background: #2c2c2c
blockquote
- color: alpha(#FFFFFF, .6)
+ color: alpha(#FFFFFF, .7)
+
+ #artitalk_main #lazy
+ background: #121212
+
+ #operare_artitalk .c2
+ background: #121212
\ No newline at end of file
diff --git a/source/css/_page/categories.styl b/source/css/_page/categories.styl
index 5591de4..4e2d9cb 100644
--- a/source/css/_page/categories.styl
+++ b/source/css/_page/categories.styl
@@ -1,14 +1,16 @@
-.category-content
+#page
.category-lists
padding: 1rem 0 1.5rem
+maxWidth768()
padding: 0
- .category__title
- text-align: center
+ .category-title
font-size: 2.57em
+ +maxWidth768()
+ font-size: 2em
+
.category-list
a
color: var(--font-color)
diff --git a/source/css/_page/common.styl b/source/css/_page/common.styl
index f101ffe..0a3189a 100644
--- a/source/css/_page/common.styl
+++ b/source/css/_page/common.styl
@@ -39,13 +39,12 @@
&:hover
box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
-+minWidth900()
- if hexo-config('aside.position') == 'left'
- #recent-posts,
- #page,
- .category-content,
- #archive,
- .tag-cloud,
- #tag,
- #category
- order: 2
\ No newline at end of file
+if hexo-config('aside.position') == 'left'
+ +minWidth900()
+ .layout_page
+ & > div:first-child
+ order: 2
+
+#page
+ h1.page-title
+ margin-top: .4rem
\ No newline at end of file
diff --git a/source/css/_layout/flink.styl b/source/css/_page/flink.styl
similarity index 100%
rename from source/css/_layout/flink.styl
rename to source/css/_page/flink.styl
diff --git a/source/css/_page/homepage.styl b/source/css/_page/homepage.styl
index 9aa5ed4..f9a293e 100644
--- a/source/css/_page/homepage.styl
+++ b/source/css/_page/homepage.styl
@@ -107,6 +107,10 @@
.fa-angle-right
margin: 0 .2rem
+ if hexo-config('post_meta.page.date_format') == 'relative'
+ time
+ display: none
+
a
color: $theme-meta-color
diff --git a/source/css/_page/tags.styl b/source/css/_page/tags.styl
index f3ff325..ff9ad43 100644
--- a/source/css/_page/tags.styl
+++ b/source/css/_page/tags.styl
@@ -1,14 +1,19 @@
.tag-cloud
- text-align: center
+ &-list
+ a
+ display: inline-block
+ padding: 0 .4rem
+ transition: all .3s
- a
- display: inline-block
- padding: 0 .4rem
- transition: all .3s
+ &:hover
+ color: $text-hover !important
+ transform: scale(1.1)
- &:hover
- color: $text-hover !important
- transform: scale(1.1)
+ +maxWidth768()
+ zoom: .85
- &__title
+ &-title
font-size: 2.57em
+
+ +maxWidth768()
+ font-size: 2em
diff --git a/source/css/_tags/button.styl b/source/css/_tags/button.styl
index 17ebd64..79cceed 100644
--- a/source/css/_tags/button.styl
+++ b/source/css/_tags/button.styl
@@ -32,9 +32,9 @@
&:hover
text-decoration: none
- for $type in $btn-types
+ for $type in $tagsP-types
&.{$type}
- background-color: lookup('$btn-' + $type + '-color')
+ background-color: lookup('$tagsP-' + $type + '-color')
&.outline
border: 1px solid transparent
@@ -49,10 +49,10 @@
&:hover
color: white !important
- for $type in $btn-types
+ for $type in $tagsP-types
&.{$type}
- border-color: lookup('$btn-' + $type + '-color')
- color: lookup('$btn-' + $type + '-color')
+ border-color: lookup('$tagsP-' + $type + '-color')
+ color: lookup('$tagsP-' + $type + '-color')
&.button--animated:before
- background: lookup('$btn-' + $type + '-color')
+ background: lookup('$tagsP-' + $type + '-color')
diff --git a/source/css/_tags/note.styl b/source/css/_tags/note.styl
index d0270ac..cb5d899 100644
--- a/source/css/_tags/note.styl
+++ b/source/css/_tags/note.styl
@@ -1,28 +1,51 @@
.note
$note-icons = hexo-config('note.icons')
- $note-style = hexo-config('note.style')
position: relative
margin: 0 0 1rem
padding: 15px
- if ($note-style == 'simple')
+ if hexo-config('note.border_radius') is a 'unit'
+ border-radius: unit(hexo-config('note.border_radius'), px)
+
+ &.icon
+ padding-left: 2.25rem
+
+ & > .note-icon
+ position: absolute
+ top: calc(50% - .4rem)
+ left: .7rem
+ font-size: larger
+
+ for $type in $tagsP-types
+ &.{$type}
+ &:not(.disabled)
+ border-left-color: lookup('$tagsP-' + $type + '-color') !important
+
+ &.modern
+ border-left-color: transparent !important
+ color: lookup('$tagsP-' + $type + '-color')
+
+ &:not(.simple)
+ background: lighten(lookup('$tagsP-' + $type + '-color'), 85%) !important
+
+ & > .note-icon
+ color: lookup('$tagsP-' + $type + '-color')
+
+ &.simple
border: 1px solid #EEEEEE
border-left-width: 5px
- if ($note-style == 'modern')
- border: 1px solid transparent
+ &.modern
+ border: 1px solid transparent !important
background-color: #f5f5f5
color: $font-black
- if ($note-style == 'flat')
+ &.flat
border: initial
border-left: 5px solid #EEEEEE
background-color: lighten(#EEEEEE, 65%)
color: $font-black
- if hexo-config('note.border_radius') is a 'unit'
- border-radius: unit(hexo-config('note.border_radius'), px)
-
h2,
h3,
h4,
@@ -52,21 +75,21 @@
if $note-icons
&:not(.no-icon)
- padding-left: 45px
+ padding-left: 2.25rem
&::before
position: absolute
- top: 13px
- left: 15px
+ top: calc(50% - .8rem)
+ left: .7rem
font-size: larger
@extend .fontawesomeIcon
for $type in $note-types
&.{$type}
- if ($note-style == 'flat')
+ &.flat
background: lookup('$note-' + $type + '-bg')
- if ($note-style == 'modern')
+ &.modern
border-color: lookup('$note-modern-' + $type + '-border')
background: lookup('$note-modern-' + $type + '-bg')
color: lookup('$note-modern-' + $type + '-text')
@@ -78,7 +101,7 @@
&:hover
color: lookup('$note-modern-' + $type + '-hover')
- if ($note-style != 'modern')
+ &:not(.modern)
border-left-color: lookup('$note-' + $type + '-border')
h2,
@@ -89,8 +112,10 @@
color: lookup('$note-' + $type + '-text')
if $note-icons
- &:not(.no-icon)::before
- content: lookup('$note-' + $type + '-icon')
+ &:not(.no-icon)
+ &::before
+ content: lookup('$note-' + $type + '-icon')
- if ($note-style != 'modern')
- color: lookup('$note-' + $type + '-text')
+ &:not(.modern)
+ &::before
+ color: lookup('$note-' + $type + '-text')
diff --git a/source/css/var.styl b/source/css/var.styl
index 57a94d6..f0ac7ce 100644
--- a/source/css/var.styl
+++ b/source/css/var.styl
@@ -32,7 +32,7 @@ $code-font-size = hexo-config('font.code-font-size') ? convert(hexo-config('font
$font-color = #1F2D3D
$rem = 20px
$text-line-height = 2
-$web-bg = hexo-config('background') && convert(hexo-config('background'))
+$web-bg = hexo-config('background') && unquote(hexo-config('background'))
$index_top_img_height = hexo-config('index_top_img_height') ? convert(hexo-config('index_top_img_height')) : 100vh
$index_site_info_top = hexo-config('index_site_info_top') ? convert(hexo-config('index_site_info_top')) : 43%
// Global color & SVG
@@ -160,16 +160,16 @@ $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%)
-// Tag Plugins - Button
-$btn-types = 'blue' 'pink' 'red' 'purple' 'orange' 'green'
+// Tag Plugins - Button/note
+$tagsP-types = 'blue' 'pink' 'red' 'purple' 'orange' 'green'
$btn-color = #fff
$btn-default-color = #777
-$btn-blue-color = #428bca
-$btn-pink-color = #FF69B4
-$btn-red-color = #FF0000
-$btn-orange-color = #FF8C00
-$btn-purple-color = #6f42c1
-$btn-green-color = #5cb85c
+$tagsP-blue-color = #428bca
+$tagsP-pink-color = #FF69B4
+$tagsP-red-color = #FF0000
+$tagsP-orange-color = #FF8C00
+$tagsP-purple-color = #6f42c1
+$tagsP-green-color = #5cb85c
// Tag Plugins - Tab
$tab-border-color = #f0f0f0
$tab-botton-bg = #f0f0f0
diff --git a/source/js/main.js b/source/js/main.js
index 1cb4463..7297f0a 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -29,7 +29,7 @@ $(function () {
const initAdjust = () => {
if (window.innerWidth < 768) adjustMenu(0)
else adjustMenu(2)
- $('#nav').css({ opacity: '1', animation: 'headerNoOpacity 1s' })
+ $('#nav').addClass('show')
}
/**
@@ -159,14 +159,18 @@ $(function () {
})
const mql = window.matchMedia('(max-width: 1024px)')
- mql.addListener((ev) => {
+ const $toggleSidebar = $('#toggle-sidebar')
+ const matchFn = (ev) => {
if (ev.matches) {
if ($sidebar.hasClass('tocOpenPc')) closeSidebar()
} else {
- if ($('#toggle-sidebar').hasClass('on')) openSidebar()
+ if ($toggleSidebar.hasClass('on')) openSidebar()
if ($mobileTocButton.hasClass('open')) closeMobileSidebar('toc')
}
- })
+ }
+
+ mql.addListener(matchFn)
+ document.addEventListener('pjax:send', () => { mql.removeListener(matchFn) })
// toc元素點擊
$sidebar.find('.toc-link').on('click', function (e) {
@@ -182,7 +186,7 @@ $(function () {
* 首頁top_img底下的箭頭
*/
const scrollDownInIndex = () => {
- $('#scroll_down').on('click', function () {
+ $('#scroll-down').on('click', function () {
btf.scrollToDest('#content-inner')
})
}
@@ -345,9 +349,7 @@ $(function () {
* fancybox和 mediumZoom
*/
const addLightBox = function () {
- const isMediumZoom = GLOBAL_CONFIG.medium_zoom
- const isFancybox = GLOBAL_CONFIG.fancybox
- if (isFancybox) {
+ if (GLOBAL_CONFIG.lightbox === 'fancybox') {
const images = $('#article-container img:not(.gallery-group-img)').not($('a>img'))
images.each(function (i, o) {
const lazyloadSrc = $(o).attr('data-lazy-src') ? $(o).attr('data-lazy-src') : $(o).attr('src')
@@ -363,7 +365,7 @@ $(function () {
buttons: ['slideShow', 'fullScreen', 'thumbs', 'close'],
hash: false
})
- } else if (isMediumZoom) {
+ } else {
const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a)>img'))
zoom.on('open', function (event) {
const photoBg = $(document.documentElement).attr('data-theme') === 'dark' ? '#121212' : '#fff'
@@ -425,14 +427,18 @@ $(function () {
* toc
*/
const tocFn = function () {
- $('.toc-child').hide()
+ const $sidebar = $('#sidebar')
+ const $tocChild = $sidebar.find('.toc-child')
+ const $tocLink = $sidebar.find('.toc-link')
+ const $article = $('#article-container')
+
+ $tocChild.hide()
// main of scroll
$(window).scroll(btf.throttle(function (event) {
const currentTop = $(this).scrollTop()
scrollPercent(currentTop)
findHeadPosition(currentTop)
- autoScrollToc(currentTop)
}, 100))
// expand toc-item
@@ -444,18 +450,17 @@ $(function () {
}
const scrollPercent = function (currentTop) {
- const $dom = $('#article-container')
- const docHeight = $dom.height()
+ const docHeight = $article.height()
const winHeight = $(window).height()
- const headerHeight = $dom.offset().top
+ const headerHeight = $article.offset().top
const contentMath = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight)
const scrollPercent = (currentTop - headerHeight) / (contentMath)
const scrollPercentRounded = Math.round(scrollPercent * 100)
const percentage = (scrollPercentRounded > 100) ? 100
: (scrollPercentRounded <= 0) ? 0
: scrollPercentRounded
- $('#sidebar .progress-num').text(percentage)
- $('#sidebar .sidebar-toc__progress-bar').animate({
+ $sidebar.find('.progress-num').text(percentage)
+ $sidebar.find('.sidebar-toc__progress-bar').animate({
width: percentage + '%'
}, 100)
}
@@ -468,19 +473,32 @@ $(function () {
}
}
+ const autoScrollToc = function (currentTop, item) {
+ const activePosition = item.offset().top
+ const $tocContent = $sidebar.find('.sidebar-toc__content')
+ const sidebarScrollTop = $tocContent.scrollTop()
+ if (activePosition > (currentTop + $(window).height() - 100)) {
+ $tocContent.scrollTop(sidebarScrollTop + 100)
+ }
+ if (activePosition < currentTop + 100) {
+ $tocContent.scrollTop(sidebarScrollTop - 100)
+ }
+ }
+
// find head position & add active class
// DOM Hierarchy:
// ol.toc > (li.toc-item, ...)
// li.toc-item > (a.toc-link, ol.toc-2child > (li.toc-item, ...))
const versionBiggerFive = GLOBAL_CONFIG.hexoversion.split('.')[0] >= 5
+ const list = $article.find('h1,h2,h3,h4,h5,h6')
+
const findHeadPosition = function (top) {
// assume that we are not in the post page if no TOC link be found,
// thus no need to update the status
- if ($('.toc-link').length === 0) {
+ if ($tocLink.length === 0) {
return false
}
- const list = $('#article-container').find('h1,h2,h3,h4,h5,h6')
let currentId = ''
list.each(function () {
const head = $(this)
@@ -491,18 +509,19 @@ $(function () {
})
if (currentId === '') {
- $('.toc-link').removeClass('active')
- $('.toc-child').hide()
+ $tocLink.removeClass('active')
+ $tocChild.hide()
}
- const currentActive = $('.toc-link.active')
+ const currentActive = $tocLink.filter('.active')
if (currentId && currentActive.attr('href') !== currentId) {
if (isAnchor) updateAnchor(currentId)
- $('.toc-link').removeClass('active')
+ $tocLink.removeClass('active')
- const _this = $('.toc-link[href="' + currentId + '"]')
+ const _this = $tocLink.filter('[href="' + currentId + '"]')
_this.addClass('active')
+ autoScrollToc(top, _this)
const parents = _this.parents('.toc-child')
// Returned list is in reverse order of the DOM elements
@@ -518,19 +537,6 @@ $(function () {
.find('.toc-child').hide()
}
}
-
- const autoScrollToc = function (currentTop) {
- if ($('.toc-link').hasClass('active')) {
- const activePosition = $('.active').offset().top
- const sidebarScrollTop = $('#sidebar .sidebar-toc__content').scrollTop()
- if (activePosition > (currentTop + $(window).height() - 100)) {
- $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrollTop + 100)
- }
- if (activePosition < currentTop + 100) {
- $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrollTop - 100)
- }
- }
- }
}
/**
@@ -650,22 +656,6 @@ $(function () {
})
}
- /**
- * 百度推送
- */
- const pushToBaidu = () => {
- const bp = document.createElement('script')
- const curProtocol = window.location.protocol.split(':')[0]
- if (curProtocol === 'https') {
- bp.src = 'https://zz.bdstatic.com/linksubmit/push.js'
- } else {
- bp.src = 'http://push.zhanzhang.baidu.com/push.js'
- }
- bp.dataset.pjax = ''
- const s = document.getElementsByTagName('script')[0]
- s.parentNode.insertBefore(bp, s)
- }
-
/**
* tag-hide
*/
@@ -719,20 +709,19 @@ $(function () {
const $cardCategory = $('#aside-cat-list .card-category-list-item.parent i')
$cardCategory.on('click', function (e) {
e.preventDefault()
- const $this = $(this)
- $this.toggleClass('expand')
- $this.parents('.parent').next().toggle()
+ $(this).toggleClass('expand').parents('.parent').next().slideToggle(300)
})
}
const switchComments = function () {
let switchDone = false
$('#switch-comments-btn').on('click', function () {
- $('#post-comment > .comment-wrap > div').each(function () {
- if ($(this).is(':visible')) {
- $(this).hide()
+ $('#post-comment > .comment-wrap > div').each(function (i, o) {
+ const $this = $(o)
+ if ($this.is(':visible')) {
+ $this.hide()
} else {
- $(this).css({
+ $this.css({
display: 'block',
animation: 'tabshow .5s'
})
@@ -766,6 +755,14 @@ $(function () {
})
}
+ const relativeDate = function (selector) {
+ selector.each((i, o) => {
+ const $this = $(o)
+ const timeVal = $this.attr('datetime')
+ $this.text(btf.diffDate(timeVal, true)).css('display', 'inline')
+ })
+ }
+
const unRefreshFn = function () {
$(window).on('resize', function () {
if (window.innerWidth < 768) adjustMenu(0)
@@ -776,7 +773,6 @@ $(function () {
clickFnOfSubMenu()
GLOBAL_CONFIG.islazyload && lazyloadImg()
GLOBAL_CONFIG.copyright !== undefined && addCopyright()
- GLOBAL_CONFIG.baiduPush && pushToBaidu()
}
window.refreshFn = function () {
@@ -787,6 +783,12 @@ $(function () {
toggleSidebar()
GLOBAL_CONFIG_SITE.isSidebar && tocFn()
GLOBAL_CONFIG.noticeOutdate !== undefined && addPostOutdateNotice()
+ GLOBAL_CONFIG.relativeDate.post && relativeDate($('#post-meta time'))
+ } else {
+ GLOBAL_CONFIG.relativeDate.homepage && relativeDate($('#recent-posts time'))
+ GLOBAL_CONFIG.runtime && addRuntime()
+ addLastPushDate()
+ toggleCardCategory()
}
sidebarFn()
@@ -794,15 +796,12 @@ $(function () {
GLOBAL_CONFIG.highlight && addHighlightTool()
GLOBAL_CONFIG.isPhotoFigcaption && addPhotoFigcaption()
runJustifiedGallery()
- addLightBox()
+ GLOBAL_CONFIG.lightbox !== 'null' && addLightBox()
scrollFn()
- GLOBAL_CONFIG.runtime && addRuntime()
- addLastPushDate()
addTableWrap()
clickFnOfTagHide()
tabsFn.clickFnOfTabs()
tabsFn.backToTop()
- toggleCardCategory()
switchComments()
}
diff --git a/source/js/search/local-search.js b/source/js/search/local-search.js
index b23f1f2..a760e6c 100644
--- a/source/js/search/local-search.js
+++ b/source/js/search/local-search.js
@@ -85,7 +85,7 @@ $(function () {
}
let dataTitle = data.title.trim().toLowerCase()
const dataContent = data.content.trim().replace(/<[^>]+>/g, '').toLowerCase()
- const dataUrl = data.url
+ const dataUrl = data.url.startsWith('/') ? data.url : GLOBAL_CONFIG.root + data.url
let indexTitle = -1
let indexContent = -1
let firstOccur = -1
diff --git a/source/js/third-party/ClickShowText.js b/source/js/third-party/ClickShowText.js
deleted file mode 100644
index d17ac76..0000000
--- a/source/js/third-party/ClickShowText.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function co(){
- var colorElements = "0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f";
- var colorArray = colorElements.split(",");
- var color ="#";
- for(var i =0;i<6;i++){
- color+=colorArray[Math.floor(Math.random()*16)];
- }
- return color;
-};
-var a_idx = 0;
-jQuery(document).ready(function($) {
- $("body").click(function (e) {
-
- var config = GLOBAL_CONFIG.ClickShowText;
-
- /*这个数组中的每一个字符是你要浮动显示的词或句子，每次点击鼠标后按顺序出现*/
- var a = config.text.split(",");
- var $i = $("").text(a[a_idx]);
- a_idx = (a_idx + 1) % a.length;
- var x = e.pageX,
- y = e.pageY;
- $i.css({
- "z-index": 150,
- "top": y - 20,
- "left": x -40,
- "position": "absolute",
- "font-weight": "bold",
- "color": co(),
- "cursor": "default",
- "font-size": config.fontSize || "inherit"
- });
- $("body").append($i);
- $i.animate({
- "top": y - 180,
- "opacity": 0
- },
- 1500,
- function() {
- $i.remove();
- });
-});
-});
\ No newline at end of file
diff --git a/source/js/third-party/activate-power-mode.js b/source/js/third-party/activate-power-mode.js
deleted file mode 100644
index 975190b..0000000
--- a/source/js/third-party/activate-power-mode.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.POWERMODE=e():t.POWERMODE=e()}(this,(function(){return function(t){var e={};function o(n){if(e[n])return e[n].exports;var r=e[n]={exports:{},id:n,loaded:!1};return t[n].call(r.exports,r,r.exports,o),r.loaded=!0,r.exports}return o.m=t,o.c=e,o.p="",o(0)}([function(t,e,o){"use strict";var n=document.createElement("canvas");n.width=window.innerWidth,n.height=window.innerHeight,n.style.cssText="position:fixed;top:0;left:0;pointer-events:none;z-index:999999",window.addEventListener("resize",(function(){n.width=window.innerWidth,n.height=window.innerHeight})),document.body.appendChild(n);var r=n.getContext("2d"),i=[],a=0,d=!1;function l(t,e){return Math.random()*(e-t)+t}function c(t){if(p.colorful){var e=l(0,360);return"hsla("+l(e-10,e+10)+", 100%, "+l(50,80)+"%, 1)"}return window.getComputedStyle(t).color}function u(t,e,o){return{x:t,y:e,alpha:1,color:o,velocity:{x:2*Math.random()-1,y:2*Math.random()-3.5}}}function p(){for(var t=function(){var t,e=document.activeElement;if("TEXTAREA"===e.tagName||"INPUT"===e.tagName&&"text"===e.getAttribute("type")){var n=o(1)(e,e.selectionEnd);return t=e.getBoundingClientRect(),{x:n.left+t.left,y:n.top+t.top,color:c(e)}}var r=window.getSelection();if(r.rangeCount){var i=r.getRangeAt(0),a=i.startContainer;return a.nodeType===document.TEXT_NODE&&(a=a.parentNode),{x:(t=i.getBoundingClientRect()).left,y:t.top,color:c(a)}}return{x:0,y:0,color:"transparent"}}(),e=5+Math.round(10*Math.random());e--;)i[a]=u(t.x,t.y,t.color),a=(a+1)%500;if(p.shake){var n=1+2*Math.random(),r=n*(Math.random()>.5?-1:1),l=n*(Math.random()>.5?-1:1);document.body.style.marginLeft=r+"px",document.body.style.marginTop=l+"px",setTimeout((function(){document.body.style.marginLeft="",document.body.style.marginTop=""}),75)}d||requestAnimationFrame(f)}function f(){d=!0,r.clearRect(0,0,n.width,n.height);for(var t=!1,e=n.getBoundingClientRect(),o=0;oparseInt(c.height)&&(l.overflowY="scroll"):l.overflow="hidden",d.textContent=t.value.substring(0,n),"INPUT"===t.nodeName&&(d.textContent=d.textContent.replace(/\s/g," "));var u=document.createElement("span");u.textContent=t.value.substring(n)||".",d.appendChild(u);var p={top:u.offsetTop+parseInt(c.borderTopWidth),left:u.offsetLeft+parseInt(c.borderLeftWidth)};return i?u.style.backgroundColor="#aaa":document.body.removeChild(d),p}void 0!==t&&void 0!==t.exports?t.exports=n:window.getCaretCoordinates=n}()}])}));
\ No newline at end of file
diff --git a/source/js/third-party/canvas-nest.js b/source/js/third-party/canvas-nest.js
deleted file mode 100644
index 62e1da7..0000000
--- a/source/js/third-party/canvas-nest.js
+++ /dev/null
@@ -1,83 +0,0 @@
-! function () {
- var cn = document.getElementById('canvas_nest');
- var mb = cn.getAttribute("mobile");
-
- if (mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) {
- return;
- }
-
- function o(w, v, i) {
- return w.getAttribute(v) || i
- }
-
- function j(i) {
- return document.getElementsByTagName(i)
- }
-
- function l() {
- var v = cn;
- return {
- z: o(v, "zIndex", -1),
- o: o(v, "opacity", 0.5),
- c: o(v, "color", "0,0,0"),
- n: o(v, "count", 99)
- }
- }
-
- function k() {
- r = u.width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth, n = u.height = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
- }
-
- function b() {
- e.clearRect(0, 0, r, n);
- var w = [f].concat(t);
- var x, v, A, B, z, y;
- t.forEach(function (i) {
- i.x += i.xa, i.y += i.ya, i.xa *= i.x > r || i.x < 0 ? -1 : 1, i.ya *= i.y > n || i.y < 0 ? -1 : 1, e.fillRect(i.x - 0.5, i.y - 0.5, 1, 1);
- for (v = 0; v < w.length; v++) {
- x = w[v];
- if (i !== x && null !== x.x && null !== x.y) {
- B = i.x - x.x, z = i.y - x.y, y = B * B + z * z;
- y < x.max && (x === f && y >= x.max / 2 && (i.x -= 0.03 * B, i.y -= 0.03 * z), A = (x.max - y) / x.max, e.beginPath(), e.lineWidth = A / 2, e.strokeStyle = "rgba(" + s.c + "," + (A + 0.2) + ")", e.moveTo(i.x, i.y), e.lineTo(x.x, x.y), e.stroke())
- }
- }
- w.splice(w.indexOf(i), 1)
- }), m(b)
- }
- var u = document.createElement("canvas"),
- s = l(),
- e = u.getContext("2d"),
- r, n, m = window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (i) {
- window.setTimeout(i, 1000 / 45)
- },
- a = Math.random,
- f = {
- x: null,
- y: null,
- max: 20000
- };
- u.style.cssText = "position:fixed;top:0;left:0;z-index:" + s.z + ";opacity:" + s.o;
- j("body")[0].appendChild(u);
- k(), window.onresize = k;
- window.onmousemove = function (i) {
- i = i || window.event, f.x = i.clientX, f.y = i.clientY
- }, window.onmouseout = function () {
- f.x = null, f.y = null
- };
- for (var t = [], p = 0; s.n > p; p++) {
- var h = a() * r,
- g = a() * n,
- q = 2 * a() - 1,
- d = 2 * a() - 1;
- t.push({
- x: h,
- y: g,
- xa: q,
- ya: d,
- max: 6000
- })
- }
- setTimeout(function () {
- b()
- }, 100)
-}();
\ No newline at end of file
diff --git a/source/js/third-party/canvas-ribbon.js b/source/js/third-party/canvas-ribbon.js
deleted file mode 100644
index 6ed6535..0000000
--- a/source/js/third-party/canvas-ribbon.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) 2016 hustcc
- * License: MIT
- * Version: v1.0.1
- * GitHub: https://github.com/hustcc/ribbon.js
- **/
-
-!(function() {
- var script = document.getElementById("ribbon");
- var mb = script.getAttribute("mobile");
- if (
- mb == "false" &&
- /Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)
- ) {
- return;
- }
-
- var config = {
- z: attr(script, "zIndex", -1), // z-index
- a: attr(script, "alpha", 0.6), // alpha
- s: attr(script, "size", 90), // size
- c: attr(script, "data-click", true) // click-to-change
- };
-
- function attr(node, attr, default_value) {
- if (default_value === true) {
- return node.getAttribute(attr) || default_value;
- }
- return Number(node.getAttribute(attr)) || default_value;
- }
-
- var canvas = document.createElement("canvas"),
- g2d = canvas.getContext("2d"),
- pr = window.devicePixelRatio || 1,
- width = window.innerWidth,
- height = window.innerHeight,
- f = config.s,
- q,
- t,
- m = Math,
- r = 0,
- pi = m.PI * 2,
- cos = m.cos,
- random = m.random;
- canvas.id = "ribbon-canvas";
- canvas.width = width * pr;
- canvas.height = height * pr;
- g2d.scale(pr, pr);
- g2d.globalAlpha = config.a;
- canvas.style.cssText =
- "opacity: " +
- config.a +
- ";position:fixed;top:0;left:0;z-index: " +
- config.z +
- ";width:100%;height:100%;pointer-events:none;";
- // create canvas
- document.getElementsByTagName("body")[0].appendChild(canvas);
-
- function redraw() {
- g2d.clearRect(0, 0, width, height);
- q = [
- {
- x: 0,
- y: height * 0.7 + f
- },
- {
- x: 0,
- y: height * 0.7 - f
- }
- ];
- while (q[1].x < width + f) draw(q[0], q[1]);
- }
-
- function draw(i, j) {
- g2d.beginPath();
- g2d.moveTo(i.x, i.y);
- g2d.lineTo(j.x, j.y);
- var k = j.x + (random() * 2 - 0.25) * f,
- n = line(j.y);
- g2d.lineTo(k, n);
- g2d.closePath();
- r -= pi / -50;
- g2d.fillStyle =
- "#" +
- (
- ((cos(r) * 127 + 128) << 16) |
- ((cos(r + pi / 3) * 127 + 128) << 8) |
- (cos(r + (pi / 3) * 2) * 127 + 128)
- ).toString(16);
- g2d.fill();
- q[0] = q[1];
- q[1] = {
- x: k,
- y: n
- };
- }
-
- function line(p) {
- t = p + (random() * 2 - 1.1) * f;
- return t > height || t < 0 ? line(p) : t;
- }
- if (config.c !== "false") {
- document.onclick = redraw;
- document.ontouchstart = redraw;
- }
- redraw();
-})();
diff --git a/source/js/third-party/click_heart.js b/source/js/third-party/click_heart.js
deleted file mode 100644
index 21aeef9..0000000
--- a/source/js/third-party/click_heart.js
+++ /dev/null
@@ -1,73 +0,0 @@
-!(function(e, t, a) {
- function r(e) {
- var a = t.createElement("div");
- (a.className = "heart"),
- n.push({
- el: a,
- x: e.clientX - 5,
- y: e.clientY - 5,
- scale: 1,
- alpha: 1,
- color:
- "rgb(" +
- ~~(255 * Math.random()) +
- "," +
- ~~(255 * Math.random()) +
- "," +
- ~~(255 * Math.random()) +
- ")"
- }),
- t.body.appendChild(a);
- }
- var n = [];
- (e.requestAnimationFrame =
- e.requestAnimationFrame ||
- e.webkitRequestAnimationFrame ||
- e.mozRequestAnimationFrame ||
- e.oRequestAnimationFrame ||
- e.msRequestAnimationFrame ||
- function(e) {
- setTimeout(e, 1e3 / 60);
- }),
- (function(e) {
- var a = t.createElement("style");
- a.type = "text/css";
- try {
- a.appendChild(t.createTextNode(e));
- } catch (t) {
- a.styleSheet.cssText = e;
- }
- t.getElementsByTagName("head")[0].appendChild(a);
- })(
- ".heart{width: 10px;height: 10px;position: fixed;background: #f00;transform: rotate(45deg);-webkit-transform: rotate(45deg);-moz-transform: rotate(45deg);}.heart:after,.heart:before{content: '';width: inherit;height: inherit;background: inherit;border-radius: 50%;-webkit-border-radius: 50%;-moz-border-radius: 50%;position: fixed;}.heart:after{top: -5px;}.heart:before{left: -5px;}"
- ),
- (function() {
- var t = "function" == typeof e.onclick && e.onclick;
- e.onclick = function(e) {
- t && t(), r(e);
- };
- })(),
- (function e() {
- for (var a = 0; a < n.length; a++)
- n[a].alpha <= 0
- ? (t.body.removeChild(n[a].el), n.splice(a, 1))
- : (n[a].y--,
- (n[a].scale += 0.004),
- (n[a].alpha -= 0.013),
- (n[a].el.style.cssText =
- "left:" +
- n[a].x +
- "px;top:" +
- n[a].y +
- "px;opacity:" +
- n[a].alpha +
- ";transform:scale(" +
- n[a].scale +
- "," +
- n[a].scale +
- ") rotate(45deg);background:" +
- n[a].color +
- ";z-index:99999"));
- requestAnimationFrame(e);
- })();
-})(window, document);
diff --git a/source/js/third-party/fireworks.js b/source/js/third-party/fireworks.js
deleted file mode 100644
index 7811dc1..0000000
--- a/source/js/third-party/fireworks.js
+++ /dev/null
@@ -1,129 +0,0 @@
-var canvasEl = document.querySelector('.fireworks')
-if (canvasEl) {
- var ctx = canvasEl.getContext('2d')
- var numberOfParticules = 30
- var pointerX = 0
- var pointerY = 0
- // var tap = ('ontouchstart' in window || navigator.msMaxTouchPoints) ? 'touchstart' : 'mousedown'
- // Fixed the mobile scroll
- var tap = 'mousedown'
- var colors = ['#FF1461', '#18FF92', '#5A87FF', '#FBF38C']
-
- var setCanvasSize = btf.debounce(function () {
- canvasEl.width = window.innerWidth
- canvasEl.height = window.innerHeight
- canvasEl.style.width = window.innerWidth + 'px'
- canvasEl.style.height = window.innerHeight + 'px'
- canvasEl.getContext('2d').scale(1, 1)
- }, 500)
-
- var render = anime({
- duration: Infinity,
- update: function () {
- ctx.clearRect(0, 0, canvasEl.width, canvasEl.height)
- }
- })
-
- document.addEventListener(tap, function (e) {
- if (e.target.id !== 'sidebar' && e.target.id !== 'toggle-sidebar' && e.target.nodeName !== 'A' && e.target.nodeName !== 'IMG') {
- render.play()
- updateCoords(e)
- animateParticules(pointerX, pointerY)
- }
- }, false)
-
- setCanvasSize()
- window.addEventListener('resize', setCanvasSize, false)
-}
-
-function updateCoords (e) {
- pointerX = (e.clientX || e.touches[0].clientX) - canvasEl.getBoundingClientRect().left
- pointerY = e.clientY || e.touches[0].clientY - canvasEl.getBoundingClientRect().top
-}
-
-function setParticuleDirection (p) {
- var angle = anime.random(0, 360) * Math.PI / 180
- var value = anime.random(50, 180)
- var radius = [-1, 1][anime.random(0, 1)] * value
- return {
- x: p.x + radius * Math.cos(angle),
- y: p.y + radius * Math.sin(angle)
- }
-}
-
-function createParticule (x, y) {
- var p = {}
- p.x = x
- p.y = y
- p.color = colors[anime.random(0, colors.length - 1)]
- p.radius = anime.random(16, 32)
- p.endPos = setParticuleDirection(p)
- p.draw = function () {
- ctx.beginPath()
- ctx.arc(p.x, p.y, p.radius, 0, 2 * Math.PI, true)
- ctx.fillStyle = p.color
- ctx.fill()
- }
- return p
-}
-
-function createCircle (x, y) {
- var p = {}
- p.x = x
- p.y = y
- p.color = '#F00'
- p.radius = 0.1
- p.alpha = 0.5
- p.lineWidth = 6
- p.draw = function () {
- ctx.globalAlpha = p.alpha
- ctx.beginPath()
- ctx.arc(p.x, p.y, p.radius, 0, 2 * Math.PI, true)
- ctx.lineWidth = p.lineWidth
- ctx.strokeStyle = p.color
- ctx.stroke()
- ctx.globalAlpha = 1
- }
- return p
-}
-
-function renderParticule (anim) {
- for (var i = 0; i < anim.animatables.length; i++) {
- anim.animatables[i].target.draw()
- }
-}
-
-function animateParticules (x, y) {
- var circle = createCircle(x, y)
- var particules = []
- for (var i = 0; i < numberOfParticules; i++) {
- particules.push(createParticule(x, y))
- }
- anime.timeline().add({
- targets: particules,
- x: function (p) {
- return p.endPos.x
- },
- y: function (p) {
- return p.endPos.y
- },
- radius: 0.1,
- duration: anime.random(1200, 1800),
- easing: 'easeOutExpo',
- update: renderParticule
- })
- .add({
- targets: circle,
- radius: anime.random(80, 160),
- lineWidth: 0,
- alpha: {
- value: 0,
- easing: 'linear',
- duration: anime.random(600, 800)
- },
- duration: anime.random(1200, 1800),
- easing: 'easeOutExpo',
- update: renderParticule,
- offset: 0
- })
-}
\ No newline at end of file
diff --git a/source/js/third-party/piao.js b/source/js/third-party/piao.js
deleted file mode 100644
index 2b59f0a..0000000
--- a/source/js/third-party/piao.js
+++ /dev/null
@@ -1,332 +0,0 @@
-(function (name, factory) {
- if (typeof window === 'object') {
- window[name] = factory()
- }
-})('Ribbons', function () {
- var _w = window
- var _b = document.body
- var _d = document.documentElement
- var random = function () {
- if (arguments.length === 1) {
- if (Array.isArray(arguments[0])) {
- var index = Math.round(random(0, arguments[0].length - 1))
- return arguments[0][index]
- }
- return random(0, arguments[0])
- } else if (arguments.length === 2) {
- return Math.random() * (arguments[1] - arguments[0]) + arguments[0]
- }
- return 0
- }
- var screenInfo = function (e) {
- var width = Math.max(0, _w.innerWidth || _d.clientWidth || _b.clientWidth || 0)
- var height = Math.max(0, _w.innerHeight || _d.clientHeight || _b.clientHeight || 0)
- var scrollx = Math.max(0, _w.pageXOffset || _d.scrollLeft || _b.scrollLeft || 0) - (_d.clientLeft || 0)
- var scrolly = Math.max(0, _w.pageYOffset || _d.scrollTop || _b.scrollTop || 0) - (_d.clientTop || 0)
- return {
- width: width,
- height: height,
- ratio: width / height,
- centerx: width / 2,
- centery: height / 2,
- scrollx: scrollx,
- scrolly: scrolly
- }
- }
- var mouseInfo = function (e) {
- var screen = screenInfo(e)
- var mousex = e ? Math.max(0, e.pageX || e.clientX || 0) : 0
- var mousey = e ? Math.max(0, e.pageY || e.clientY || 0) : 0
- return {
- mousex: mousex,
- mousey: mousey,
- centerx: mousex - screen.width / 2,
- centery: mousey - screen.height / 2
- }
- }
- var Point = function (x, y) {
- this.x = 0
- this.y = 0
- this.set(x, y)
- }
- Point.prototype = {
- constructor: Point,
- set: function (x, y) {
- this.x = x || 0
- this.y = y || 0
- },
- copy: function (point) {
- this.x = point.x || 0
- this.y = point.y || 0
- return this
- },
- multiply: function (x, y) {
- this.x *= x || 1
- this.y *= y || 1
- return this
- },
- divide: function (x, y) {
- this.x /= x || 1
- this.y /= y || 1
- return this
- },
- add: function (x, y) {
- this.x += x || 0
- this.y += y || 0
- return this
- },
- subtract: function (x, y) {
- this.x -= x || 0
- this.y -= y || 0
- return this
- },
- clampX: function (min, max) {
- this.x = Math.max(min, Math.min(this.x, max))
- return this
- },
- clampY: function (min, max) {
- this.y = Math.max(min, Math.min(this.y, max))
- return this
- },
- flipX: function () {
- this.x *= -1
- return this
- },
- flipY: function () {
- this.y *= -1
- return this
- }
- }
- var Factory = function (options) {
- this._canvas = null
- this._context = null
- this._sto = null
- this._width = 0
- this._height = 0
- this._scroll = 0
- this._ribbons = []
- this._options = {
- colorSaturation: '80%',
- colorBrightness: '60%',
- colorAlpha: 0.65,
- colorCycleSpeed: 6,
- verticalPosition: 'center',
- horizontalSpeed: 150,
- ribbonCount: 5,
- strokeSize: 5,
- parallaxAmount: -0.5,
- animateSections: true
- }
- this._onDraw = this._onDraw.bind(this)
- this._onResize = this._onResize.bind(this)
- this._onScroll = this._onScroll.bind(this)
- this.setOptions(options)
- this.init()
- }
- Factory.prototype = {
- constructor: Factory,
- setOptions: function (options) {
- if (typeof options === 'object') {
- for (var key in options) {
- if (options.hasOwnProperty(key)) {
- this._options[key] = options[key]
- }
- }
- }
- },
- init: function () {
- try {
- this._canvas = document.createElement('canvas')
- this._canvas.style.display = 'block'
- this._canvas.style.position = 'fixed'
- this._canvas.style.margin = '0'
- this._canvas.style.padding = '0'
- this._canvas.style.border = '0'
- this._canvas.style.outline = '0'
- this._canvas.style.left = '0'
- this._canvas.style.top = '0'
- this._canvas.style.width = '100%'
- this._canvas.style.height = '100%'
- this._canvas.style['z-index'] = '-1'
- this._onResize()
- this._context = this._canvas.getContext('2d')
- this._context.clearRect(0, 0, this._width, this._height)
- this._context.globalAlpha = this._options.colorAlpha
- window.addEventListener('resize', this._onResize)
- window.addEventListener('scroll', this._onScroll)
- document.body.appendChild(this._canvas)
- } catch (e) {
- console.warn('Canvas Context Error: ' + e.toString())
- return
- }
- this._onDraw()
- },
- addRibbon: function () {
- var dir = Math.round(random(1, 9)) > 5 ? 'right' : 'left'
- var stop = 1000
- var hide = 200
- var min = 0 - hide
- var max = this._width + hide
- var movex = 0
- var movey = 0
- var startx = dir === 'right' ? min : max
- var starty = Math.round(random(0, this._height))
- if (/^(top|min)$/i.test(this._options.verticalPosition)) {
- starty = 0 + hide
- } else if (/^(middle|center)$/i.test(this._options.verticalPosition)) {
- starty = this._height / 2
- } else if (/^(bottom|max)$/i.test(this._options.verticalPosition)) {
- starty = this._height - hide
- }
- var ribbon = []
- var point1 = new Point(startx, starty)
- var point2 = new Point(startx, starty)
- var point3 = null
- var color = Math.round(random(0, 360))
- var delay = 0
- while (true) {
- if (stop <= 0) break
- stop--
- movex = Math.round((Math.random() * 1 - 0.2) * this._options.horizontalSpeed)
- movey = Math.round((Math.random() * 1 - 0.5) * (this._height * 0.25))
- point3 = new Point()
- point3.copy(point2)
- if (dir === 'right') {
- point3.add(movex, movey)
- if (point2.x >= max) break
- } else if (dir === 'left') {
- point3.subtract(movex, movey)
- if (point2.x <= min) break
- }
- ribbon.push({
- point1: new Point(point1.x, point1.y),
- point2: new Point(point2.x, point2.y),
- point3: point3,
- color: color,
- delay: delay,
- dir: dir,
- alpha: 0,
- phase: 0
- })
- point1.copy(point2)
- point2.copy(point3)
- delay += 4
- color += this._options.colorCycleSpeed
- }
- this._ribbons.push(ribbon)
- },
- _drawRibbonSection: function (section) {
- if (section) {
- if (section.phase >= 1 && section.alpha <= 0) {
- return true
- }
- if (section.delay <= 0) {
- section.phase += 0.02
- section.alpha = Math.sin(section.phase) * 1
- section.alpha = section.alpha <= 0 ? 0 : section.alpha
- section.alpha = section.alpha >= 1 ? 1 : section.alpha
- if (this._options.animateSections) {
- var mod = Math.sin(1 + section.phase * Math.PI / 2) * 0.1
- if (section.dir === 'right') {
- section.point1.add(mod, 0)
- section.point2.add(mod, 0)
- section.point3.add(mod, 0)
- } else {
- section.point1.subtract(mod, 0)
- section.point2.subtract(mod, 0)
- section.point3.subtract(mod, 0)
- }
- section.point1.add(0, mod)
- section.point2.add(0, mod)
- section.point3.add(0, mod)
- }
- } else {
- section.delay -= 0.5
- }
- var s = this._options.colorSaturation
- var l = this._options.colorBrightness
- var c = 'hsla(' + section.color + ', ' + s + ', ' + l + ', ' + section.alpha + ' )'
- this._context.save()
- if (this._options.parallaxAmount !== 0) {
- this._context.translate(0, this._scroll * this._options.parallaxAmount)
- }
- this._context.beginPath()
- this._context.moveTo(section.point1.x, section.point1.y)
- this._context.lineTo(section.point2.x, section.point2.y)
- this._context.lineTo(section.point3.x, section.point3.y)
- this._context.fillStyle = c
- this._context.fill()
- if (this._options.strokeSize > 0) {
- this._context.lineWidth = this._options.strokeSize
- this._context.strokeStyle = c
- this._context.lineCap = 'round'
- this._context.stroke()
- }
- this._context.restore()
- }
- return false
- },
- _onDraw: function () {
- for (var i = 0, t = this._ribbons.length; i < t; ++i) {
- if (!this._ribbons[i]) {
- this._ribbons.splice(i, 1)
- }
- }
- this._context.clearRect(0, 0, this._width, this._height)
- for (var a = 0; a < this._ribbons.length; ++a) {
- var ribbon = this._ribbons[a]
- var numSections = ribbon.length
- var numDone = 0
- for (var b = 0; b < numSections; ++b) {
- if (this._drawRibbonSection(ribbon[b])) {
- numDone++
- }
- }
- if (numDone >= numSections) {
- this._ribbons[a] = null
- }
- }
- if (this._ribbons.length < this._options.ribbonCount) {
- this.addRibbon()
- }
- requestAnimationFrame(this._onDraw)
- },
- _onResize: function (e) {
- var screen = screenInfo(e)
- this._width = screen.width
- this._height = screen.height
- if (this._canvas) {
- this._canvas.width = this._width
- this._canvas.height = this._height
- if (this._context) {
- this._context.globalAlpha = this._options.colorAlpha
- }
- }
- },
- _onScroll: function (e) {
- var screen = screenInfo(e)
- this._scroll = screen.scrolly
- }
- }
- return Factory
-})
-
-var cn = document.getElementById('ribbon_piao')
-var mb = cn.getAttribute('mobile')
-
-if (mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) {
-
-} else {
- new Ribbons({
- colorSaturation: '60%',
- colorBrightness: '50%',
- colorAlpha: 0.5,
- colorCycleSpeed: 5,
- verticalPosition: 'random',
- horizontalSpeed: 200,
- ribbonCount: 3,
- strokeSize: 0,
- parallaxAmount: -0.2,
- animateSections: true
- })
-}
diff --git a/source/js/utils.js b/source/js/utils.js
index 190f84c..7183fb7 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -102,20 +102,33 @@ var btf = {
const dateNow = new Date()
const datePost = new Date(d)
const dateDiff = dateNow.getTime() - datePost.getTime()
- const dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000))
+ const minute = 1000 * 60
+ const hour = minute * 60
+ const day = hour * 24
+ const month = day * 30
+
let result
if (more) {
- if (dateDiff <= 3600000) { // < 1 hour
- result = GLOBAL_CONFIG.date_suffix.one_hour
- } else if (dateDiff < 3600000 * 24) { // 1 hour < x < 24 hours
- result = Math.floor(dateDiff / 3600000) + ' ' + GLOBAL_CONFIG.date_suffix.hours
- } else if (dayDiff >= 1 || dayDiff < 365) { // 1 day < x < 365 days
- result = dayDiff + ' ' + GLOBAL_CONFIG.date_suffix.day
- } else { // > 365 days
- result = d.toLocaleDateString().replace(/\//g, '-')
+ const monthCount = dateDiff / month
+ const dayCount = dateDiff / day
+ const hourCount = dateDiff / hour
+ const minuteCount = dateDiff / minute
+
+ if (monthCount > 12) {
+ result = datePost.toLocaleDateString().replace(/\//g, '-')
+ } else if (monthCount >= 1) {
+ result = parseInt(monthCount) + ' ' + GLOBAL_CONFIG.date_suffix.month
+ } else if (dayCount >= 1) {
+ result = parseInt(dayCount) + ' ' + GLOBAL_CONFIG.date_suffix.day
+ } else if (hourCount >= 1) {
+ result = parseInt(hourCount) + ' ' + GLOBAL_CONFIG.date_suffix.hour
+ } else if (minuteCount >= 1) {
+ result = parseInt(minuteCount) + ' ' + GLOBAL_CONFIG.date_suffix.min
+ } else {
+ result = GLOBAL_CONFIG.date_suffix.just
}
} else {
- result = dayDiff
+ result = parseInt(dateDiff / day)
}
return result
},