From 2eb15123f9e1b15b94158995893cab2f2846c9d4 Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 24 Sep 2019 02:09:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=94=B9=E6=89=8B=E6=A9=9F?= =?UTF-8?q?=E9=A0=81=E9=9D=A2=E7=9A=84menu=E5=92=8Ctoc=E7=9A=84=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F=E5=92=8C=E9=A1=AF=E7=A4=BA=E7=89=B9?= =?UTF-8?q?=E6=95=88=EF=BC=88ipad=E4=B9=9F=E8=83=BD=E7=9C=8BTOC)=201.=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=8B=E6=A9=9F=E9=A0=81=E9=9D=A2=E7=9A=84?= =?UTF-8?q?menu=E5=92=8Ctoc=E7=9A=84=E9=A1=AF=E7=A4=BA=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=92=8C=E9=A1=AF=E7=A4=BA=E7=89=B9=E6=95=88=EF=BC=88ipad?= =?UTF-8?q?=E4=B9=9F=E8=83=BD=E7=9C=8BTOC)=203.=20=E5=8F=AF=E8=A8=AD?= =?UTF-8?q?=E7=BD=AE=E8=A4=87=E8=A3=BD=E6=99=82=EF=BC=8C=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=87=AA=E5=8B=95=E5=8A=A0=E4=B8=8A=E7=89=88=E6=AC=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=204.=20=E5=8F=AF=E4=BF=AE=E6=94=B9tag=E7=9A=84top=5Fi?= =?UTF-8?q?mg=205.=20=E5=8F=AF=E4=BF=AE=E6=94=B9category=E7=9A=84top=5Fimg?= =?UTF-8?q?=206.=20=E5=8F=AF=E4=BF=AE=E6=94=B9valine=E7=9A=84=E8=83=8C?= =?UTF-8?q?=E6=99=AF=207.=20archives=E9=A0=81UI=E5=84=AA=E5=8C=96=208.=20I?= =?UTF-8?q?CP=E5=A2=9E=E5=8A=A0icon=20#37=209.=20=E5=8F=AF=E8=A8=AD?= =?UTF-8?q?=E7=BD=AE=E4=B8=BB=E9=A0=81top=5Fimg=E7=9A=84=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=2010.=20=E5=8F=AF=E8=A8=AD=E7=BD=AE=E4=B8=BB=E9=A0=81site-info?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=2011.=20category=E9=A0=81=E5=92=8Ct?= =?UTF-8?q?ag=E9=A0=81=E7=9A=84UI=E5=8F=AF=E4=BB=A5=E8=A8=AD=E7=BD=AE?= =?UTF-8?q?=E8=88=87=E4=B8=BB=E9=A0=81UI=E4=B8=80=E6=A8=A3=20#31=2012.=20?= =?UTF-8?q?=E4=B8=BB=E9=A0=81subtitle=E5=8F=AF=E8=A8=AD=E7=BD=AE=E5=A4=9A?= =?UTF-8?q?=E5=80=8B=E5=8F=A5=E5=AD=90=EF=BC=88=E4=B8=8D=E5=86=8D=E9=99=90?= =?UTF-8?q?=E5=88=B62=E5=80=8B=EF=BC=89=20#37=2013.=20=E8=A8=AD=E7=BD=AEme?= =?UTF-8?q?nu=E6=99=82=EF=BC=8C=E9=A0=AD=E5=B0=BE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E4=B8=8D=E5=8F=97=E5=BD=B1=E9=9F=BF=2014.=20?= =?UTF-8?q?=E8=AA=BF=E6=95=B4post=E9=A0=81=E7=9A=84=E4=BD=88=E5=B1=80=2015?= =?UTF-8?q?.=20=E4=B9=A6=E7=AD=BE=E6=B7=BB=E5=8A=A0icon=2016.=20=E5=85=AC?= =?UTF-8?q?=E5=91=8Aicon=E6=95=88=E6=9E=9C=2017.=20=E9=A6=96=E9=A0=81?= =?UTF-8?q?=E6=AD=B8=E6=AA=94=E6=A8=A1=E5=A1=8A=EF=BC=8C=E5=8F=AF=E8=A8=AD?= =?UTF-8?q?=E7=BD=AE=E6=95=B8=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C=E6=9C=83?= =?UTF-8?q?=E9=A1=AF=E7=A4=BA'=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A'?= =?UTF-8?q?=E6=8C=89=E9=88=95=2018.=20=E5=8F=B3=E4=B8=8B=E8=A7=92=E6=8C=89?= =?UTF-8?q?=E9=88=95=E8=AA=BF=E6=95=B4=E3=80=82=2019.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=87=E7=AB=A0cover=E9=9A=A8=E6=A9=9F=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8C=E5=90=8C=E4=B8=80=E7=AF=87=E6=96=87?= =?UTF-8?q?=E7=AB=A0=EF=BC=8C=E4=B8=8D=E5=90=8C=E5=9C=B0=E6=96=B9=E7=9A=84?= =?UTF-8?q?cover=E9=A1=AF=E7=A4=BA=E4=B8=8D=E4=B8=80=E6=A0=B7=E7=9A=84bug?= =?UTF-8?q?=2020.=20=E4=BF=AE=E5=BE=A9gitalk=E8=AA=9E=E8=A8=80=E8=A8=AD?= =?UTF-8?q?=E7=BD=AE=E7=84=A1=E6=95=88=E7=9A=84bug=20#35=2021.=20=E4=BF=AE?= =?UTF-8?q?=E5=BE=A9post=E9=A0=81=E9=9D=A2=EF=BC=8C=E7=95=B6=E6=B2=92?= =?UTF-8?q?=E6=9C=89=E8=A8=AD=E7=BD=AEword=20count=E6=99=82=EF=BC=8C?= =?UTF-8?q?=E9=96=B2=E8=AE=80=E9=87=8F=E5=89=8D=E6=9C=89'|"=2022.=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsub-menu=E5=9C=A8safari=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=2023.=20=E4=BF=AE=E5=A4=8Dtags?= =?UTF-8?q?=E9=A1=B5=E8=AF=84=E8=AE=BA=E5=B1=85=E4=B8=AD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=2024.=20=E4=BF=AE=E5=A4=8Dheader=20a=20hover=20=E7=99=BD?= =?UTF-8?q?=E8=89=B2=E9=97=AE=E9=A2=98=2025.=20=E4=BF=AE=E5=BE=A9=E5=A4=9C?= =?UTF-8?q?=E9=96=93=E6=A8=A1=E5=BC=8F=E4=B8=8Bfooter=E7=9A=84=E9=A1=94?= =?UTF-8?q?=E8=89=B2bug=2026.=20=E4=BF=AE=E5=BE=A9=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E8=AA=9E=E8=A8=80=E4=B8=8B=EF=BC=8C=E6=9B=B8=E7=B0=BD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E9=A1=AF=E7=A4=BA=E4=B8=8D=E5=AE=8C=E6=95=B4=E7=9A=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 97 ++++-- languages/default.yml | 10 + languages/en.yml | 10 + languages/zh-CN.yml | 10 + languages/zh-TW.yml | 14 +- layout/category.pug | 24 +- layout/flink.pug | 2 +- layout/includes/additional-js.pug | 56 ++-- layout/includes/comments/gitalk.pug | 2 +- layout/includes/config.pug | 18 +- layout/includes/footer.pug | 2 + layout/includes/head.pug | 8 +- layout/includes/header.pug | 78 +---- layout/includes/layout.pug | 57 ++-- layout/includes/menu_item.pug | 20 ++ layout/includes/mixins/UI.pug | 41 +++ layout/includes/mixins/article-sort.pug | 10 +- layout/includes/mobile-sidebar.pug | 46 +++ layout/includes/nav.pug | 8 +- layout/includes/page_tag.pug | 6 + layout/includes/pagination.pug | 8 +- layout/includes/post-bottom.pug | 17 - layout/includes/recent-posts.pug | 34 +- layout/includes/reward.pug | 2 +- layout/includes/rightside.pug | 31 +- layout/includes/widget/card_author.pug | 20 +- layout/includes/widget/card_recent_post.pug | 13 +- layout/page.pug | 3 +- layout/post.pug | 14 +- layout/tag.pug | 22 +- package.json | 3 +- scripts/hexo-plugins.txt | 0 scripts/list_archives.js | 133 ++++++++ scripts/random_cover.js | 9 +- scripts/related_post.js | 15 +- scripts/tags.js | 16 - source/css/_global/index.styl | 256 ++------------- source/css/_layout/aside.styl | 133 ++++---- source/css/_layout/category.styl | 1 - source/css/_layout/comments.styl | 65 +++- source/css/_layout/flink.styl | 14 +- source/css/_layout/footer.styl | 4 + source/css/_layout/head.styl | 300 +++++------------ source/css/_layout/mobile-sidebar.styl | 163 ++++++++++ source/css/_layout/nightshift.styl | 101 +++--- source/css/_layout/note.styl | 4 +- source/css/_layout/page.styl | 64 +++- source/css/_layout/pagination.styl | 3 +- source/css/_layout/post.styl | 54 ++-- source/css/_layout/post_bottom.styl | 70 ---- source/css/_layout/readmode.styl | 71 ++-- source/css/_layout/reward.styl | 2 +- source/css/_layout/rightside.styl | 64 ++++ source/css/_layout/z-other.styl | 89 ++--- source/css/var.styl | 4 +- source/img/icp.png | Bin 0 -> 19256 bytes source/js/main.js | 341 +++++++++++--------- 57 files changed, 1438 insertions(+), 1224 deletions(-) create mode 100644 layout/includes/menu_item.pug create mode 100644 layout/includes/mixins/UI.pug create mode 100644 layout/includes/mobile-sidebar.pug create mode 100644 layout/includes/page_tag.pug delete mode 100644 layout/includes/post-bottom.pug delete mode 100644 scripts/hexo-plugins.txt create mode 100644 scripts/list_archives.js delete mode 100644 scripts/tags.js create mode 100644 source/css/_layout/mobile-sidebar.styl delete mode 100644 source/css/_layout/post_bottom.styl create mode 100644 source/css/_layout/rightside.styl create mode 100644 source/img/icp.png diff --git a/_config.yml b/_config.yml index 79a6e51..2804f3e 100644 --- a/_config.yml +++ b/_config.yml @@ -1,29 +1,20 @@ -# Theme color for customize -# Notice: color value must in double quotes like "#000" or may cause error! -# --------------- -# theme_color: -# enable: true -# main: "#49B1F5" -# paginator: "#00c4b6" -# button_hover: "#FF7242" -# text_selection: "#00c4b6" -# link_color: "#99a9bf" -# meta_color: '#858585' -# hr_color: "#A4D8FA" -# read-mode-bg_color: '#FAF9DE' -# inline-code-color: '#F47466' # Main menu navigation -# format: xxx: /xxx/||icon # --------------- +# format: xxx: 連結 || icon +# sub-menu +# xxx || icon: +# xxx || 連結 || icon menu: - Home: /||fa fa-home - Archives: /archives/||fa fa-archive - Tags: /tags/||fa fa-tags - Categories: /categories/||fa fa-folder-open - Link: /link/||fa fa-link - About: /about/||fa fa-heart -# #XXX: /xxx + Home: / || fa fa-home + Archives: /archives/ || fa fa-archive + Tags: /tags/ || fa fa-tags + Categories: /categories/ || fa fa-folder-open + Link: /link/ || fa fa-link + About: /about/ || fa fa-heart + List||fa fa-list: + - Music || /music/ || fa fa-music + - Movie || /movies/ || fa fa-film # Favicon @@ -53,6 +44,13 @@ highlight_shrink: false #代碼框不展開，需點擊 '>' 打開 code_word_wrap: false +# copy setting +# 是否禁止複製（如果禁止，highlight_copy的功能將無效) +# copyright 複製的内容後面加上版權信息 +copy: + enable: false # true 開啓 / false 禁止 + copyright: false + # social settings # formal: # icon: link @@ -149,6 +147,12 @@ default_cover: https://cdn.jsdelivr.net/gh/jerryc127/CDN@latest/cover/default_bg # the banner image of archive page archive_img: https://cdn.jsdelivr.net/gh/jerryc127/CDN@latest/Photo/archive.jpg +# the banner image of tag page +tag_img: https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/tag-bg.png + +# the banner image of category page +category_img: https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/category-bg + # if the photo link cannot connect,it will show that lodding_bg: flink: /img/friend_404.gif @@ -228,6 +232,7 @@ disqus: # repo: # owner: # admin: +# language: # en , zh-CN , zh-TW #### Using this js for redirect to gitalk container after login #### See https://github.com/gitalk/gitalk/issues/125 # js: https://cdn.jsdelivr.net/gh/upupming/gitalk@36368e5dffd049e956cdbbd751ff96c28d8255cf/dist/gitalk.min.js @@ -243,7 +248,8 @@ valine: avatar: monsterid # gravatar style https://valine.js.org/#/avatar lang: en # i18n: zh-cn/en placeholder: Please leave your footprints # valine comment input placeholder(like: Please leave your footprints ) - guest_info: nick,mail,link #valine comment header inf + guest_info: nick,mail,link #valine comment header info + bg: /img/comment_bg.png # valine background ##### Footer Settings #### # ------------------------------------ @@ -257,7 +263,8 @@ footer_copyright: ICP: enable: false url: - text: + text: + icon: /img/icp.png #### 站長驗證 #### @@ -307,6 +314,35 @@ related_post: #### 美化/效果 #### #-------------------------------- +# Theme color for customize +# Notice: color value must in double quotes like "#000" or may cause error! +# --------------- +# theme_color: +# enable: true +# main: "#49B1F5" +# paginator: "#00c4b6" +# button_hover: "#FF7242" +# text_selection: "#00c4b6" +# link_color: "#99a9bf" +# meta_color: '#858585' +# hr_color: "#A4D8FA" +# read-mode-bg_color: '#FAF9DE' +# inline-code-color: '#F47466' + +# 主頁設置 +# 默認top_img全屏，site_info在中間 +# 使用默認, 都無需填寫（建議默認） +index_site_info_top: #主頁標題距離頂部距離 例如 300px/300em/300rem/10% +index_top_img_height: #主頁top_img高度 例如 300px/300em/300rem 不能使用百分比 + + +# category和tag頁的UI設置 +# index 值代表 UI將與首頁的UI一樣 +# 默認跟archives頁面UI一樣 +category_ui: # 留空或index +tag_ui: # 留空或index + + # 設置網站背景 # 可設置圖片 或者 顔色 # 圖片格式 background: url(http://xxxxxx.com/xxx.jpg) @@ -366,14 +402,14 @@ post_beautify: # 全局字體 font: enable: false - font-family: Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB,"Microsoft JhengHei", "MicrMicrosoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif - code-font: consolas, Menlo, "PingFang SC", "Microsoft JhengHei","Microsoft YaHei", monospace, Helvetica Neue For Number + font-family: Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB, MicrMicrosoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif + code-font: consolas, Menlo, "PingFang SC", "Microsoft YaHei", monospace, Helvetica Neue For Number # 網站名字字體 # 左上角網站名字 主頁居中網站名字 blog_title_font: font_link: https://fonts.googleapis.com/css?family=Titillium+Web #字體鏈接 - font-family: Titillium Web, PingFang SC, Hiragino Sans GB, "Microsoft JhengHei", "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif + font-family: Titillium Web, PingFang SC, Hiragino Sans GB, "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif # 水平分隔綫 hr: @@ -383,11 +419,12 @@ hr: # 主頁subtitle # 打字效果 +# (如果有英文逗號' , '，請使用轉義字符 ,) subtitle: enable: true - sub1: 今日事,今日畢 - sub2: Never put off till tomorrow what you can do today #如果有符號 ' ，記得前面加上 \ - + sub: + - 今日事,今日畢 + - Never put off till tomorrow what you can do today diff --git a/languages/default.yml b/languages/default.yml index 223beff..e63dedc 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -82,5 +82,15 @@ rightside: font_minus_title: Decrease font size translate_title: Traditional Chinese and Simplified Chinese Conversion night_mode_title: Dark Mode + back_to_top: Back to top + toc: Table of Contents + scroll_to_comment: Scroll to comment + setting: Setting runtime_unit: days + +copy_copyright: + author: Author + link: Link + source: Source + info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source. diff --git a/languages/en.yml b/languages/en.yml index 0940c4e..f57b058 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -81,5 +81,15 @@ rightside: font_minus_title: Decrease font size translate_title: Traditional Chinese and Simplified Chinese Conversion night_mode_title: Dark Mode + back_to_top: Back to top + toc: Table of Contents + scroll_to_comment: Scroll to comment + setting: Setting runtime_unit: days + +copy_copyright: + author: Author + link: Link + source: Source + info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source. \ No newline at end of file diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index 65019f8..7d1fc14 100644 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -82,5 +82,15 @@ rightside: font_minus_title: 缩小字体 translate_title: 简繁转换 night_mode_title: 夜间模式 + back_to_top: 回到顶部 + toc: 目录 + scroll_to_comment: 直达评论 + setting: 设置 runtime_unit: 天 + +copy_copyright: + author: 作者 + link: 链接 + source: 来源 + info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。 \ No newline at end of file diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 7eab355..727b779 100644 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -15,7 +15,7 @@ page: articles: 文章總覽 tag: 標籤 category: 分類 - archives: 歸檔 + archives: 時間軸 sticky: 置頂 no_title: 無題 @@ -83,5 +83,15 @@ rightside: font_minus_title: 縮小字體 translate_title: 簡繁轉換 night_mode_title: 夜間模式 + back_to_top: 回到頂部 + toc: 目錄 + scroll_to_comment: 直達評論 + setting: 設置 -runtime_unit: 天 \ No newline at end of file +runtime_unit: 天 + +copy_copyright: + author: 作者 + link: 鏈接 + source: 來源 + info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。 \ No newline at end of file diff --git a/layout/category.pug b/layout/category.pug index 05617ee..457592d 100644 --- a/layout/category.pug +++ b/layout/category.pug @@ -1,11 +1,19 @@ extends includes/layout.pug block content - include ./includes/mixins/article-sort.pug - #category - .article-sort-title= _p('page.category') + ' - ' + page.category - +articleSort(page.posts) - include includes/pagination.pug - #aside_content.aside_content - include includes/aside.pug - \ No newline at end of file + if theme.category_ui == 'index' + include ./includes/mixins/UI.pug + #recent-posts.recent-posts.category_ui + +UI_NEW(page.posts) + include includes/pagination.pug + #aside_content.aside_content + include includes/aside.pug + else + include ./includes/mixins/article-sort.pug + #category + .article-sort-title= _p('page.category') + ' - ' + page.category + +articleSort(page.posts) + include includes/pagination.pug + #aside_content.aside_content + include includes/aside.pug + \ No newline at end of file diff --git a/layout/flink.pug b/layout/flink.pug index de257c7..a2f0fe5 100644 --- a/layout/flink.pug +++ b/layout/flink.pug @@ -1,6 +1,6 @@ .flink each i in site.data.link - p.comment-word= i.class_name + h1= i.class_name .post-cards ul.md-links each item in i.link_list diff --git a/layout/includes/additional-js.pug b/layout/includes/additional-js.pug index 49253be..cacb670 100644 --- a/layout/includes/additional-js.pug +++ b/layout/includes/additional-js.pug @@ -45,49 +45,13 @@ if is_home() && theme.subtitle.enable script(src="https://cdn.jsdelivr.net/npm/typed.js@2.0.9") script. var typed = new Typed(".subtitle", { - strings: ['!{theme.subtitle.sub1}','!{theme.subtitle.sub2}'], + strings: '!{theme.subtitle.sub}'.split(","), startDelay: 300, typeSpeed: 100, loop: true, backSpeed: 50 }); -if is_home() - script. - //首頁fullpage - function alignContent() { - for (var n = $(window).height(), e = document.querySelectorAll(".full_page"), i = 0; i < e.length; i++) - e[i].style.height = n + "px"; - $("#site-info").each(function () { - var x = $(this).height(); - $(this).css("top", (n-x)/2) - }) - } - - function recent_post_padding() { - $(".recent-post-info").each(function () { - var k = $(".recent-post-item").height(); - var e = $(this).height(); - $(this).css({"padding-top": (k-e)/2 , "padding-bottom": (k-e)/2 }) - }) - } - - alignContent(); - - //recent-post-item垂直置中 - if ($(window).width() > 768) { - recent_post_padding(); - } - - $(window).bind("resize", function () { - - alignContent() - - if ($(window).width() > 768) { - recent_post_padding(); - } - }) - if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv script(async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js") @@ -99,3 +63,21 @@ if theme.lazyload.enable script. const observer = lozad(); // lazy loads elements with default selector as '.lozad' observer.observe(); + +if is_home() && !theme.index_top_img_height && !theme.index_site_info_top + script. + //首頁fullpage + function alignContent() { + for (var n = $(window).height(), e = document.querySelectorAll(".full_page"), i = 0; i < e.length; i++) + e[i].style.height = n + "px"; + $("#site-info").each(function () { + var x = $(this).height(); + $(this).css("top", (n-x)/2) + }) + } + alignContent(); + + $(window).bind("resize", function () { + alignContent() + }) + diff --git a/layout/includes/comments/gitalk.pug b/layout/includes/comments/gitalk.pug index e222491..1474168 100644 --- a/layout/includes/comments/gitalk.pug +++ b/layout/includes/comments/gitalk.pug @@ -8,6 +8,6 @@ if theme.gitalk && theme.gitalk.enable owner: '!{theme.gitalk.owner}', admin: '!{theme.gitalk.admin}', id: md5(decodeURI(location.pathname)), - language: '!{lang}' + language: '!{theme.gitalk.language}' }) gitalk.render('gitalk-container') \ No newline at end of file diff --git a/layout/includes/config.pug b/layout/includes/config.pug index c32460c..7c5c020 100644 --- a/layout/includes/config.pug +++ b/layout/includes/config.pug @@ -28,7 +28,6 @@ } var translate = 'undefined'; if (theme.translate && theme.translate.enable){ - var defaultEncoding; translate = JSON.stringify({ defaultEncoding: theme.translate.defaultEncoding, translateDelay: theme.translate.translateDelay, @@ -38,7 +37,19 @@ }) } + var copyright = 'undefined' ; + if (theme.copy.enable && theme.copy.copyright){ + copyright = JSON.stringify({ + languages: { + author: _p("copy_copyright.author") + ': ' + config.author, + link: _p("copy_copyright.link") + ': ' + without_html, + source: _p("copy_copyright.source") + ': ' + config.title, + info: _p("copy_copyright.info") + } + }) + } + var copy_copyright_js = theme.copy.enable && theme.copy.copyright @@ -61,8 +72,9 @@ script. message_prev: '!{_p("bookmark.message_prev")}', message_next: '!{_p("bookmark.message_next")}' }, - runtime_unit: '!{_p("runtime_unit")}' - + runtime_unit: '!{_p("runtime_unit")}', + copyright: !{copyright}, + copy_copyright_js: !{copy_copyright_js} } diff --git a/layout/includes/footer.pug b/layout/includes/footer.pug index f9fefba..420afdc 100644 --- a/layout/includes/footer.pug +++ b/layout/includes/footer.pug @@ -19,4 +19,6 @@ if theme.ICP.enable .icp a(href=theme.ICP.url) + if theme.ICP.icon + img.icp-icon(src=url_for(theme.ICP.icon)) span=theme.ICP.text diff --git a/layout/includes/head.pug b/layout/includes/head.pug index e732157..0685ce1 100644 --- a/layout/includes/head.pug +++ b/layout/includes/head.pug @@ -1,6 +1,6 @@ - var without_index = url.replace('index.html', '') - var without_html = without_index.replace('.html', '') -- var photo_check = page.cover || theme.avatar +- var photo_check = is_post() ? page.cover || theme.avatar : theme.avatar - var photo_link = url_check (photo_check) ? photo_check : config.url + photo_check meta(http-equiv="x-dns-prefetch-control" content="on") @@ -107,10 +107,16 @@ if theme.qihu_site_verification - var preload_archive_img = theme.archive_img ||theme.top_img || config.top_img +- var preload_tag_img = theme.tag_img ||theme.top_img || config.top_img +- var preload_category_img = theme.category_img ||theme.top_img || config.top_img - var preload_img = page.top_img || theme.top_img || config.top_img if (is_archive() && preload_archive_img) link(rel="preload" href=url_for(preload_archive_img) as="image" ) +else if (is_tag() && preload_tag_img) + link(rel="preload" href=url_for(preload_tag_img) as="image" ) +else if (is_category() && preload_category_img) + link(rel="preload" href=url_for(preload_category_img) as="image" ) else if (!is_post() && preload_img) link(rel="preload" href=url_for(preload_img) as="image" ) diff --git a/layout/includes/header.pug b/layout/includes/header.pug index b49db42..da1a9c2 100644 --- a/layout/includes/header.pug +++ b/layout/includes/header.pug @@ -1,65 +1,13 @@ -#page-header - span.pull-left - a#site-name.blog_title(href=url_for('/')) #[=config.title] - //- i.fa.fa-bars.toggle-menu.pull-right(aria-hidden="true") - .open.toggle-menu.pull-right - .menu-icon-first - .menu-icon-second - .menu-icon-third - - .menu_mask - - span.pull-right.menus - .mobile_author_icon - img.lozad.avatar_img(src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`) - .mobile_post_data - if site.posts.length - .mobile_data_item.text-center - .mobile_data_link - a(href=url_for(config.archive_dir) + '/') - .headline= _p('aside.articles') - .length_num= site.posts.length - - if site.tags.length - .mobile_data_item.text-center - .mobile_data_link - a(href=url_for(config.tag_dir) + '/' ) - .headline= _p('aside.tags') - .length_num= site.tags.length - - if site.categories.length - .mobile_data_item.text-center - .mobile_data_link - a(href=url_for(config.category_dir) + '/') - .headline= _p('aside.categories') - .length_num= site.categories.length - - hr - .menus_items - each value, label in theme.menu - if !Array.isArray(value) - .menus_item - a.site-page(href=value.split('||')[0]) - i.fa-fw(class=value.split('||')[1]) - span=' '+label - else - .menus_item - a.site-page - i.fa-fw(class=label.split('||')[1] aria-hidden="true") - span=' '+label.split('||')[0] - i.fa.fa-chevron-down.menus-expand(aria-hidden="true") - ul.menus_item_child - each i in value - li - a.site-page(href=i.split('||')[1]) - i.fa-fw(class=i.split('||')[2]) - span=' '+i.split('||')[0] - - - script. - document.body.addEventListener('touchstart', function(){ }); - span.pull-right - if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable) - a.site-page.social-icon.search - i.fa.fa-search.fa-fw - span=' '+_p('search') +#header + #page-header + span#blog_name.pull-left + a#site-name.blog_title(href=url_for('/')) #[=config.title] + i.fa.fa-bars.fa-fw.toggle-menu.pull-right.close(aria-hidden="true") + span.pull-right.menus + .menus_items + include menu_item.pug + span#search_button.pull-right + if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable) + a.site-page.social-icon.search + i.fa.fa-search.fa-fw + span=' '+_p('search') diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug index 53c45d2..ff4a3d9 100644 --- a/layout/includes/layout.pug +++ b/layout/includes/layout.pug @@ -16,9 +16,10 @@ - config.subtitle ? home_subtitle_true = ' - ' + config.subtitle : home_subtitle_true = '' //- home時pageTitle顯示 JerryC - subtitle，其他顯示 pageTitle | JerryC - is_home() ? pageTitle = config.title + home_subtitle_true : pageTitle = pageTitle_saved +//- 判断keywords - var pageDescription = page.description || page.title || config.description || '' -- var pageKeywords = (config.keywords || []).join(',') +- var pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','): ([]).join(',') || config.keywords - if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',') - var pageAuthor = config.email ? config.author + ',' + config.email : config.author - var pageCopyright = config.copyright || config.author @@ -49,35 +50,35 @@ html(lang=config.language) body(class=body_class) if theme.fireworks && theme.fireworks.enable canvas.fireworks - if theme.background - #web_bg - if (is_post() && page.toc != false && theme.toc.enable) - i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true") - include ./sidebar.pug - if (!is_post()) - include ./nav.pug - #content-outer - block top_img + include ./header.pug + include ./mobile-sidebar.pug + #body-wrap + if theme.background + #web_bg + if (is_post() && page.toc != false && theme.toc.enable) + i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true") + include ./sidebar.pug if (!is_post()) - #content-inner.layout_page - if body - div!= body - else - block content - else - #content-inner.layout.layout_post - if body - div!= body - else - block content - - - var footer_bg = theme.footer_bg == false ? '' : bg_img - footer(style=footer_bg) - include ./footer.pug - i.fa.fa-arrow-up#go-up(aria-hidden="true") + include ./nav.pug + #content-outer + block top_img + if (!is_post()) + #content-inner.layout_page + if body + div!= body + else + block content + else + #content-inner.layout.layout_post + if body + div!= body + else + block content + + - var footer_bg = theme.footer_bg == false ? '' : bg_img + footer(style=footer_bg) + include ./footer.pug include ./rightside.pug - if (is_post()) - include ./post-bottom.pug each item in theme.cdn.js if item !== undefined script(src=url_for(item)) diff --git a/layout/includes/menu_item.pug b/layout/includes/menu_item.pug new file mode 100644 index 0000000..09b2d97 --- /dev/null +++ b/layout/includes/menu_item.pug @@ -0,0 +1,20 @@ +each value, label in theme.menu + if !Array.isArray(value) + .menus_item + a.site-page(href=trim(value.split('||')[0])) + i.fa-fw(class=trim(value.split('||')[1])) + span=' '+label + else + .menus_item + a.site-page + i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true") + span=' '+ trim(label.split('||')[0]) + i.fa.fa-chevron-down.menus-expand(aria-hidden="true") + ul.menus_item_child + each i in value + li + a.site-page(href=trim(i.split('||')[1])) + i.fa-fw(class=trim(i.split('||')[2])) + span=' '+trim(i.split('||')[0]) +script. + document.body.addEventListener('touchstart', function(){ }); diff --git a/layout/includes/mixins/UI.pug b/layout/includes/mixins/UI.pug new file mode 100644 index 0000000..213856a --- /dev/null +++ b/layout/includes/mixins/UI.pug @@ -0,0 +1,41 @@ +mixin UI_NEW(posts) + - posts.each(function(article,index){ + .recent-post-item.article-container + - var link = article.link || article.path + if index%2 == 0 + .post_cover.is_left + a(href=url_for(link) title=article.title || _p('no_title')) + - var post_cover = article.cover + if theme.lazyload.enable + img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + else + img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + else + .post_cover.is_right + a(href=url_for(link) title=article.title || _p('no_title')) + - var post_cover = article.cover + if theme.lazyload.enable + img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + else + img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + .recent-post-info + a.article-title(href=url_for(link) title= article.title || _p('no_title'))= article.title || _p('no_title') + if (theme.post_meta.date_type) + - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date' + time.post-meta__date #[i.fa.fa-calendar(aria-hidden="true")] #[=date(article[date_type], config.date_format)] + if (theme.post_meta.categories && article.categories.data.length > 0) + span.article-meta + span.article-meta__separator | + each item, index in article.categories.data + i.fa.fa-inbox.article-meta__icon(aria-hidden="true") + a(href=url_for(item.path)).article-meta__categories #[=item.name] + if (index < article.categories.data.length - 1) + i.fa.fa-angle-right(aria-hidden="true") + if theme.auto_excerpt && theme.auto_excerpt.enable + - const content = strip_html(article.content) + - let expert = content.substring(0, theme.auto_excerpt.length) + - content.length > theme.auto_excerpt.length ? expert += ' ...' : '' + .content!= expert + else + .content!= article.description + - }) \ No newline at end of file diff --git a/layout/includes/mixins/article-sort.pug b/layout/includes/mixins/article-sort.pug index 6da3f21..02f88ca 100644 --- a/layout/includes/mixins/article-sort.pug +++ b/layout/includes/mixins/article-sort.pug @@ -7,6 +7,12 @@ mixin articleSort(posts) - year = tempYear .article-sort-item.year= year .article-sort-item - time.article-sort-item__time= date(article.date) - a.article-sort-item__title(href=url_for(article.path))= article.title || 'No Title' + .article-sort-img + a.article-sort-item__img(href=url_for(article.path)) + img(src=article.cover) + .article-sort-post + a.article-sort-item__post(href=url_for(article.path)) + i.fa.fa-clock-o(aria-hidden="true") + time.article-sort-item__time= date(article.date) + .article-sort-item__title= article.title || 'No Title' - }) \ No newline at end of file diff --git a/layout/includes/mobile-sidebar.pug b/layout/includes/mobile-sidebar.pug new file mode 100644 index 0000000..b9e1013 --- /dev/null +++ b/layout/includes/mobile-sidebar.pug @@ -0,0 +1,46 @@ +#mobile-sidebar + #menu_mask + #mobile-sidebar-menus + .mobile_author_icon + img.lozad.avatar_img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'`) + .mobile_post_data + if site.posts.length + .mobile_data_item.is_center + .mobile_data_link + a(href=url_for(config.archive_dir) + '/') + .headline= _p('aside.articles') + .length_num= site.posts.length + + if site.tags.length + .mobile_data_item.is_center + .mobile_data_link + a(href=url_for(config.tag_dir) + '/' ) + .headline= _p('aside.tags') + .length_num= site.tags.length + + if site.categories.length + .mobile_data_item.is_center + .mobile_data_link + a(href=url_for(config.category_dir) + '/') + .headline= _p('aside.categories') + .length_num= site.categories.length + hr + .menus_items + include menu_item.pug + + + + - const showToc = is_post() && page.toc != false && theme.toc.enable + - + let tocNumber + if (page.toc_number !== undefined) tocNumber = page.toc_number + else if (theme.toc.number !== undefined) tocNumber = theme.toc.number + else tocNumber = true + - + if (showToc) + #mobile-sidebar-toc + .toc_mobile_headline= _p('sidebar.catalog') + if (page.encrypt == true) + .toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items",list_number:tocNumber}) + else + !=toc(page.content,{"class":"toc_mobile_items",list_number:tocNumber}) diff --git a/layout/includes/nav.pug b/layout/includes/nav.pug index 4738f48..c2476a4 100644 --- a/layout/includes/nav.pug +++ b/layout/includes/nav.pug @@ -1,5 +1,9 @@ -if (is_archive()) +if is_archive() - var top_img = theme.archive_img ||theme.top_img || config.top_img +else if is_tag() + - var top_img = theme.tag_img ||theme.top_img || config.top_img +else if is_category() + - var top_img = theme.category_img ||theme.top_img || config.top_img else - var top_img = page.top_img||theme.top_img || config.top_img @@ -9,7 +13,6 @@ else if is_home() nav#nav.full_page .nav_bg(style=bg_img) - include ./header.pug #site-info #site-title span.blogtitle= page.title || page.tag || page.category || config.title @@ -28,7 +31,6 @@ if is_home() else nav#nav.not_index_bg .nav_bg(style=bg_img) - include ./header.pug #page_site-info #site-title if (is_archive()) diff --git a/layout/includes/page_tag.pug b/layout/includes/page_tag.pug new file mode 100644 index 0000000..e779798 --- /dev/null +++ b/layout/includes/page_tag.pug @@ -0,0 +1,6 @@ +- site.tags.sort('path').each(function (tags){ + - var fontSize = Math.floor(Math.random() * 15 + 15) + "px"; //15 ~ 30 + - var color = "rgb(" + Math.floor(Math.random() * 201) + ", " + Math.floor(Math.random() * 201) +", " + Math.floor(Math.random() * 201) +")"; // 0,0,0 -> 200,200,200 + + a(href=url_for(tags.path) style='font-size:' + fontSize + ';color:' + color)=tags.name +-}) \ No newline at end of file diff --git a/layout/includes/pagination.pug b/layout/includes/pagination.pug index a0ba097..06f0a3d 100644 --- a/layout/includes/pagination.pug +++ b/layout/includes/pagination.pug @@ -14,7 +14,7 @@ else if(page.prev) if(page.next) .prev-post.pull-left - - var pagination_cover = page.prev.cover || random_cover() + - var pagination_cover = page.prev.cover a(href=url_for(page.prev.path)) if theme.lazyload.enable img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` ) @@ -26,7 +26,7 @@ else span=page.prev.title else .prev-post.pull-full - - var pagination_cover = page.prev.cover || random_cover() + - var pagination_cover = page.prev.cover a(href=url_for(page.prev.path)) if theme.lazyload.enable img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) @@ -39,7 +39,7 @@ else if(page.next) if(page.prev) .next-post.pull-right - - var pagination_cover = page.next.cover || random_cover() + - var pagination_cover = page.next.cover a(href=url_for(page.next.path)) if theme.lazyload.enable img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) @@ -50,7 +50,7 @@ else span=page.next.title else .next-post.pull-full - - var pagination_cover = page.next.cover || random_cover() + - var pagination_cover = page.next.cover a(href=url_for(page.next.path)) if theme.lazyload.enable img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) diff --git a/layout/includes/post-bottom.pug b/layout/includes/post-bottom.pug deleted file mode 100644 index 240b5b3..0000000 --- a/layout/includes/post-bottom.pug +++ /dev/null @@ -1,17 +0,0 @@ -- var no_comment_show = page.comments !== false ? '' : 'no_comment_show' -- var no_toc_show = (is_post() && page.toc != false && theme.toc.enable) ? '' : 'no_toc_show' -#post_bottom(class= no_comment_show + ' ' + no_toc_show) - #post_bottom_items - if page.comments !== false - a#mobile_to_comment(href="#post-comment") - i.mobile_scroll_to_comment.fa.fa-comments - - if (is_post() && page.toc != false && theme.toc.enable) - i#mobile_toc.fa.fa-list - #toc_mobile - .toc_mobile_headline= _p('sidebar.catalog') - if (page.encrypt == true) - .toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items"}) - else - !=toc(page.content,{"class":"toc_mobile_items"}) - diff --git a/layout/includes/recent-posts.pug b/layout/includes/recent-posts.pug index 75a7ef3..69877c7 100644 --- a/layout/includes/recent-posts.pug +++ b/layout/includes/recent-posts.pug @@ -5,32 +5,18 @@ each article , index in page.posts.data .post_cover.is_left a(href=url_for(link) title=article.title || _p('no_title')) - var post_cover = article.cover - - var default_post_cover = random_cover() - if (post_cover) - if theme.lazyload.enable - img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) - else - img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + if theme.lazyload.enable + img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) else - if theme.lazyload.enable - img.post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) - else - img.post_bg(src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) else .post_cover.is_right a(href=url_for(link) title=article.title || _p('no_title')) - var post_cover = article.cover - - var default_post_cover = random_cover() - if (post_cover) - if theme.lazyload.enable - img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) - else - img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + if theme.lazyload.enable + img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) else - if theme.lazyload.enable - img.post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) - else - img.post_bg(src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) + img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`) .recent-post-info a.article-title(href=url_for(link) title= article.title || _p('no_title'))= article.title || _p('no_title') if (article.top) @@ -49,14 +35,6 @@ each article , index in page.posts.data a(href=url_for(item.path)).article-meta__categories #[=item.name] if (index < article.categories.data.length - 1) i.fa.fa-angle-right(aria-hidden="true") - //- if (theme.post_meta.tags && article.tags.data.length > 0) - //- span.article-meta.tags - //- span.article-meta__separator | - //- each item, index in article.tags.data - //- i.fa.fa-tag.article-meta__icon(aria-hidden="true") - //- a(href=url_for(item.path)).article-meta__tags #[=item.name] - //- if (index < article.tags.data.length - 1) - //- span.article-meta__link - if theme.auto_excerpt && theme.auto_excerpt.enable - const content = strip_html(article.content) - let expert = content.substring(0, theme.auto_excerpt.length) diff --git a/layout/includes/reward.pug b/layout/includes/reward.pug index f8c7b7e..695572d 100644 --- a/layout/includes/reward.pug +++ b/layout/includes/reward.pug @@ -1,5 +1,5 @@ .post-reward - a.reward-buttom + a.reward-button i.fa.fa-qrcode = ' ' + _p('donate') .reward-main diff --git a/layout/includes/rightside.pug b/layout/includes/rightside.pug index c750e09..92b36b1 100644 --- a/layout/includes/rightside.pug +++ b/layout/includes/rightside.pug @@ -1,13 +1,20 @@ section#rightside.rightside - if is_post() && page.comments !== false - a#to_comment(href="#post-comment") - i.scroll_to_comment.fa.fa-comments - if theme.readmode.enable && is_post() - i#readmode.fa.fa-book(title=_p('rightside.readmode_title')) - i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title')) - i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title')) - if theme.translate && theme.translate.enable - a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title'))= theme.translate.default - if theme.nightshift.enable - - var display_mode = theme.display_mode == 'night'? 'fa fa-sun-o' : 'fa fa-moon-o' - i#nightshift.nightshift(class=display_mode title=_p('rightside.night_mode_title')) + #rightside-config-hide + if theme.readmode.enable && is_post() + i#readmode.fa.fa-book(title=_p('rightside.readmode_title')) + i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title')) + i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title')) + if theme.translate && theme.translate.enable + a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title'))= theme.translate.default + if theme.nightshift && theme.nightshift.enable + - var display_mode = theme.display_mode == 'night'? 'fa fa-sun-o' : 'fa fa-moon-o' + i#nightshift.nightshift(class=display_mode title=_p('rightside.night_mode_title')) + #rightside-config-show + #rightside_config(title=_p("rightside.setting")) + i.fa.fa-cog(aria-hidden="true") + if is_post() && page.comments !== false + a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment")) + i.scroll_to_comment.fa.fa-comments + if is_post() && page.toc != false && theme.toc.enable + i#mobile-toc-button.fa.fa-list-ul.close(title=_p("rightside.toc") aria-hidden="true") + i.fa.fa-arrow-up#go-up(title=_p("rightside.back_to_top") aria-hidden="true") diff --git a/layout/includes/widget/card_author.pug b/layout/includes/widget/card_author.pug index 0e4ee3e..045b3be 100644 --- a/layout/includes/widget/card_author.pug +++ b/layout/includes/widget/card_author.pug @@ -1,35 +1,37 @@ .card_widget.card-author .card-content .post_data - .data-item.text-center - img.lozad.avatar_img(src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`) - p.author-info__name.text-center= config.author - p.author-info__description.text-center= config.description + .data-item.is_center + img.lozad.avatar_img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'`) + p.author-info__name.is_center= config.author + p.author-info__description.is_center= config.description .post_data.data_config if site.posts.length - .data-item.text-center + .data-item.is_center .data_link a(href=url_for(config.archive_dir) + '/') p.headline= _p('aside.articles') p.length_num= site.posts.length if site.tags.length - .data-item.text-center + .data-item.is_center .data_link a(href=url_for(config.tag_dir) + '/' ) p.headline= _p('aside.tags') p.length_num= site.tags.length if site.categories.length - .data-item.text-center + .data-item.is_center .data_link a(href=url_for(config.category_dir) + '/') p.headline= _p('aside.categories') p.length_num= site.categories.length - .post_data.text-center - a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') )= _p('aside.card_bookmark') || 'Follow Me' + .post_data.is_center + a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') ) + i.fa.fa-bookmark(aria-hidden="true") + span= _p('aside.card_bookmark') || 'Follow Me' diff --git a/layout/includes/widget/card_recent_post.pug b/layout/includes/widget/card_recent_post.pug index 671187c..160d440 100644 --- a/layout/includes/widget/card_recent_post.pug +++ b/layout/includes/widget/card_recent_post.pug @@ -9,18 +9,11 @@ - var link = article.link || article.path a(href=url_for(link)) - var post_cover = article.cover - - var default_post_cover = random_cover() .aside_post_cover - if (post_cover) - if theme.lazyload.enable - img.aside_post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title')) - else - img.aside_post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title')) + if theme.lazyload.enable + img.aside_post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title')) else - if theme.lazyload.enable - img.aside_post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title')) - else - img.aside_post_bg(src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title')) + img.aside_post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title')) div#aside_title .aside_post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title') if (theme.post_meta.date_type) diff --git a/layout/page.pug b/layout/page.pug index 0700295..210144b 100644 --- a/layout/page.pug +++ b/layout/page.pug @@ -6,7 +6,8 @@ block content .tag-cloud__title= _p('page.tag') | - span.tag-cloud__amount= site.tags.length - .tag-cloud-tags!= tags(site.tags) + .tag-cloud-tags + include includes/page_tag.pug if page.comments !== false include includes/comments/index.pug #aside_content.aside_content diff --git a/layout/post.pug b/layout/post.pug index 93bdc68..2de421c 100644 --- a/layout/post.pug +++ b/layout/post.pug @@ -4,7 +4,6 @@ block top_img - var top_img = page.top_img || page.cover || theme.post_meta.top_img || theme.post_img || theme.top_img || config.top_img - var bg_img = top_img !== true ? `background-image: url(${top_img})` : '' div#top-container(style=bg_img) - include ./includes/header.pug #post-info #post-title .posttitle=page.title || _p('no_title') @@ -30,16 +29,17 @@ block top_img a(href=url_for(item.path)).post-meta__categories #[=item.name] if (index < page.categories.data.length - 1) i.fa.fa-angle-right(aria-hidden="true") - if (theme.wordcount && theme.wordcount.enable) - .post-meta-wordcount + .post-meta-wordcount + if (theme.wordcount && theme.wordcount.enable) span= _p('post.wordcount') + ': ' span.word-count= wordcount(page.content) span.post-meta__separator | span= _p('post.min2read', min2read(page.content, {cn: 350, en: 160})) - if theme.busuanzi.page_pv - span.post-meta__separator | - span= _p('post.page_pv') + ': ' - span#busuanzi_value_page_pv + if (theme.wordcount && theme.wordcount.enable && theme.busuanzi.page_pv) + span.post-meta__separator | + if theme.busuanzi.page_pv + span= _p('post.page_pv') + ': ' + span#busuanzi_value_page_pv block content diff --git a/layout/tag.pug b/layout/tag.pug index 4a6dce5..0acedd7 100644 --- a/layout/tag.pug +++ b/layout/tag.pug @@ -1,10 +1,18 @@ extends includes/layout.pug block content - include ./includes/mixins/article-sort.pug - #tag - .article-sort-title= _p('page.tag') + ' - ' + page.tag - +articleSort(page.posts) - include includes/pagination.pug - #aside_content.aside_content - include includes/aside.pug + if theme.tag_ui == 'index' + include ./includes/mixins/UI.pug + #recent-posts.recent-posts + +UI_NEW(page.posts) + include includes/pagination.pug + #aside_content.aside_content + include includes/aside.pug + else + include ./includes/mixins/article-sort.pug + #tag + .article-sort-title= _p('page.tag') + ' - ' + page.tag + +articleSort(page.posts) + include includes/pagination.pug + #aside_content.aside_content + include includes/aside.pug diff --git a/package.json b/package.json index b0b6523..fcbc007 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "hexo-theme-melody", - "version": "1.1.5", + "version": "1.2.0", "description": "A Hexo Theme: Butterfly" - } \ No newline at end of file diff --git a/scripts/hexo-plugins.txt b/scripts/hexo-plugins.txt deleted file mode 100644 index e69de29..0000000 diff --git a/scripts/list_archives.js b/scripts/list_archives.js new file mode 100644 index 0000000..420442d --- /dev/null +++ b/scripts/list_archives.js @@ -0,0 +1,133 @@ +'use strict'; + +hexo.extend.helper.register('list_archives', function (options = {}) { + + const { + config + } = this; + const archiveDir = config.archive_dir; + const { + timezone + } = config; + const lang = this.page.lang || this.page.language || config.language; + let { + format + } = options; + const type = options.type || 'monthly'; + const { + style = 'list', transform, separator = ', ' + } = options; + const showCount = Object.prototype.hasOwnProperty.call(options, 'show_count') ? options.show_count : true; + const className = options.class || 'archive'; + const order = options.order || -1; + const limit = 8; + let result = ''; + + var more_button + if (lang === 'zh-CN') { + more_button = '查看更多'; + } else if (lang === 'zh-TW') { + more_button = '查看更多'; + } else { + more_button = 'More'; + } + + + if (!format) { + format = type === 'monthly' ? 'MMMM YYYY' : 'YYYY'; + } + + const posts = this.site.posts.sort('date', order); + if (!posts.length) return result; + + const data = []; + let length = 0; + + posts.forEach(post => { + // Clone the date object to avoid pollution + let date = post.date.clone(); + + if (timezone) date = date.tz(timezone); + if (lang) date = date.locale(lang); + + const year = date.year(); + const month = date.month() + 1; + const name = date.format(format); + const lastData = data[length - 1]; + + if (!lastData || lastData.name !== name) { + length = data.push({ + name, + year, + month, + count: 1 + }); + } else { + lastData.count++; + } + }); + + const link = item => { + let url = `${archiveDir}/${item.year}/`; + + if (type === 'monthly') { + if (item.month < 10) url += '0'; + url += `${item.month}/`; + } + + return this.url_for(url); + }; + + if (style === 'list') { + result += `'; + } else { + for (let i = 0, len = data.length; i < Math.min(len, limit); i++) { + const item = data[i]; + + if (i) result += separator; + + result += ``; + result += transform ? transform(item.name) : item.name; + + if (showCount) { + result += `${item.count}`; + } + + result += ''; + } + if (data.length > limit) { + result += ``; + result += more_button; + result += ''; + } + + } + + return result; +}) \ No newline at end of file diff --git a/scripts/random_cover.js b/scripts/random_cover.js index 75a64eb..daa7b3f 100644 --- a/scripts/random_cover.js +++ b/scripts/random_cover.js @@ -1,4 +1,9 @@ -hexo.extend.helper.register('random_cover', function () { +hexo.extend.filter.register('before_post_render', function(data){ + data.cover = data.cover || random_cover() + return data; +}); + +var random_cover = function () { var cover; var num; if (!Array.isArray(hexo.theme.config.default_cover)) { @@ -10,4 +15,4 @@ hexo.extend.helper.register('random_cover', function () { return cover } -}) \ No newline at end of file +} \ No newline at end of file diff --git a/scripts/related_post.js b/scripts/related_post.js index 1d7f514..2349c10 100644 --- a/scripts/related_post.js +++ b/scripts/related_post.js @@ -44,7 +44,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { for (var i = 0; i < Math.min(relatedPosts.length, limit_num); i++) { - var cover = relatedPosts[i].cover || random_cover() + var cover = relatedPosts[i].cover result += '
'; result += ''; @@ -84,16 +84,3 @@ function compare (attr) { return val2 - val1; } } - -function random_cover() { - var post_cover; - var num; - if (!Array.isArray(hexo.theme.config.default_cover)) { - post_cover = hexo.theme.config.default_cover - return post_cover - } else { - num = Math.floor(Math.random() * (hexo.theme.config.default_cover.length)); - post_cover = hexo.theme.config.default_cover[num]; - return post_cover - } -} diff --git a/scripts/tags.js b/scripts/tags.js deleted file mode 100644 index a9d24be..0000000 --- a/scripts/tags.js +++ /dev/null @@ -1,16 +0,0 @@ -hexo.extend.helper.register('tags', function (site_tags) { - var result = ""; - site_tags.sort('path').each(function (tags) { - var fontSize = Math.floor(Math.random() * 15 + 15) + "px"; //15 ~ 30 - var color = - "rgb(" + - Math.floor(Math.random() * 201) + - ", " + - Math.floor(Math.random() * 201) + - ", " + - Math.floor(Math.random() * 201) + - ")"; // 0,0,0 -> 200,200,200 - result += '' + tags.name + '' - }) - return result; -}) diff --git a/source/css/_global/index.styl b/source/css/_global/index.styl index 9cb98c8..8c7c528 100644 --- a/source/css/_global/index.styl +++ b/source/css/_global/index.styl @@ -13,6 +13,12 @@ body font-family: $font-family line-height: $text-line-height + if !hexo-config('copy.enable') + user-select: none + -moz-user-select: none + -webkit-user-select: none + -ms-user-select: none + *::-webkit-scrollbar width: 8px height: 8px @@ -71,19 +77,6 @@ h6 transition: all 0.2s opacity: 0 -#go-up - position: fixed - right: $go-up-right - bottom: $go-up-bottom - font-size: $sidebar-icon-size - opacity: 0 - cursor: pointer - transition: all .2s - -.fancybox-caption - text-align: center - - hr position: relative margin: 2rem auto @@ -141,85 +134,6 @@ table background: $selection color: $pale-grey -.text-center - text-align: center -.pull-left - float: left - -.pull-right - float: right - -@media screen and (max-width: $bg) - i#toggle-sidebar, - #sidebar - display: none - - body - padding-left: 0 !important - - - -// valine -#vcomment - font-size: inherit - - input - font-size: 0.65rem - - button - font-size: .7rem - padding: .3rem 1rem - background-color: $light-blue - color: #fff - border-color: #fff - - &:hover - background-color: darken($light-blue, 40) - - - textarea - font-size: 0.7rem - background: url(/img/comment_bg.png) 100% 100% no-repeat - - .info - display: none - - .vimg - border: 0 - - &:hover - -moz-transform: rotate(540deg) - -o-transform: rotate(540deg) - -webkit-transform: rotate(540deg) - transform: rotate(540deg) - .vcount - font-size: 0.775rem - - .vnum - font-size: 1.1rem - - .vsys - font-size: 80% - - .vtime - font-size: .65rem - - .vcontent - font-size: 100% - - .vat - font-size: .7125rem - color: $cyan - border: 1px solid $cyan - padding: 0 .8rem - border-radius: 5px - - &:hover - background-color: alpha($cyan,0.5) - - code, pre - font-size: 98% - font-family: $code-font .full_page #site-title, .full_page #site-sub-title, @@ -228,141 +142,15 @@ table #aside_content .author-info__description font-family: $site-name-font - - -#rightside - right: -38px - position: fixed - bottom: 60px - opacity: 0 - transition: all .2s - - - #readmode,#font_plus,#font_minus,#to_comment - width: 30px - height: 30px - background-color: $light-blue - color: #e3e8ee - text-align: center - line-height: 29px - font-size: 16px - display: block - margin-bottom: 2px - cursor: pointer - text-decoration: none - - #to_comment - display: none - - #font_minus,#font_plus - display: none - - .translate_chn_to_cht - width: 30px - height: 30px - background-color: $light-blue - color: #e3e8ee - text-align: center - line-height: 29px - font-size: 16px - display: block - margin-bottom: 2px - cursor: pointer - text-decoration: none - - .nightshift - width: 30px - height: 30px - background-color: $light-blue - color: #e3e8ee - text-align: center - font-size: 17px - display: block - margin-bottom: 2px - cursor: pointer - padding-top: 6px - - - a - &:hover - color: white - &:after - color: white - - - -.comment_headling - font-size: 20px - font-weight: 700 - margin-bottom: 10px - - -// bookmark 樣式 -.fc-container .fancybox-bg - background: #eee - - -.fancybox-is-open.fc-container .fancybox-bg - opacity: 0.95 - - -.fc-content - margin: 20px - max-width: 550px - padding: 50px - box-shadow: 10px 10px 60px -25px - border-radius: 4px - - -.fc-content h3 - margin-top: 0 - font-size: 1.6em - letter-spacing: normal - - -.fc-content p - color: #666 - line-height: 1.5 - - -.fc-content p:last-child - margin-bottom: 0 - - -/* Custom animation */ -.fancybox-fx-material.fancybox-slide--previous, -.fancybox-fx-material.fancybox-slide--next - transform: translateY(-60px) scale(1.1) - opacity: 0 - - -.fancybox-fx-material.fancybox-slide--current - opacity: 1 - transform: translateY(0) scale(1) - - -.bookmark-ok - background: #FF6666 - border-width: 0 - color: #fff - text-decoration: none - padding: 7px 20px - line-height: 1.5 - border-radius: 20px - text-transform: uppercase - font-family: 'Montserrat', 'Helvetica Neue', Helvetica, Arial, sans-serif - font-size: 80% - font-weight: 700 - margin: 5px 5px 5px 0 - display: inline-block - cursor: pointer - outline: none - transition: all .2s ease-in-out - user-select: none - -.tright +.is_right text-align: right +.is_left + text-align: left + +.is_center + text-align: center + .is_visible display: block !important @@ -372,12 +160,28 @@ table .is_hidden overflow: hidden +.pull-left + float: left + +.pull-right + float: right + .fireworks position: fixed z-index: -1 pointer-events: none - // 去掉加載黑框 img[src=""],img:not([src]) opacity: 0 + +#body-wrap + transition: all .3s + +@media screen and (max-width: $bg) + i#toggle-sidebar, + #sidebar + display: none + + body + padding-left: 0 !important \ No newline at end of file diff --git a/source/css/_layout/aside.styl b/source/css/_layout/aside.styl index 4a140b9..6b5f42a 100644 --- a/source/css/_layout/aside.styl +++ b/source/css/_layout/aside.styl @@ -5,17 +5,12 @@ -webkit-box-shadow: 0 4px 8px 6px rgba(7,17,27,.06) box-shadow: 0 4px 8px 6px rgba(7,17,27,.06) border-radius: 8px - -webkit-transition: all .3s - -moz-transition: all .3s - -o-transition: all .3s - -ms-transition: all .3s transition: all .3s background: #fff margin-top: 20px overflow: hidden &:hover - -webkit-box-shadow: 0 4px 12px 12px rgba(7,17,27,0.15) box-shadow: 0 4px 12px 12px rgba(7,17,27,0.15) .card-author @@ -28,10 +23,8 @@ transition: all .3s &:hover - -moz-transform: rotate(540deg) - -o-transform: rotate(540deg) - -webkit-transform: rotate(540deg) transform: rotate(540deg) + .author-info &__name font-size: 1.1rem @@ -54,10 +47,9 @@ .headline display: block font-size: 0.7rem - // letter-spacing: 1px margin-bottom: -21px text-transform: uppercase - color:#4c4948 + color:$font-black #aside-social-icons margin: 0.5rem auto -0.7rem @@ -66,8 +58,7 @@ .social-icon margin: 0 0.5rem - color: #4c4948 - /* text-shadow: 0.1rem 0.1rem 0.2rem rgba(0,0,0,0.15) */ + color: $font-black font-size: 1rem cursor: pointer @@ -75,16 +66,10 @@ transition: all 0.3s &:hover - -moz-transform: rotate(540deg) - -o-transform: rotate(540deg) - -webkit-transform: rotate(540deg) transform: rotate(540deg) - - a#bookmark-it - display: inline-block + #bookmark-it margin-top: .2rem - padding: 0 1rem height: 1.6rem background: $light-blue color: #fff @@ -94,6 +79,9 @@ text-transform: uppercase z-index: 1 + span + padding-left: 10px + .toggle_change--primary,.bookmark--primary color: $ruby @@ -101,7 +89,7 @@ transition-property: color transition-duration: 1s - &:before { + &:before content: "" position: absolute top: 0 @@ -115,18 +103,13 @@ transition-duration: 0.5s transition-timing-function: ease-out z-index: -1 - } - - &:hover { + + &:hover color: white - &:before { + &:before transform: scaleX(1) transition-timing-function: cubic-bezier(0.45, 1.64, 0.47, 0.66) - } - } - - .card-content padding: 1rem 1.2rem @@ -140,7 +123,6 @@ flex-basis: auto justify-content: center - .item_headline font-size: 0.8rem @@ -170,39 +152,41 @@ &::after width: 100% - - .aside_recent_item margin: 10px 0 -15px 0 .aside_recent_post a text-decoration: none - color: #4c4948 + color: $font-black .aside_recent_post margin-bottom: 10px width: 100% .aside_post_cover - height: 70px - width: 70px + height: 66px + width: 66px float: left + overflow: hidden + .aside_post_bg object-fit: cover width: 100% height: 100% max-width: 100% + padding: 0 + transition: all .6s &:hover box-shadow: none + transform: scale(1.1) - #aside_title - padding-top: 4px - + #aside_title .aside_post_meta font-size: 0.6rem - padding-left: 5px + padding-left: 10px + color: #99a9bf .aside_post_title line-height: 1rem @@ -210,14 +194,12 @@ -webkit-line-clamp: 2 -webkit-box-orient: vertical overflow: hidden - height: 41px - padding-left: 5px + height: 40px + padding-left: 10px &:hover color: $light-blue !important - - .aside_category_item,.archive-list list-style: none margin-bottom: -3px @@ -232,14 +214,14 @@ .aside_category_list,.archive-list-item margin-left: -40px - padding: 0.2rem 1rem &:hover background-color: $light-blue color: #363636 a text-decoration: none - color: #4c4948 + color: $font-black + padding: 0.2rem 1rem .aside_category_list_name,.archive-list-link white-space: nowrap @@ -250,9 +232,6 @@ .aside_category_list_link,.archive-list-item display: flex - - - .aside_category_list_length,.archive-list-count float: right @@ -280,16 +259,60 @@ float: right display: inline-block +// bookmark 樣式 +.fc-container .fancybox-bg + background: #eee -@keyframes announ_animation{ - 0%,to{ - color: #4c4948 -} - 50%{ - color: #FF0000 - } - } +.fancybox-is-open.fc-container .fancybox-bg + opacity: 0.95 +.fc-content + margin: 20px + max-width: 550px + padding: 50px + box-shadow: 10px 10px 60px -25px + border-radius: 4px + +.fc-content h3 + margin-top: 0 + font-size: 1.6em + letter-spacing: normal + +.fc-content p + color: #666 + line-height: 1.5 + +.fc-content p:last-child + margin-bottom: 0 + +/* Custom animation */ +.fancybox-fx-material.fancybox-slide--previous, +.fancybox-fx-material.fancybox-slide--next + transform: translateY(-60px) scale(1.1) + opacity: 0 + +.fancybox-fx-material.fancybox-slide--current + opacity: 1 + transform: translateY(0) scale(1) + +.bookmark-ok + background: #FF6666 + border-width: 0 + color: #fff + text-decoration: none + padding: 7px 20px + line-height: 1.5 + border-radius: 20px + text-transform: uppercase + font-family: 'Montserrat', 'Helvetica Neue', Helvetica, Arial, sans-serif + font-size: 80% + font-weight: 700 + margin: 5px 5px 5px 0 + display: inline-block + cursor: pointer + outline: none + transition: all .2s ease-in-out + user-select: none @media screen and (max-width: 900px) .layout_page diff --git a/source/css/_layout/category.styl b/source/css/_layout/category.styl index ab1a6cf..4b046bd 100644 --- a/source/css/_layout/category.styl +++ b/source/css/_layout/category.styl @@ -16,7 +16,6 @@ li position: relative margin: 0.3rem 0 - // padding-left: 0.3rem padding: 0.1rem 0.5rem 0.1rem 1.5rem !important &:hover diff --git a/source/css/_layout/comments.styl b/source/css/_layout/comments.styl index 54169fd..2e455f4 100644 --- a/source/css/_layout/comments.styl +++ b/source/css/_layout/comments.styl @@ -1,2 +1,65 @@ #disqus_thread - margin-top: 1rem \ No newline at end of file + margin-top: 1rem + +.comment_headling + font-size: 20px + font-weight: 700 + margin-bottom: 10px + +// valine +#vcomment + font-size: inherit + + input + font-size: 0.65rem + + button + font-size: .7rem + padding: .3rem 1rem + background-color: $light-blue + color: #fff + border-color: #fff + + &:hover + background-color: darken($light-blue, 40) + + textarea + font-size: 0.7rem + if hexo-config("valine.bg") + background: url(convert(hexo-config("valine.bg"))) 100% 100% no-repeat + + .info + display: none + + .vimg + border: 0 + + &:hover + transform: rotate(540deg) + .vcount + font-size: 0.775rem + + .vnum + font-size: 1.1rem + + .vsys + font-size: 80% + + .vtime + font-size: .65rem + + .vcontent + font-size: 100% + + .vat + font-size: .7125rem + color: $cyan + border: 1px solid $cyan + padding: 0 .8rem + border-radius: 5px + + &:hover + background-color: alpha($cyan,0.5) + + code, pre + font-size: 98% diff --git a/source/css/_layout/flink.styl b/source/css/_layout/flink.styl index 84ba4e0..505649a 100644 --- a/source/css/_layout/flink.styl +++ b/source/css/_layout/flink.styl @@ -24,13 +24,10 @@ text-overflow: ellipsis overflow: hidden border-radius: 8px - -webkit-transform: perspective(1px) translateZ(0) transform: perspective(1px) translateZ(0) box-shadow: 0 0 1px rgba(0, 0, 0, 0) position: relative - -webkit-transition-property: color transition-property: color - -webkit-transition-duration: 0.3s transition-duration: 0.3s img @@ -44,9 +41,6 @@ &:hover img filter: unqoute("progid:DXImageTransform.Microsoft.BasicImage(rotation=3)") - -moz-transform: rotate(540deg) - -o-transform: rotate(540deg) - -webkit-transform: rotate(540deg) transform: rotate(540deg) &:before @@ -58,13 +52,9 @@ right: 0 bottom: 0 background: $light-blue !important - -webkit-transform: scale(0) transform: scale(0) - -webkit-transition-property: transform transition-property: transform - -webkit-transition-duration: 0.3s transition-duration: 0.3s - -webkit-transition-timing-function: ease-out transition-timing-function: ease-out .md-links-item:hover, @@ -94,7 +84,7 @@ .post-cards margin-top: 5px min-height: 100px - padding: 15px + padding: 0 15px border-radius: 15px .comment-word @@ -121,8 +111,6 @@ li width: calc(100%/2 - 14px) - - @media screen and (max-width:600px) .flink .md-links diff --git a/source/css/_layout/footer.styl b/source/css/_layout/footer.styl index 012ae13..4209655 100644 --- a/source/css/_layout/footer.styl +++ b/source/css/_layout/footer.styl @@ -37,3 +37,7 @@ footer .footer-separator margin: 0 0.2rem + .icp-icon + padding: 0 4px + vertical-align: text-bottom + diff --git a/source/css/_layout/head.styl b/source/css/_layout/head.styl index 04c3b78..9dba26d 100644 --- a/source/css/_layout/head.styl +++ b/source/css/_layout/head.styl @@ -3,7 +3,7 @@ margin-bottom: 1rem &.full_page - height: 100vh + height: $index_top_img_height .nav_bg width: 100% @@ -16,7 +16,6 @@ &.not_index_bg height: 20rem - #site-social-icons margin: 0 auto width: 15rem @@ -36,7 +35,7 @@ #site-info position: absolute width: 100% - top: 43% + top: $index_site_info_top #site-title, #site-sub-title @@ -68,8 +67,10 @@ .scroll-down-effects position: absolute - color: #fff + color: $white +#header + position: relative #page-header position: absolute @@ -79,110 +80,17 @@ width: 100% border: none font-size: 18px - transition: all 0.2s ease-in-out + transition: all .3s .toggle-menu display: none padding-top: 0.6rem color: $light-grey cursor: pointer - transition: all 0.2s ease-in-out &:hover color: $white - - .menu-icon-first, - .menu-icon-second, - .menu-icon-third - width: 18px - height: 3px - background-color: #eee - margin: 2px 0 - transition: 0.4s - - &.close - /* 旋转第一条横线 */ - .menu-icon-first - -webkit-transform: rotate(45deg) translate(4px, 3px) - transform: rotate(45deg) translate(4px, 3px) - - /* 隐藏第二条横线 */ - .menu-icon-second - opacity: 0 - - /* 旋转第三条横线 */ - .menu-icon-third - -webkit-transform: rotate(-45deg) translate(4px, -4px) - transform: rotate(-45deg) translate(4px, -4px) - .menu_mask - position: fixed - top: 0 - bottom: 0 - width: 100% - height: 110vh - left: 0 - right: 0 - background: alpha($black,0.7) - display: none - - .menus - .mobile_author_icon - display: none - padding: 1.3rem 1.5rem 0 - text-align: center - - - img - height: 120px - width: 120px - display: inline-block - vertical-align: top - border-radius: 70px - transition: all .3s - - .mobile_post_data - display: flex - justify-content: center - padding: .6rem .5rem 0 - display: none - - .mobile_data_item - flex: 1 - - .mobile_data_link - a - text-decoration: none - - .length_num - font-size: .9rem - color: #000 - - .headline - display: block - font-size: 0.7rem - // letter-spacing: .5px - text-transform: uppercase - color:#4c4948 - - .menus-expand - position: absolute - width: 30px !important - height: 30px - right: 0 - padding: 6px - display: none - transform: rotate(0deg) - transition: all .3s - - &.menus-closed - transform: rotate(180deg) !important - transition: all .3s - - hr - margin: 1rem auto - display: none - a color: $light-grey text-decoration: none @@ -190,27 +98,6 @@ &:hover color: $white - .site-page - position: relative - padding-bottom: 0.3rem - text-shadow: 0.05rem 0.05rem 0.1rem rgba(0, 0, 0, 0.3) - font-size: 0.7rem - cursor: pointer - &::after - position: absolute - bottom: 0 - left: 0 - z-index: -1 - width: 0 - height: 3px - background-color: lighten($theme-color, 30%) - content: "" - transition: all 0.3s ease-in-out - - &:hover - &::after - width: 100% - &.fixed position: fixed top: -60px @@ -225,50 +112,49 @@ opacity: 0 a, - #site-name + #site-name, + .toggle-menu color: $light-black text-shadow: none - - .menu-icon-first, - .menu-icon-second, - .menu-icon-third - background-color: $light-black - text-shadow: none - - &a,#site-name - &:hover - color: $light-blue + &:hover + color: $light-blue &.visible transform: translate3d(0, 100%, 0) + transition: all .3s + + .menus_item_child + background-color: $white !important + + &:before + border-color: transparent transparent $white !important #site-name text-shadow: 0.1rem 0.1rem 0.2rem rgba(0, 0, 0, 0.15) font-weight: bold cursor: pointer -@media screen and (min-width: $sm) - #site-title - font-size: 2rem + .menus_item + display: inline-block + padding: 0 0 0 0.7rem - #site-sub-title - font-size: 1.2rem - - #page-header - .menus_item - display: inline-block - padding: 0 0.5rem - - &:hover,&:focus - .menus_item_child - display: block + &:hover,&:focus + .menus_item_child + display: block + + .menus-expand + transform: rotate(180deg) !important + + .menus-expand + padding: 4px + transform: rotate(0deg) + transition: all .3s .menus_item_child position: absolute background-color: alpha($white, 0.8) padding: 8px 10px - width: fit-content border-radius: 5px box-shadow: 0 5px 20px -4px rgba(0,0,0,.5) display: none @@ -285,95 +171,63 @@ border-style: solid border-color: transparent transparent alpha($white, 0.8) - .menus_item_child li - list-style: none - text-align: center + li + list-style: none + text-align: center - a - color: #3b3a3a; - text-shadow: none; + a + color: #3b3a3a + text-shadow: none - &.fixed.visible - .menus_item_child - background-color: #ffffff +.site-page + position: relative + padding-bottom: 0.3rem + text-shadow: 0.05rem 0.05rem 0.1rem rgba(0, 0, 0, 0.3) + font-size: 0.7rem + cursor: pointer + + &::after + position: absolute + bottom: 0 + left: 0 + z-index: -1 + width: 0 + height: 3px + background-color: lighten($theme-color, 30%) + content: "" + transition: all 0.3s ease-in-out + + &:hover + &::after + width: 100% + + +@media screen and (min-width: $sm) + #site-title + font-size: 2rem + + #site-sub-title + font-size: 1.2rem - &:before - border-color: transparent transparent #ffffff @media screen and (max-width: $sm) #page-header padding: 10px 0.8rem + .menus + display: none + .toggle-menu display: block - .menus - position: fixed - top: 0 - right: -250px - width: 250px - height 101vh - background: $white - cursor: pointer - box-shadow: 0 0 4px rgba(0, 0, 0, 0.27) - z-index: 1 - overflow-y: scroll - display: none - - .mobile_post_data - display: flex - - .menus_items - a - display: block !important - opacity: 1 !important - margin: 0 - padding: .3rem 1.5rem - color: $font-black - text-shadow: none - font-size: 0.8rem - z-index: 0 - text-overflow: ellipsis - overflow: hidden - white-space: nowrap - - i - width: 30% - text-align: left - - span - width 70% - - &:hover - color: $light-blue - - .menus-expand - display: inline-block - - .menus_item_child - list-style: none - margin: 0 - - .mobile_author_icon - display: block - - .menus_items - padding: 0 .5rem - margin-bottom: 5rem - - hr - display: block - .search - right: 0.5rem - span display none - - &.fixed.open-sidebar - .search - display: inline-block - opacity: 1 - - - + +@media screen and (max-width: $bg) + #page-header + &.fixed + &.open-sidebar + .site-page + display: inline-block + opacity: 1 \ No newline at end of file diff --git a/source/css/_layout/mobile-sidebar.styl b/source/css/_layout/mobile-sidebar.styl new file mode 100644 index 0000000..e2eca26 --- /dev/null +++ b/source/css/_layout/mobile-sidebar.styl @@ -0,0 +1,163 @@ +#mobile-sidebar + #menu_mask + position: fixed + top: 0 + bottom: 0 + width: 100% + height: 110vh + left: 0 + right: 0 + background: alpha($black,0.7) + z-index: 102 + display: none + + #mobile-sidebar-menus,#mobile-sidebar-toc + position: fixed + top: 0 + right: -254px + width: 250px + height 101vh + background: $white + cursor: pointer + box-shadow: 0 0 4px alpha($dark-black,0.27) + z-index: 103 + overflow-y: scroll + display: block + transition: all .3s + display: none + + #mobile-sidebar-menus + .mobile_author_icon + padding: 1.3rem 1.5rem 0 + text-align: center + + img + height: 120px + width: 120px + display: inline-block + vertical-align: top + border-radius: 70px + transition: all .3s + + .mobile_post_data + display: flex + justify-content: center + padding: .6rem .5rem 0 + + .mobile_data_item + flex: 1 + + .mobile_data_link + a + text-decoration: none + + .length_num + font-size: .9rem + color: $dark-black + + .headline + display: block + font-size: 0.7rem + text-transform: uppercase + color:$font-black + + hr + margin: 1rem auto + + .menus_items + padding: 0 .5rem + margin-bottom: 5rem + + a + display: block !important + opacity: 1 !important + margin: 0 + padding: .3rem 1.5rem + color: $font-black + text-shadow: none + font-size: 0.8rem + z-index: 0 + text-overflow: ellipsis + overflow: hidden + white-space: nowrap + + i + width: 30% + text-align: left + + span + width 70% + + &:hover + color: $light-blue + + .menus-expand + position: absolute + width: 30px !important + height: 30px + right: 0 + padding: 6px + transform: rotate(0deg) + transition: all .3s + + &.menus-closed + transform: rotate(180deg) !important + transition: all .3s + + .menus_item_child + list-style: none + margin: 0 + + #mobile-sidebar-toc + padding: 15px 10px + + ol,li + list-style: none + padding: 0 0 0 5px + margin: 0 + + + .toc_mobile_headline + text-align: center + font-size: 18px + font-weight: bold + + a + text-decoration: none + color: $light-black + + &:hover + color: $light-blue + +// 手機打開menus，toc特效 +.open-mobile-menus, +.open-mobile-toc + overflow: hidden + #body-wrap + transform: translateX(-250px) + #page-header + transform: translateX(-250px) + &.fixed.visible + transform: translate3d(-250px, 100%, 0) + #rightside + transform: translate3d(-288px, 0, 0) !important + +.open-mobile-menus + #mobile-sidebar + #mobile-sidebar-menus + transform: translateX(-254px) + +.open-mobile-toc + #mobile-sidebar + #mobile-sidebar-toc + transform: translateX(-254px) + +@media screen and (max-width: $sm) + #mobile-sidebar-menus + display: block !important + +@media screen and (max-width: $bg) + #mobile-sidebar-toc + display: block !important + + diff --git a/source/css/_layout/nightshift.styl b/source/css/_layout/nightshift.styl index e796d82..064db0a 100644 --- a/source/css/_layout/nightshift.styl +++ b/source/css/_layout/nightshift.styl @@ -1,11 +1,17 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable") .night-mode + color: #99a9bf + background-color: #2d3032 + #sidebar background: #2d3035 !important box-shadow: -0.25rem 0 0.25rem #2d3035 !important &::-webkit-scrollbar-thumb background: lighten(#2d3035,5) + + #toggle-sidebar + color: #99a9bf !important if hexo-config("local_search") && hexo-config("local_search.enable") #local-search @@ -66,8 +72,12 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable") .vcontent.expand:after background: hsla(204, 5%, 22%, 1) - .recent-post-item .article-title - color: #99a9bf + .recent-post-item + background: #2d3032 !important + + .article-title, + a + color: #99a9bf !important #page-header &.fixed @@ -144,7 +154,12 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable") .translate_chn_to_cht, .nightshift, #readmode, - #to_comment + #to_comment, + #font_plus, + #font_minus, + #rightside_config, + #go-up, + #mobile-toc-button background-color: #2d3035 !important img @@ -207,12 +222,16 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable") #top-container a, #footer, #footer a, - #page-header a + #page-header a, + #page-header .toggle-menu color: rgba(238,238,238,.6) + + #footer + background-color: #2d3032 //打賞 分享 .post-reward - .reward-buttom + .reward-button background-color: #616a6b .post_share filter: brightness(0.6) @@ -222,20 +241,6 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable") &::-webkit-scrollbar-thumb background: lighten(#2d3035,5) - - #post_bottom - background: #2d3035 - box-shadow: 0 -5px 6px -5px rgba(133,133,133,0) - - i - color: #99a9bf !important - - #toc_mobile - background: #2d3035 - - a - color: #99a9bf !important - #web_bg background-color: #2d3032 @@ -246,46 +251,34 @@ if hexo-config("nightshift") && hexo-config("nightshift.enable") background-color: #616a6b - @media screen and (max-width: 768px) - .night-mode - color: #99a9bf - background-color: rgb(45, 48, 53) + #mobile-sidebar + #mobile-sidebar-menus + background: #2d3035 - #page-header - .menus - background: #2d3035 - - .headline - color: #99a9bf !important - - .length_num - color: darken(#99a9bf,10) !important - a - color: #99a9bf !important - .menu-icon-first, - .menu-icon-second, - .menu-icon-third - background-color: #99a9bf !important - - - @media screen and (min-width: 768px) - .night-mode - color: #99a9bf - background-color: #2d3032 + .headline + color: #99a9bf !important - .recent-post-item - background: #2d3035 !important + .length_num + color: darken(#99a9bf,10) !important + a + color: #99a9bf !important - #page-header - .menus_item_child - background-color: #2d3035 !important + #mobile-sidebar-toc + background: #2d3035 + a + color: #99a9bf !important - &:before - border-color: transparent transparent #2d3035 !important - li - a - color: #99a9bf + #page-header + .menus_item_child + background-color: #2d3035 !important + + &:before + border-color: transparent transparent #2d3035 !important + + li + a + color: #99a9bf diff --git a/source/css/_layout/note.styl b/source/css/_layout/note.styl index 25a6d8d..5baebdf 100644 --- a/source/css/_layout/note.styl +++ b/source/css/_layout/note.styl @@ -39,10 +39,10 @@ p, ul, ol, table, pre, blockquote, img &:first-child - margin-top: 0 + margin-top: 0 !important &:last-child - margin-bottom: 0 + margin-bottom: 0 !important if ($note-icons) diff --git a/source/css/_layout/page.styl b/source/css/_layout/page.styl index 26d8e7b..99b72d8 100644 --- a/source/css/_layout/page.styl +++ b/source/css/_layout/page.styl @@ -125,20 +125,25 @@ galleryItemStyle(w, h) color: $light-blue !important .tag-cloud - padding: 1.5rem 1rem 2rem - text-align: center + padding: 40px 44px 44px a display: inline-block margin: 0 0.4rem text-decoration: none cursor: pointer + transition: all .3s &:hover color: $ruby !important + transform: scale(1.1) &__title font-size: 1.8rem + text-align: center + + &-tags + text-align: center #tag, #category, @@ -186,7 +191,7 @@ galleryItemStyle(w, h) &-item position: relative - margin-bottom: 1rem + margin: 0 0 1rem 0.5rem transition: all 0.2s ease-in-out &:hover @@ -196,8 +201,8 @@ galleryItemStyle(w, h) &:before $w = 0.3rem position: absolute - top: 0.48rem - left: calc(-1rem - 7px) + top: 1.8rem + left: calc(-1rem - 17px) width: w = $w height: h = w border: 0.5 * w solid $light-blue @@ -217,20 +222,57 @@ galleryItemStyle(w, h) &:before top: 0.7rem border-color: $ruby - + &__time - position: absolute - top: 0.1rem color: $a-link-color + font-size: 0.7rem + padding-left: 0.4rem &__title - display: block - margin-left: 5rem color: $font-black + font-size: 0.75rem + height: 60px + overflow: hidden + display: -webkit-box + -webkit-line-clamp: 2 + -webkit-box-orient: vertical + transition: all .3s + + &:hover + color: $light-blue + transform: translateX(20px) + + &__img + img + height: 100% + width: 100% + object-fit: cover + padding: 0 + transition: all .6s + + &:hover + transform: scale(1.1) + + &__post text-decoration: none - font-size: 0.8rem cursor: pointer + &:hover + color: $a-link-color + + &-img + height: 80px + width: 80px + display: inline-block + overflow: hidden + + &-post + display: inline-block + top: 0 + position: absolute + margin-left: 1rem + + .category-lists padding: 1rem 0 1.5rem diff --git a/source/css/_layout/pagination.styl b/source/css/_layout/pagination.styl index 06b14fc..fb20f71 100644 --- a/source/css/_layout/pagination.styl +++ b/source/css/_layout/pagination.styl @@ -22,7 +22,8 @@ color: $white cursor: default - img.prev_cover, img.next_cover + img.prev_cover, + img.next_cover position: absolute padding: 0 top: 0 diff --git a/source/css/_layout/post.styl b/source/css/_layout/post.styl index dbc2d2f..b382c98 100644 --- a/source/css/_layout/post.styl +++ b/source/css/_layout/post.styl @@ -385,14 +385,13 @@ img // 文章字體 -#post-content p { +#post-content p font-size: 1.1em -} -#post-content ol, #post-content ul { + +#post-content ol, +#post-content ul font-size: 1em -} - @media screen and (max-width: 1024px) @@ -400,33 +399,21 @@ img margin: 0 15px width: auto - - - .layout_post padding: 50px - -webkit-box-shadow: 0 4px 8px 6px rgba(7,17,27,0.06) box-shadow: 0 4px 8px 6px rgba(7,17,27,0.06) border-radius: 8px - -webkit-transition: all 0.3s - -moz-transition: all 0.3s - -o-transition: all 0.3s - -ms-transition: all 0.3s transition: all 0.3s background: #fff margin-top: 40px margin-bottom: 40px &:hover - -webkit-box-shadow: 0 4px 12px 12px rgba(7,17,27,0.15) box-shadow: 0 4px 12px 12px rgba(7,17,27,0.15) img - margin:0 auto display:block - - .tag_share display: block @@ -455,4 +442,35 @@ img #post a text-decoration: none - color: $light-blue \ No newline at end of file + color: $light-blue + + h1 + margin: 0.8rem 0 + + h2, + h3, + h4, + h5, + h6 + margin: 1rem 0 0.5rem 0 + + img + margin: 0 auto 0.8rem + + blockquote, + p + margin: 0 0 0.8rem 0 + + + table,.note + margin: 0.8rem 0 + + figure + margin: 0.8rem 0 + + table + margin: 0 + + blockquote + p + margin: 0.5rem 0 diff --git a/source/css/_layout/post_bottom.styl b/source/css/_layout/post_bottom.styl deleted file mode 100644 index 2df28b7..0000000 --- a/source/css/_layout/post_bottom.styl +++ /dev/null @@ -1,70 +0,0 @@ -#post_bottom - position: fixed - bottom: -50px - background: alpha($white, 0.8) - width: 100% - border: none - box-shadow: 0 -5px 6px -5px alpha($grey, 0.6) - display: none - transition: all .2s - cursor: pointer - z-index: 100 - - &.toc_mobile_show - bottom: 0 - - #mobile_to_comment,#mobile_toc - width: 50% - text-align: center - font-size: 18px - padding: 7px 0 - display: inline-block - color: $light-black - - a - text-decoration: none - color: $light-black - - #toc_mobile - box-shadow: 0 0 4px alpha($grey, 0.6) - background: $white - width: 50% - height: 70% - position: fixed - bottom: 60px - right: 10px - overflow: scroll - padding: 15px 10px - font-size: 15px - border-radius: 10px - display: none - - ol,li - list-style: none - padding: 0 0 0 5px - margin: 0 - - a - &:hover - color: $light-blue - - .toc_mobile_headline - text-align: center - font-size: 18px - font-weight: bold - - &.no_comment_show - #mobile_toc - width: 100% - padding: 16px 0 - - #toc_mobile - right: 25% - - &.no_toc_show - #mobile_to_comment - width: 100% - -@media screen and (max-width:768px) - #post_bottom - display: block diff --git a/source/css/_layout/readmode.styl b/source/css/_layout/readmode.styl index 6516988..b76468c 100644 --- a/source/css/_layout/readmode.styl +++ b/source/css/_layout/readmode.styl @@ -7,47 +7,49 @@ if hexo-config("readmode") && hexo-config("readmode.enable") #toggle-sidebar display: none + #page-header + #site-name, + .site-page, + .toggle-menu + text-shadow: none + color: $font-black + + .menus_item_child + background-color: darken($pale-yellow,5) !important + + &:before + border-color: transparent transparent darken($pale-yellow,5) !important + #top-container background-image: none !important height: 14rem background-color: $pale-yellow a - color: #4c4948 - + color: $font-black &:before opacity: 0 - - #site-name, - .site-page - text-shadow: none - color: #4c4948 - + #post-info text-align: center padding: 0 - color: #4c4948 + color: $font-black #post-title, #post-meta text-shadow: none - #page-header - &.fixed - background: alpha(darken($pale-yellow,5),0.5) - box-shadow: none + #page-header + &.fixed + background: alpha(darken($pale-yellow,5),0.5) + box-shadow: none - &.open-sidebar - .site-page - display: inline-block - opacity: 1 + &.open-sidebar + .site-page + display: inline-block + opacity: 1 - .toggle-menu - .menu-icon-first, - .menu-icon-second, - .menu-icon-third - background-color: #4c4948 .layout_post box-shadow: none @@ -98,31 +100,6 @@ if hexo-config("readmode") && hexo-config("readmode.enable") .copy-notice background: darken($pale-yellow,10) - - .toc_mobile_show - background: alpha(darken($pale-yellow,5),0.5) !important - box-shadow: none !important - - #post_bottom_items - #mobile_to_comment - display: none - #mobile_toc - width: 100% - padding: 16px 0 - #toc_mobile - right: 25% - background: darken($pale-yellow,5) - - - @media screen and (min-width: 768px) - .read-mode - .menus_item_child - background-color: darken($pale-yellow,5) !important - - &:before - border-color: transparent transparent darken($pale-yellow,5) !important - - diff --git a/source/css/_layout/reward.styl b/source/css/_layout/reward.styl index 3cc35a2..6f6ac30 100644 --- a/source/css/_layout/reward.styl +++ b/source/css/_layout/reward.styl @@ -5,7 +5,7 @@ text-align: center display: block - .reward-buttom + .reward-button text-align: center display: inline-block cursor: pointer diff --git a/source/css/_layout/rightside.styl b/source/css/_layout/rightside.styl new file mode 100644 index 0000000..1ae8338 --- /dev/null +++ b/source/css/_layout/rightside.styl @@ -0,0 +1,64 @@ +#rightside + right: -38px + position: fixed + bottom: 40px + transition: all .3s + opacity 0 + + #rightside-config-hide + transition: all .3s + display none + + #readmode, + #font_plus, + #font_minus, + #to_comment, + .nightshift, + #mobile-toc-button, + #go-up, + #rightside_config + width: 30px + height: 30px + background-color: $light-blue + color: $white + text-align: center + line-height: 29px + font-size: 16px + display: block + margin-bottom: 2px + cursor: pointer + text-decoration: none + + &:hover + background-color: $ruby + + #rightside_config + i + animation: avatar_turn_around 2s linear infinite + + .translate_chn_to_cht + width: 30px + height: 30px + background-color: $light-blue + color: $white + text-align: center + line-height: 29px + font-size: 16px + display: block + margin-bottom: 2px + cursor: pointer + text-decoration: none + + &:hover + background-color: $ruby + + #mobile-toc-button + display: none + + +@media screen and (max-width: $bg) + #rightside + #mobile-toc-button + display: block + + diff --git a/source/css/_layout/z-other.styl b/source/css/_layout/z-other.styl index 631124f..3fc836a 100644 --- a/source/css/_layout/z-other.styl +++ b/source/css/_layout/z-other.styl @@ -41,35 +41,33 @@ padding: 0 margin: 0 object-fit: cover - &:hover transform:scale(1.1) #pagination margin-top: 2rem + + .recent-post-info + padding: 50px 40px + display: inline-block + width: 55% + overflow hidden -.recent-post-info - padding: 50px 40px - display: inline-block - width: 55% - overflow hidden + a.article-meta__categories + text-decoration: none + color: #858585 + &:hover + color: #49b1f5 !important -a.article-meta__categories - text-decoration: none - color: #858585 - - &:hover - color: #49b1f5 !important - -.content - display: -webkit-box - -webkit-line-clamp: 3 - -webkit-box-orient: vertical - overflow: hidden - height: 90px + .content + display: -webkit-box + -webkit-line-clamp: 3 + -webkit-box-orient: vertical + overflow: hidden + height: 90px .layout_page display: flex @@ -93,19 +91,14 @@ a.article-meta__categories .card_widget,#archive,.tag-cloud,#tag,.category-content,#category,#page,.flink &:hover - -webkit-box-shadow: 0 4px 12px 12px rgba(7,17,27,0.15) box-shadow: 0 4px 12px 12px rgba(7,17,27,0.15) @media screen and (min-width: 900px) if hexo-config("aside.position") == "left" - #recent-posts + #recent-posts,#page,.category-content,#archive,.tag-cloud,.flink,#tag,#category order: 2 - - #page,.category-content,#archive,.tag-cloud,.flink,#tag,#category - order: 2 - @media screen and (max-width: 900px) #page,.category-content,#archive,.tag-cloud,.flink,#tag,#category @@ -121,9 +114,9 @@ a.article-meta__categories border-radius: 8px .post_cover - width: 100% !important - height: 230px !important - border-radius: 8px !important + width: 100% !important + height: 230px !important + border-radius: 8px !important .recent-post-item,#page,.tag-cloud,.flink margin-top: 1px @@ -164,12 +157,13 @@ a.article-meta__categories .category-lists padding: 0 - .recent-post-info - padding: 20px 10px !important - width: 100% + #recent-posts + .recent-post-info + padding: 20px 10px !important + width: 100% - #recent-posts #pagination - margin-bottom: 0 + #pagination + margin-bottom: 0 #nav #site-social-icons @@ -202,17 +196,20 @@ footer animation: main 1s #nav, -#top-container +#top-container, +#page-header animation: header 1s #site-title animation: titlescale 1s -canvas,#web_bg +canvas, +#web_bg animation: to_show 4s .card-announcement-animation - animation: announ_animation 1.5s infinite + animation: announ_animation .8s linear infinite + color: #FF0000 .scroll-down-effects animation: scroll-down-effect 1.5s infinite @@ -222,8 +219,11 @@ if hexo-config("avatar_effect") == true animation: avatar_turn_around 2s linear infinite .reward-main - animation: donate_effcet .3s .1s ease both; + animation: donate_effcet .3s .1s ease both +.rightside-in + animation: rightside_in_animate .3s + display: block !important @keyframes scroll-down-effect 0% @@ -286,4 +286,17 @@ if hexo-config("avatar_effect") == true transform: translateY(-20px) 100% opacity: 1 - transform: translateY(0) \ No newline at end of file + transform: translateY(0) + +@keyframes announ_animation + 0%,to + transform: scale(1) + 50% + transform: scale(1.2) + +@keyframes rightside_in_animate + 0% + transform: translateX(28px) + 100% + transform: translateX(0) + diff --git a/source/css/var.styl b/source/css/var.styl index 8974894..496949b 100644 --- a/source/css/var.styl +++ b/source/css/var.styl @@ -60,9 +60,9 @@ $lg = 1450px $sidebar-icon-top = 20px $sidebar-icon-left = $sidebar-icon-top - 4px $sidebar-icon-size = 16px -$go-up-bottom = $sidebar-icon-top -$go-up-right = -($sidebar-icon-left) $web-bg = convert(hexo-config("background")) +$index_top_img_height = convert(hexo-config('index_top_img_height')) || 100vh +$index_site_info_top = convert(hexo-config("index_site_info_top")) || 43% // Global color & SVG $pale-blue = $theme-hr-color $light-blue = $theme-color diff --git a/source/img/icp.png b/source/img/icp.png new file mode 100644 index 0000000000000000000000000000000000000000..9f763946dd6606addeab24e40e2369124d53a048 GIT binary patch literal 19256 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 literal 0 HcmV?d00001 diff --git a/source/js/main.js b/source/js/main.js index 30ee2e8..ea993ea 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -1,4 +1,8 @@ $(function () { + + /** + * 進入post頁sidebar自動打開 + */ if ($('#sidebar').hasClass('auto_open')) { if ($(".sidebar-toc__content").children().length > 0) { $(".layout_post").animate({}, function () { @@ -32,8 +36,9 @@ $(function () { } - //------------------------------------------------------------------------------------------------------- - //sidebar + /** + * 點擊左下角箭頭,顯示sidebar + */ $('#toggle-sidebar').on('click', function () { if (!isMobile() && $('#sidebar').is(':visible')) { @@ -76,25 +81,25 @@ $(function () { } }) - //----------------------------------------------------------------------------------------------------- - // 首页fullpage添加 - // 添加class + /** + * 首頁fullpage添加 + * 添加class + */ if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {} else { $('.full_page .nav_bg').css('background-attachment', 'fixed'); - $('#to_comment').css("display", "block") } - //--------------------------------------------------------------------------------------------------------- - + /** + * 首頁top_img底下的箭頭 + */ $(".scroll-down").on("click", function () { - scrollTo('#content-outer') - }); - //-------------------------------------------------------------------------------------------------------- - // bookmark + /** + * BOOKMARK 書簽 + */ $.fancyConfirm = function (opts) { opts = $.extend(true, { title: 'Are you sure?', @@ -109,7 +114,7 @@ $(function () { src: '
' + '

' + opts.title + '

' + '

' + opts.message + '

' + - '

' + + '

' + '' + '

' + '
', @@ -147,9 +152,10 @@ $(function () { } }); - //------------------------------------------------------------------------------------------------------- - //代码copy - // Add copy icon + /** + * 代碼copy + * Add copy icon + */ $('figure.highlight').wrap('
') var highlight_copy = GLOBAL_CONFIG.highlight_copy @@ -209,7 +215,9 @@ $(function () { }) } - //代碼框語言識別 + /** + * 代碼框語言識別 + */ var highlight_lang = GLOBAL_CONFIG.highlight_lang if (highlight_lang == 'true') { var $highlight_lang = $('
') @@ -231,7 +239,9 @@ $(function () { }) } - //代碼收縮 + /** + * 代碼收縮 + */ var highlight_shrink = GLOBAL_CONFIG.highlight_shrink if (highlight_shrink == 'true') { var $code_expand = $('') @@ -249,8 +259,9 @@ $(function () { } }) - //--------------------------------------------------------------------------------------------------- - //fancybox + /** + * fancybox + */ var imgList = $(".recent-post-info img").not('.no-fancybox'); if (imgList.length === 0) { imgList = $("#post-content img").not('.no-fancybox'); @@ -304,55 +315,71 @@ $(function () { }); - //--------------------------------------------------------------------------------------------------------- - /** head点击*/ - $('.toggle-menu').on('click', function () { + /** + * 手機menu和toc按鈕點擊 + * 顯示menu和toc的sidebar + */ + function mobile_menu_close() { if ($(".toggle-menu").hasClass("open")) { $(".toggle-menu").removeClass("open").addClass("close"); - $('body').addClass("is_hidden"); - $('.menus').animate({ - right: 0 - }, 300) - $('.menu_mask,.menus').css("display", "block") + $('body').removeClass("open-mobile-menus"); + $('#menu_mask').fadeOut() } + + } + + function mobile_toc_close() { + if ($("#mobile-toc-button").hasClass("open")) { + $("#mobile-toc-button").removeClass("open").addClass("close"); + $('body').removeClass("open-mobile-toc"); + $('#menu_mask').fadeOut(); + } + + } + $('.toggle-menu').on('click', function () { + if ($(".toggle-menu").hasClass("close")) { + $(".toggle-menu").removeClass("close").addClass("open"); + $('body').addClass("open-mobile-menus"); + $('#menu_mask').fadeIn(); + } + }) - $('.menu_mask ').on('click touchstart', function () { - $(".toggle-menu").removeClass("close").addClass("open"); - $('body').removeClass("is_hidden"); - $('.menus').animate({ - right: -250 - }, 300, function () { - { - $('.menus').css({ - 'display': '' - }) - } - }) - $('.menu_mask').css("display", "") + $('#mobile-toc-button').on('click', function () { + if ($("#mobile-toc-button").hasClass("close")) { + $("#mobile-toc-button").removeClass("close").addClass("open"); + $('body').addClass("open-mobile-toc"); + $('#menu_mask').fadeIn(); + } + + }) + + $('#menu_mask').on('click touchstart', function () { + mobile_menu_close() + mobile_toc_close() }) $(window).on('resize', function (e) { if (!$('.toggle-menu').is(':visible')) { - if ($(".toggle-menu").hasClass("close")) { - $(".toggle-menu").removeClass("close").addClass("open"); - $('body').removeClass("is_hidden"); - $('.menus').animate({ - right: -250 - }, 300) - $('.menu_mask').css("display", "") - } + mobile_menu_close() } + if (!$('#mobile-toc-button').is(':visible')) { + mobile_toc_close() + } + }) + //點擊toc，收起sidebar + $("#mobile-sidebar-toc a").on('click', function () { + mobile_toc_close() + }) - //--------------------------------------------------------------------------------------------------------- -/** scroll 滚动 toc*/ + /** + * scroll 滚动 toc + */ var initTop = 0 $('.toc-child').hide() - var is_post_bottom = ($('#post_bottom').hasClass('no_comment_show')) && ($('#post_bottom').hasClass('no_toc_show')) - // main of scroll $(window).scroll(throttle(function (event) { var currentTop = $(this).scrollTop() @@ -362,84 +389,39 @@ $(function () { // head position findHeadPosition(currentTop) auto_scroll_toc(currentTop) - + } var isUp = scrollDirection(currentTop) - if ($(".toggle-menu").hasClass("open")) { - if (currentTop > 56) { - - if (isUp) { - $('#page-header').hasClass('visible') ? $('#page-header').removeClass('visible') : console.log() - if (!is_post_bottom) { - $('#post_bottom').removeClass('toc_mobile_show') - $('#toc_mobile').hasClass('is_visible') ? $('#toc_mobile').removeClass('is_visible') : console.log() - } - - } else { - $('#page-header').hasClass('visible') ? console.log() : $('#page-header').addClass('visible') - if (!is_post_bottom) { - $('#post_bottom').addClass('toc_mobile_show') - $('#toc_mobile').hasClass('is_visible') ? $('#toc_mobile').removeClass('is_visible') : console.log() - } - - } - $('#page-header').addClass('fixed') - if ($('#go-up').css('opacity') === '0') { - - $('#go-up').animate({}, function () { - $('#go-up').css({ - 'opacity': '1', - 'transform': 'translateX(-30px) rotateZ(360deg)' - }) - }) - } - if ($('#rightside').css('opacity') === '0') { - - $('#rightside').animate({}, function () { - $('#rightside').css({ - 'opacity': '1', - 'transform': 'translateX(-38px)' - }) - }) - } - + if (currentTop > 56) { + if (isUp) { + $('#page-header').hasClass('visible') ? $('#page-header').removeClass('visible') : console.log() } else { - if (currentTop === 0) { - $('#page-header').removeClass('fixed').removeClass('visible') - if (!is_post_bottom) { - $('#post_bottom').removeClass('toc_mobile_show') - } - - } - - $('#go-up').animate({}, function () { - $('#go-up').css({ - 'opacity': '0', - 'transform': 'translateX(0) rotateZ(180deg) ' - }) - }) + $('#page-header').hasClass('visible') ? console.log() : $('#page-header').addClass('visible') + } + $('#page-header').addClass('fixed') + if ($('#rightside').css('opacity') === '0') { $('#rightside').animate({}, function () { - $('#rightside').css({ - 'opacity': '0', - 'transform': 'translateX(0)' + $(this).css({ + 'opacity': '1', + 'transform': 'translateX(-38px)' }) }) - } - } - - if (!is_post_bottom) { - if ($(window).width() <= 768 && $('#post_bottom').hasClass('toc_mobile_show')) { - $('#rightside').css('bottom', '110px') - $('#go-up').css('bottom', '70px') - - } else { - $('#rightside').css('bottom', '60px') - $('#go-up').css('bottom', '20px') + } else { + if (currentTop === 0) { + $('#page-header').removeClass('fixed').removeClass('visible') } + + $('#rightside').animate({}, function () { + $('#rightside').css({ + 'opacity': '', + 'transform': '' + }) + }) + } }, 50, 100)) @@ -546,7 +528,6 @@ $(function () { .find('.toc-child').hide() } - } function auto_scroll_toc(currentTop) { @@ -561,63 +542,123 @@ $(function () { } } - //閲讀模式 + /** + * 閲讀模式 + */ $("#readmode").click(function () { if (Cookies.get("night-mode") == "night") { $('body').toggleClass('night-mode'); $('body').toggleClass('read-mode'); - $('#font_plus,#font_minus,#to_comment').toggleClass('is_visible'); $('#to_comment').toggleClass('is_invisible'); - } else { $('body').toggleClass('read-mode'); - $('#font_plus,#font_minus,#to_comment').toggleClass('is_visible'); $('#to_comment').toggleClass('is_invisible'); } }); - //閲讀模式下字體調整 + /** + * 字體調整 + */ $("#font_plus").click(function () { var font_size_record = parseFloat($('body').css('font-size')) - var code_size_record = parseFloat($('pre').css('font-size')) + var pre_size_record = parseFloat($('pre').css('font-size')) var code_size_record = parseFloat($('code').css('font-size')) $('body').css('font-size', font_size_record + 1) - $('pre').css('font-size', font_size_record + 1) - $('code').css('font-size', font_size_record + 1) + $('pre').css('font-size', pre_size_record + 1) + $('code').css('font-size', code_size_record + 1) }); $("#font_minus").click(function () { var font_size_record = parseFloat($('body').css('font-size')) - var code_size_record = parseFloat($('pre').css('font-size')) + var pre_size_record = parseFloat($('pre').css('font-size')) var code_size_record = parseFloat($('code').css('font-size')) $('body').css('font-size', font_size_record - 1) - $('pre').css('font-size', font_size_record - 1) - $('code').css('font-size', font_size_record - 1) + $('pre').css('font-size', pre_size_record - 1) + $('code').css('font-size', code_size_record - 1) }); - // 手機顯示toc - $('#mobile_toc').on('click', function () { - $("#toc_mobile").toggleClass('is_visible') - }) + /** + * sub-menus 位置調整 + */ - // sub-menus 位置調整 - if ( $(window).width() > 768 ) { + if ($(window).width() > 768) { $('.menus_item_child').each(function () { - var a_width= $(this).siblings('a').outerWidth(true); + var a_width = $(this).siblings('a').outerWidth(true); var child_width = $(this).outerWidth(true); - $(this).css("margin-left", -(child_width/ 2 - a_width/ 2)) + $(this).css("margin-left", -(child_width / 2 - a_width / 2)) }) } - // 手機端sub-menu 展開/收縮 - $('.menus-expand').on('click', function () { - if ($(this).hasClass('menus-closed')) { - $(this).parents('.menus_item').find('.menus_item_child').show(); - $(this).removeClass('menus-closed'); - } else { - $(this).parents('.menus_item').find('.menus_item_child').hide(); - $(this).addClass('menus-closed'); - } - }) + /** + * 手機端sub-menu 展開/收縮 + */ + $('.menus-expand').on('click', function () { + if ($(this).hasClass('menus-closed')) { + $(this).parents('.menus_item').find('.menus_item_child').show(); + $(this).removeClass('menus-closed'); + } else { + $(this).parents('.menus_item').find('.menus_item_child').hide(); + $(this).addClass('menus-closed'); + } + }) + + /** + * rightside 點擊設置 按鈕 展開 + */ + $('#rightside_config').on('click', function () { + $('#rightside-config-hide').toggleClass("rightside-in") + }) + /** + * 調正recent_post 上下間距 + */ + function recent_post_padding() { + $(".recent-post-info").each(function () { + var k = $(".recent-post-item").height(); + var e = $(this).height(); + $(this).css({ + "padding-top": (k - e) / 2, + "padding-bottom": (k - e) / 2 + }) + }) + } + + //recent-post-item垂直置中 + if ($(window).width() > 768) { + recent_post_padding(); + } + + $(window).bind("resize", function () { + if ($(window).width() > 768) { + recent_post_padding(); + } + }) + + /** + * 複製時加上版權信息 + */ + var copy_copyright_js = GLOBAL_CONFIG.copy_copyright_js + var copyright = GLOBAL_CONFIG.copyright + if (copyright) { + document.body.oncopy = event => { + event.preventDefault(); + let textFont, copyFont = window.getSelection(0).toString(); + if (copyFont.length > 45) { + textFont = copyFont + '\n' + '\n' + '\n' + + copyright.languages.author + '\n' + + copyright.languages.link + '\n' + + copyright.languages.source + '\n' + + copyright.languages.info; + } else { + textFont = copyFont; + } + if (event.clipboardData) { + return event.clipboardData.setData('text', textFont); + } else { + // 兼容IE + return window.clipboardData.setData("text", textFont); + } + } + } + }); \ No newline at end of file