diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 64% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/bug_report.md index c7a86b3..850acf3 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,21 +1,30 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + -## I want to create a new issue +## I want to create a Bug report - + - [] Yes, I have read [Hexo Docs page](https://hexo.io/docs/), especially [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html). -- [] Yes, I have read [Hexo-theme-butterfly Documentation](https://jerryc.me/posts/21cfbf15/). +- [] Yes, I have read [Butterfly Documentation](https://demo.jerryc.me/posts/21cfbf15/). - [] And yes, I already searched for current [issues](https://github.com/jerryc127/hexo-theme-butterfly/issues?utf8=%E2%9C%93&q=is%3Aissue) and this did not help me. ## Butterfly Information @@ -34,19 +43,17 @@ If you are a problem when visit the website, please open your browser 'developer ## Actual behavior - - - ## Steps to reproduce the behavior +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error -## Feature Request + + +## Screenshots - - + +## Website ---- - - \ No newline at end of file +## Describe the bug diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md new file mode 100644 index 0000000..48d5f81 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/custom.md @@ -0,0 +1,10 @@ +--- +name: Custom issue template +about: Describe this issue template's purpose here. +title: '' +labels: '' +assignees: '' + +--- + + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..bbcbbe7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/LICENSE b/LICENSE index 472ac23..7a4a3ea 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,202 @@ -MIT License -Copyright (c) -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 1aea826..7184e82 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ # hexo-theme-butterfly -Version -Author -Hexo -node.js +![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly) +![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff) +![hexo version](https://img.shields.io/badge/hexo-4.0+-0e83c) +![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green) +![nodejs version](https://img.shields.io/badge/node.js-8.0+-yellow) +![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531) -Demo: 👍 [Butterfly](https://demo.jerryc.me/) || 🤞 [JerryC](https://jerryc.me/) +Demo: 👍 [Butterfly](https://demo.jerryc.me/) || 🤞 [JerryC](https://jerryc.me/) + +Docs: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/) Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme. @@ -33,18 +37,6 @@ git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/bu > npm install hexo-renderer-pug hexo-renderer-stylus -## Documentation - -Find in [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/). it supports `zh-TW` and `zh-CN` - -You can also join the Chat Group. - -[💬 Join QQ Group [recommend]](https://jq.qq.com/?_wv=1027&k=5KI3Jqb) - -[💬 Join Telegram Group](https://t.me/hexo_butterfly) - - - ## Screenshots ![image](https://user-images.githubusercontent.com/16351105/58887365-1272f780-8718-11e9-9329-3292c6ba20d4.png) diff --git a/README_CN.md b/README_CN.md index c951209..6d5955a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,11 +1,16 @@ # hexo-theme-butterfly -Version -Author -Hexo -node.js +![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly) +![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff) +![hexo version](https://img.shields.io/badge/hexo-4.0+-0e83c) +![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green) +![nodejs version](https://img.shields.io/badge/node.js-8.0+-yellow) +![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531) -Demo: 👍 [Butterfly](https://demo.jerryc.me/) || 🤞 [JerryC](https://jerryc.me/) + +預覽: 👍 [Butterfly](https://demo.jerryc.me/) || 🤞 [JerryC](https://jerryc.me/) + +文檔: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/) 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題 @@ -30,17 +35,7 @@ git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/bu theme: butterfly ``` ->如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save or yarn add hexo-renderer-pug hexo-renderer-stylus - -## 文檔 - -可查看[Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/) - -你也可以加入群組 - -[ 💬 QQ群 [推薦]](https://jq.qq.com/?_wv=1027&k=5KI3Jqb) - -[ 💬 Telegram群](https://t.me/hexo_butterfly) +>如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save ## 截圖 diff --git a/_config.yml b/_config.yml index ff041a8..7f52dc6 100644 --- a/_config.yml +++ b/_config.yml @@ -7,20 +7,20 @@ # name || link || icon menu: - Home: / || fas fa-home - Archives: /archives/ || fas fa-archive - Tags: /tags/ || fas fa-tags - Categories: /categories/ || fas fa-folder-open - List||fas fa-list: - - Music || /music/ || fas fa-music - - Movie || /movies/ || fas fa-video - Link: /link/ || fas fa-link - About: /about/ || fas fa-heart + # Home: / || fas fa-home + # Archives: /archives/ || fas fa-archive + # Tags: /tags/ || fas fa-tags + # Categories: /categories/ || fas fa-folder-open + # List||fas fa-list: + # - Music || /music/ || fas fa-music + # - Movie || /movies/ || fas fa-video + # Link: /link/ || fas fa-link + # About: /about/ || fas fa-heart # Code Blocks (代碼相關) # -------------------------------------- -highlight_theme: light # default / darker / pale night / light / ocean / mac / false +highlight_theme: light # default / darker / pale night / light / ocean / mac / mac light / false highlight_copy: true # copy button highlight_lang: true # show the code language highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button @@ -30,14 +30,16 @@ code_word_wrap: false # copyright: Add the copyright information after copied content (複製的內容後面加上版權信息) copy: enable: true - copyright: false + copyright: + enable: false + limit_count: 50 # social settings (社交圖標設置) # formal: # icon: link || the description social: - fab fa-github: https://github.com/xxxxx || Github - fas fa-envelope: mailto:xxxxxx@gmail.com || Email + # fab fa-github: https://github.com/xxxxx || Github + # fas fa-envelope: mailto:xxxxxx@gmail.com || Email # search (搜索) # -------------------------------------- @@ -92,18 +94,18 @@ avatar: # the banner image of home page index_img: -# if the banner of page not setting,it will show the top_img +# if the banner of page not setting, it will show the top_img default_top_img: https://i.loli.net/2020/05/01/IuWi8QbHvzjlOPw.jpg # the banner image of archive page archive_img: # the banner image of tag page -# tag page, look like https://xxxxxxxxx.com/tags/butterfly +# note: tag page, not tags page (子標籤頁面的 top_img) tag_img: # the banner image of category page -# category page, look like https://xxxxxxxxx.com/categories/butterfly +# note: category page, not categories page (子分類頁面的 top_img) category_img: # If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個) @@ -122,7 +124,7 @@ cover: # left/right/both position: both # When cover is not set, the default cover is displayed (當沒有設置cover時，默認的封面顯示) - default_cover: + default_cover: - https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg # Replace Broken Images (替換無法顯示的圖片) @@ -141,10 +143,12 @@ post_meta: date_type: created # created or updated or both 主頁文章日期是創建日或者更新日或都顯示 categories: true # true or false 主頁是否顯示分類 tags: false # true or false 主頁是否顯示標籤 + label: true # true or false 顯示描述性文字 post: date_type: both # created or updated or both 文章頁日期是創建日或者更新日或都顯示 categories: true # true or false 文章頁是否顯示分類 tags: true # true or false 文章頁是否顯示標籤 + label: true # true or false 顯示描述性文字 # wordcount (字數統計) wordcount: @@ -155,7 +159,7 @@ wordcount: # Display the article introduction on homepage # 1: description -# 2: both (if the description exists, it will show description. or show the auto_excerpt) +# 2: both (if the description exists, it will show description, or show the auto_excerpt) # 3: auto_excerpt (default) index_post_content: method: 3 @@ -180,12 +184,12 @@ post_copyright: reward: enable: false QR_code: - - img: /img/wechat.jpg - link: - text: wechat - - img: /img/alipay.jpg - link: - text: alipay + # - img: /img/wechat.jpg + # link: + # text: wechat + # - img: /img/alipay.jpg + # link: + # text: alipay # Related Articles related_post: @@ -200,6 +204,15 @@ photofigcaption: false # when you scroll in post, the URL will update according to header id. anchor: false +# Displays outdated notice for a post (文章過期提醒) +noticeOutdate: + enable: false + style: flat # style: simple/flat + limit_day: 500 # When will it be shown + position: top # position: top/bottom + message_prev: It has been + message_next: days since the last update, the content of the article may be outdated. + # Share System (分享功能) # -------------------------------------- @@ -231,18 +244,27 @@ addtoany: # Comments System # -------------------------------------- +comments: + # Up to two comments system, the first will be shown as default + # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments + use: + # - Valine + # - Disqus + text: true # Display the comment name next to the button + # lazyload: The comment system will be load when comment element enters the browser's viewport. + # If you set it to false, the comment count will be invalid + lazyload: false + count: false # Display comment count in top_img + # disqus # https://disqus.com/ disqus: - enable: false shortname: - count: false # dispaly comment count in top_img # Alternative Disqus - Render comments with Disqus API -# DisqusJS評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版 +# DisqusJS 評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版 # https://github.com/SukkaW/DisqusJS disqusjs: - enable: false shortname: siteName: apikey: @@ -250,18 +272,15 @@ disqusjs: nocomment: # display when a blog post or an article has no comment attached admin: adminLabel: - count: false # dispaly comment count in top_img -# livere(來必力) +# livere (來必力) # https://www.livere.com/ livere: - enable: false uid: # gitalk # https://github.com/gitalk/gitalk gitalk: - enable: false client_id: client_secret: repo: @@ -272,31 +291,27 @@ gitalk: distractionFreeMode: false # Facebook-like distraction free mode. pagerDirection: last # Comment sorting direction, available values are last and first. createIssueManually: false # Gitalk will create a corresponding github issue for your every single page automatically - count: false # dispaly comment count in top_img # valine # https://valine.js.org valine: - enable: false # if you want use valine,please set this value is true appId: # leancloud application app id appKey: # leancloud application app key pageSize: 10 # comment list page size avatar: monsterid # gravatar style https://valine.js.org/#/avatar lang: en # i18n: zh-CN/zh-TW/en/ja - placeholder: Please leave your footprints # valine comment input placeholder(like: Please leave your footprints ) - guest_info: nick,mail,link #valine comment header info (nick/mail/link) + placeholder: Please leave your footprints # valine comment input placeholder (like: Please leave your footprints) + guest_info: nick,mail,link # valine comment header info (nick/mail/link) recordIP: false # Record reviewer IP serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in) bg: # valine background emojiCDN: # emoji CDN enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar requiredFields: nick,mail # required fields (nick/mail) - count: false # dispaly comment count in top_img # utterances # https://utteranc.es/ utterances: - enable: false repo: # Issue Mapping: pathname/url/title/og:title issue_term: pathname @@ -307,13 +322,11 @@ utterances: # Facebook Comments Plugin # https://developers.facebook.com/docs/plugins/comments/ facebook_comments: - enable: false app_id: user_id: # optional pageSize: 10 # The number of comments to show order_by: social # social/time/reverse_time lang: en_US # Language en_US/zh_CN/zh_TW and so on - count: false # Chat Services # -------------------------------------- @@ -349,20 +362,25 @@ gitter: enable: false room: +# crisp +# https://crisp.chat/en/ +crisp: + enable: false + website_id: + # Footer Settings # -------------------------------------- - -since: 2020 - -footer_custom_text: - -footer_copyright: true - -ICP: - enable: false - url: - text: - icon: /img/icp.png +footer: + owner: + enable: true + since: 2020 + custom_text: + copyright: true # Copyright of theme and framework + ICP: # Chinese ICP License + enable: false + url: + text: + icon: /img/icp.png # Analysis # -------------------------------------- @@ -382,6 +400,7 @@ tencent_analytics: # Google Adsense (谷歌廣告) google_adsense: enable: false + auto_ads: true js: https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js client: enable_page_level_ads: true @@ -411,6 +430,10 @@ baidu_site_verification: # see http://zhanzhang.so.com/ qihu_site_verification: +# Yandex Webmaster tools verification setting +# see https://webmaster.yandex.com/ +yandex_site_verification: + # Beautify/Effect (美化/效果) # -------------------------------------- @@ -434,7 +457,7 @@ qihu_site_verification: # The top_img settings of home page # default: top img - full screen, site info - middle (默認top_img全屏，site_info在中間) -# The positon of site info, eg: 300px/300em/300rem/10% (主頁標題距離頂部距離) +# The position of site info, eg: 300px/300em/300rem/10% (主頁標題距離頂部距離) index_site_info_top: # The height of top_img, eg: 300px/300em/300rem (主頁top_img高度) index_top_img_height: @@ -531,17 +554,17 @@ font: # 左上角網站名字 主頁居中網站名字 blog_title_font: font_link: https://fonts.googleapis.com/css?family=Titillium+Web&display=swap - font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', Microsoft YaHei', sans-serif + font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif # The setting of divider icon (水平分隔線圖標設置) hr_icon: enable: true - icon: # the unicode value of Font Awesome icon + icon: # the unicode value of Font Awesome icon, such as '\3423' icon-top: # the subtitle on homepage (主頁subtitle) subtitle: - enable: true + enable: false # Typewriter Effect (打字效果) effect: true # loop (循環打字) @@ -559,8 +582,6 @@ subtitle: # 開頭不允許轉義字元，如需要，請把整個句子用雙引號包住 # 如果關閉打字效果，subtitle只會顯示sub的第一行文字 sub: - - 今日事,今日畢 - - Never put off till tomorrow what you can do today # Loading Animation (加載動畫) preloader: false @@ -575,12 +596,17 @@ aside: card_author: enable: true description: + button: + icon: fab fa-github + text: Follow Me + link: https://github.com/xxxxxx card_announcement: enable: true content: This is my Blog card_recent_post: enable: true limit: 5 # if set 0 will show all + sort: date # date or updated card_categories: enable: true limit: 8 # if set 0 will show all @@ -615,7 +641,7 @@ runtimeshow: # Conversion between Traditional and Simplified Chinese (簡繁轉換) translate: - enable: true + enable: false # The text of a button default: 繁 # the language of website (1 - Traditional Chinese/ 2 - Simplified Chinese） @@ -680,6 +706,16 @@ note: # other # -------------------------------------- +# Pjax [Beta] +# It may contain bugs and unstable, give feedback when you find the bugs. +# https://github.com/MoOx/pjax +pjax: false + +# Inject the css and script (aplayer/meting) +aplayerInject: + enable: false + per_page: true + # Snackbar (Toast Notification 彈窗) # https://github.com/polonel/SnackBar # position 彈窗位置 @@ -736,7 +772,7 @@ fragment_cache: true # 插入代码到头部 之前 和 底部 之前 inject: head: - # - + # - bottom: # - @@ -750,8 +786,10 @@ CDN: main: /js/main.js utils: /js/utils.js + # pjax + pjax: https://cdn.jsdelivr.net/npm/pjax/pjax.min.js + # comments - blueimp_md5: https://cdn.jsdelivr.net/npm/blueimp-md5/js/md5.min.js gitalk: https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js gitalk_css: https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css valine: https://cdn.jsdelivr.net/npm/valine/dist/Valine.min.js @@ -771,7 +809,7 @@ CDN: algolia_search_css: https://cdn.jsdelivr.net/npm/instantsearch.js@2.10.5/dist/instantsearch.min.css # math - mathjax: https://cdn.jsdelivr.net/npm/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML + mathjax: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js katex: https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css katex_copytex: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.js katex_copytex_css: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.css @@ -787,7 +825,7 @@ CDN: lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js - typed: https://cdn.jsdelivr.net/npm/typed.js + typed: https://cdn.jsdelivr.net/npm/typed.js/lib/typed.min.js pangu: https://cdn.jsdelivr.net/npm/pangu/dist/browser/pangu.min.js # photo @@ -819,4 +857,4 @@ CDN: # aplayer aplayer_css: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css aplayer_js: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js - meting_js: https://cdn.jsdelivr.net/npm/meting@1.2.0/dist/Meting.min.js + meting_js: https://cdn.jsdelivr.net/gh/metowolf/MetingJS@1.2/dist/Meting.min.js diff --git a/languages/default.yml b/languages/default.yml index 6c601af..e3a5524 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -3,7 +3,7 @@ sidebar: have_read: You've read footer: - driven: Driven + framework: Framework theme: Theme copy: @@ -24,7 +24,8 @@ post: created: Created updated: Updated wordcount: Word count - min2read: 'Reading time: %s min' + min2read: Reading time + min2read_unit: min page_pv: Post View comments: Comments copyright: @@ -61,7 +62,6 @@ aside: card_tags: Tags card_archives: Archives card_recent_post: Recent Post - card_bookmark: Bookmark card_webinfo: headline: Info article_name: Article diff --git a/languages/en.yml b/languages/en.yml index 6c601af..e3a5524 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -3,7 +3,7 @@ sidebar: have_read: You've read footer: - driven: Driven + framework: Framework theme: Theme copy: @@ -24,7 +24,8 @@ post: created: Created updated: Updated wordcount: Word count - min2read: 'Reading time: %s min' + min2read: Reading time + min2read_unit: min page_pv: Post View comments: Comments copyright: @@ -61,7 +62,6 @@ aside: card_tags: Tags card_archives: Archives card_recent_post: Recent Post - card_bookmark: Bookmark card_webinfo: headline: Info article_name: Article diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index d66990e..ae6b207 100644 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -3,7 +3,7 @@ sidebar: have_read: 你已经读了 footer: - driven: 驱动 + framework: 框架 theme: 主题 copy: @@ -24,7 +24,8 @@ post: created: 发表于 updated: 更新于 wordcount: 字数总计 - min2read: '阅读时长: %s 分钟' + min2read: 阅读时长 + min2read_unit: 分钟 page_pv: 阅读量 comments: 评论数 copyright: @@ -38,13 +39,13 @@ post: search: 搜索 algolia_search: input_placeholder: 搜索文章 - hits_empty: '找不到您查询的内容:${query}' + hits_empty: '找不到您查询的内容：${query}' hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒' local_search: label: 本地搜索 input_placeholder: 搜索文章 - hits_empty: '找不到您查询的内容:${query}' + hits_empty: '找不到您查询的内容：${query}' powered: '提供支持' by: 由 @@ -63,7 +64,6 @@ aside: card_tags: 标签 card_archives: 归档 card_recent_post: 最新文章 - card_bookmark: 加入书签 card_webinfo: headline: 网站资讯 article_name: 文章数目 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 0e73531..74902a2 100644 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -3,8 +3,8 @@ sidebar: have_read: 你已經讀了 footer: - driven: Power by - theme: Theme + framework: 框架 + theme: 主題 copy: success: 複製成功 @@ -24,7 +24,8 @@ post: created: 發表於 updated: 更新於 wordcount: 字數總計 - min2read: '閱讀時長: %s 分鐘' + min2read: 閲讀時長 + min2read_unit: 分鐘 page_pv: 閱讀量 comments: 評論數 copyright: @@ -38,13 +39,13 @@ post: search: 搜尋 algolia_search: input_placeholder: 搜尋文章 - hits_empty: '找不到您查詢的內容:${query}' + hits_empty: '找不到您查詢的內容：${query}' hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒' local_search: label: 本地搜尋 input_placeholder: 搜尋文章 - hits_empty: '找不到您查詢的內容:${query}' + hits_empty: '找不到您查詢的內容：${query}' powered: '提供支援' by: 由 @@ -63,7 +64,6 @@ aside: card_tags: 標籤 card_archives: 歸檔 card_recent_post: 最新文章 - card_bookmark: 加入書籤 card_webinfo: headline: 網站資訊 article_name: 文章數目 diff --git a/layout/404.pug b/layout/404.pug index 0e6c394..1e7191b 100644 --- a/layout/404.pug +++ b/layout/404.pug @@ -26,5 +26,5 @@ html(lang=config.language data-theme=theme.display_mode) i.fas.fa-rocket = _p('error404.back_button') - !=partial('includes/search/index', {}, {cache:theme.fragment_cache}) + !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache}) include includes/additional-js.pug diff --git a/layout/flink.pug b/layout/flink.pug index 178f683..fab186c 100644 --- a/layout/flink.pug +++ b/layout/flink.pug @@ -11,13 +11,14 @@ .flink-list-item a(href=url_for(item.link) title=item.name target="_blank") if theme.lazyload.enable - img(data-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name ) + img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name ) else img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name ) - .flink-item-name= item.name - .flink-item-desc= item.descr + span.flink-item-name= item.name + span.flink-item-desc(title=item.descr)= item.descr != page.content - if page.comments !== false - include includes/comments/index.pug + if page.comments !== false && theme.comments && theme.comments.use + - var commentsJsLoad = true + !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache}) diff --git a/layout/includes/additional-js.pug b/layout/includes/additional-js.pug index effa64e..2e00ca6 100644 --- a/layout/includes/additional-js.pug +++ b/layout/includes/additional-js.pug @@ -1,76 +1,61 @@ -script(src=url_for(theme.CDN.jquery)) -script(src=url_for(theme.CDN.utils)) -script(src=url_for(theme.CDN.main)) +div + script(src=url_for(theme.CDN.jquery)) + script(src=url_for(theme.CDN.utils)) + script(src=url_for(theme.CDN.main)) -if theme.translate && theme.translate.enable - script(src=url_for(theme.CDN.translate)) + if theme.translate && theme.translate.enable + script(src=url_for(theme.CDN.translate)) -if theme.medium_zoom - script(src=url_for(theme.CDN.medium_zoom)) + if theme.medium_zoom + script(src=url_for(theme.CDN.medium_zoom)) + else if theme.fancybox + script(src=url_for(theme.CDN.fancybox)) -if theme.fancybox - script(src=url_for(theme.CDN.fancybox)) + if theme.instantpage + script(src=url_for(theme.CDN.instantpage) type="module" defer) -include ./math/index.pug + if theme.lazyload.enable + script(src=url_for(theme.CDN.lazyload) async) -if theme.fireworks && theme.fireworks.enable - script(src=url_for(theme.CDN.anime)) - script(src=url_for(theme.CDN.fireworks)) + if (theme.snackbar && theme.snackbar.enable) + script(src=url_for(theme.CDN.snackbar)) -if (theme.snackbar && theme.snackbar.enable) - script(src=url_for(theme.CDN.snackbar)) + if theme.pangu && theme.pangu.enable + !=partial('includes/third-party/pangu.pug', {}, {cache:theme.fragment_cache}) -if (theme.canvas_ribbon && theme.canvas_ribbon.enable) - include ./third-party/canvas-ribbon.pug + //- search + if theme.algolia_search.enable + script(src=url_for(theme.CDN.algolia_js)) + else if theme.local_search.enable + script(src=url_for(theme.CDN.local_search)) -if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable) - include ./third-party/canvas-ribbon-piao.pug + if theme.preloader + !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache}) -if (theme.canvas_nest && theme.canvas_nest.enable) - include ./third-party/canvas-nest.pug + .js-pjax + if is_home() && theme.subtitle.enable + include ./third-party/subtitle.pug -if theme.activate_power_mode.enable - script(src=url_for(theme.CDN.activate_power_mode)) - script. - POWERMODE.colorful = #{theme.activate_power_mode.colorful}; - POWERMODE.shake = #{theme.activate_power_mode.shake}; - document.body.addEventListener('input', POWERMODE); + include ./third-party/math/index.pug -if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv - script(async src=url_for(theme.CDN.busuanzi)) + if commentsJsLoad + include ./third-party/comments/js.pug -if theme.instantpage - script(src=url_for(theme.CDN.instantpage) type="module" defer) + if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv + script(async src=url_for(theme.CDN.busuanzi)) -if theme.lazyload.enable - script(src=url_for(theme.CDN.lazyload) async) + !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)}) -//- 鼠標特效 -if theme.click_heart - script(src=url_for(theme.CDN.click_heart)) + !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache}) -if theme.ClickShowText && theme.ClickShowText.enable - script(src=url_for(theme.CDN.ClickShowText)) + !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache}) -if theme.pangu && theme.pangu.enable - include ./third-party/pangu.pug + if theme.aplayerInject && theme.aplayerInject.enable + if theme.pjax || theme.aplayerInject.per_page + include ./head/aplayer.pug + else if page.aplayer + include ./head/aplayer.pug -//- search -if theme.algolia_search && theme.algolia_search.enable - script(src=url_for(theme.CDN.algolia_js)) -else if theme.local_search && theme.local_search.enable - script(src=url_for(theme.CDN.local_search)) + if theme.pjax + !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache}) -//- mermaid -if theme.mermaid.enable - include ./math/mermaid.pug - -if is_home() - include ./head/subtitle.pug - -!=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)}) - -if theme.preloader - !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache}) - -!=partial('includes/chat/index', {}, {cache:theme.fragment_cache}) diff --git a/layout/includes/chat/gitter.pug b/layout/includes/chat/gitter.pug deleted file mode 100644 index 51cdc0a..0000000 --- a/layout/includes/chat/gitter.pug +++ /dev/null @@ -1,28 +0,0 @@ -//- https://sidecar.gitter.im/ -script. - var isChatBtn = !{theme.chat_btn} - - if (isChatBtn) { - ((window.gitter = {}).chat = {}).options = { - room: '#{theme.gitter.room}', - activationElement: '#chat_btn' - }; - } else { - ((window.gitter = {}).chat = {}).options = { - room: '#{theme.gitter.room}', - }; - - if (!{theme.chat_hide_show}) { - var gitterBtn = document.getElementsByClassName('gitter-open-chat-button') - - function chatBtnHide () { - gitterBtn[0].style.display= 'none' - } - - function chatBtnShow () { - gitterBtn[0].style.display= 'block' - } - } - } - -script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer) \ No newline at end of file diff --git a/layout/includes/chat/tidio.pug b/layout/includes/chat/tidio.pug deleted file mode 100644 index 90270a7..0000000 --- a/layout/includes/chat/tidio.pug +++ /dev/null @@ -1,39 +0,0 @@ -script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async) - -if theme.chat_btn - script. - (function() { - function onTidioChatApiReady() { - window.tidioChatApi.hide(); - window.tidioChatApi.on("close", function() { - window.tidioChatApi.hide(); - }); - } - if (window.tidioChatApi) { - window.tidioChatApi.on("ready", onTidioChatApiReady); - } else { - document.addEventListener("tidioChat-ready", onTidioChatApiReady); - } - - document.getElementById("chat_btn").addEventListener("click", function(){ - window.tidioChatApi.show(); - window.tidioChatApi.open(); - }); - })(); -else if theme.chat_hide_show - script. - function chatBtnHide () { - if (window.tidioChatApi) { - window.tidioChatApi.hide(); - //- document.getElementById('tidio-chat').style.display= 'none' - } - } - - function chatBtnShow () { - if (window.tidioChatApi) { - window.tidioChatApi.show(); - //- document.getElementById('tidio-chat').style.display= 'block' - } - } - - diff --git a/layout/includes/comments/disqus.pug b/layout/includes/comments/disqus.pug deleted file mode 100644 index 661f53f..0000000 --- a/layout/includes/comments/disqus.pug +++ /dev/null @@ -1,24 +0,0 @@ -#disqus_thread -script. - var disqus_config = function () { - this.page.url = '!{ page.permalink }'; - this.page.identifier = '!{ page.path }'; - this.page.title = '!{ page.title }'; - }; - (function() { - var d = document, s = d.createElement('script'); - s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js'; - s.setAttribute('data-timestamp', +new Date()); - (d.head || d.body).appendChild(s); - })(); - -if is_post() && theme.disqus.count - script. - function getDisqusCount() { - var d = document, s = d.createElement('script'); - s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js'; - s.id = 'dsq-count-scr'; - (d.head || d.body).appendChild(s); - } - - window.addEventListener('load', getDisqusCount, false); \ No newline at end of file diff --git a/layout/includes/comments/disqusjs.pug b/layout/includes/comments/disqusjs.pug deleted file mode 100644 index 7d670d2..0000000 --- a/layout/includes/comments/disqusjs.pug +++ /dev/null @@ -1,25 +0,0 @@ -#disqus_thread -script(src=url_for(theme.CDN.disqusjs)) -script. - var dsqjs = new DisqusJS({ - shortname: '!{theme.disqusjs.shortname}', - siteName: '!{theme.disqusjs.siteName}', - identifier: '!{ page.path }', - url: '!{ page.permalink }', - title: '!{ page.title }', - api: '!{theme.disqusjs.api}', - apikey: '!{theme.disqusjs.apikey}', - nocomment: '!{theme.disqusjs.nocomment}', - admin: '!{theme.disqusjs.admin}', - adminLabel: '!{theme.disqusjs.adminLabel}' - }); - -if is_post() && theme.disqusjs.count - script. - function getDisqusCount() { - var d = document, s = d.createElement('script'); - s.src = 'https://!{theme.disqusjs.shortname}.disqus.com/count.js'; - s.id = 'dsq-count-scr'; - (d.head || d.body).appendChild(s); - } - window.addEventListener('load', getDisqusCount, false); diff --git a/layout/includes/comments/facebook_comments.pug b/layout/includes/comments/facebook_comments.pug deleted file mode 100644 index 50f8838..0000000 --- a/layout/includes/comments/facebook_comments.pug +++ /dev/null @@ -1,12 +0,0 @@ -#fb-root -script(async defer crossorigin="anonymous" src=`https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v6.0`) -.fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light' - data-href=urlNoIndex() - data-numposts= theme.facebook_comments.pageSize || 10 - data-order-by= theme.facebook_comments.order_by || 'social' - data-width="100%") - -if theme.darkmode.enable - script. - var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light' - document.getElementsByClassName('fb-comments')[0].setAttribute('data-colorscheme',themeNow) diff --git a/layout/includes/comments/gitalk.pug b/layout/includes/comments/gitalk.pug deleted file mode 100644 index 9a1fee9..0000000 --- a/layout/includes/comments/gitalk.pug +++ /dev/null @@ -1,27 +0,0 @@ -#gitalk-container -script. - var gitalk = new Gitalk({ - clientID: '!{theme.gitalk.client_id}', - clientSecret: '!{theme.gitalk.client_secret}', - repo: '!{theme.gitalk.repo}', - owner: '!{theme.gitalk.owner}', - admin: ['!{theme.gitalk.admin}'], - id: md5(decodeURI(location.pathname)), - language: '!{theme.gitalk.language}', - perPage: !{theme.gitalk.perPage}, - distractionFreeMode: !{theme.gitalk.distractionFreeMode}, - pagerDirection: '!{theme.gitalk.pagerDirection}', - createIssueManually: !{theme.gitalk.createIssueManually}, - updateCountCallback: commentCount - }) - gitalk.render('gitalk-container') - - function commentCount(n){ - try { - document.getElementsByClassName('gitalk-comment-count')[0].innerHTML= n - } catch (e) { - return false - } - } - - diff --git a/layout/includes/comments/index.pug b/layout/includes/comments/index.pug deleted file mode 100644 index a8d1a92..0000000 --- a/layout/includes/comments/index.pug +++ /dev/null @@ -1,29 +0,0 @@ -- var d = theme.disqus && theme.disqus.enable -- var dj = theme.disqusjs && theme.disqusjs.enable -- var l = theme.livere && theme.livere.enable -- var gt = theme.gitalk && theme.gitalk.enable -- var v = theme.valine && theme.valine.enable -- var u = theme.utterances && theme.utterances.enable -- var fb = theme.facebook_comments && theme.facebook_comments.enable -- var isComment = d || dj || l || gt || v || u || fb - -if isComment - hr - #post-comment - .comment_headling - i.fas.fa-comments.fa-fw - span= ' ' + _p('comment') - if d - include ./disqus.pug - else if dj - include ./disqusjs.pug - else if l - include ./livere.pug - else if gt - include ./gitalk.pug - else if v - include ./valine.pug - else if u - include ./utterances.pug - else if fb - include ./facebook_comments.pug \ No newline at end of file diff --git a/layout/includes/comments/utterances.pug b/layout/includes/comments/utterances.pug deleted file mode 100644 index d9cc76d..0000000 --- a/layout/includes/comments/utterances.pug +++ /dev/null @@ -1,21 +0,0 @@ -script#utterances_comment(src=theme.CDN.utterances - repo=theme.utterances.repo - issue-term=theme.utterances.issue_term - theme= theme.display_mode === 'dark' ? theme.utterances.dark_theme : theme.utterances.light_theme - crossorigin="anonymous" - async) - -if theme.darkmode.enable - script. - var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}' - document.getElementById('utterances_comment').setAttribute('theme',themeNow) - - function utterancesTheme () { - var theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}' - const message = { - type: 'set-theme', - theme: theme - }; - const iframe = document.querySelector('.utterances-frame'); - iframe.contentWindow.postMessage(message, 'https://utteranc.es'); - } diff --git a/layout/includes/comments/valine.pug b/layout/includes/comments/valine.pug deleted file mode 100644 index d5c7493..0000000 --- a/layout/includes/comments/valine.pug +++ /dev/null @@ -1,35 +0,0 @@ -- let emojiMaps = '""' -if site.data.valine - - emojiMaps = JSON.stringify(site.data.valine) - -#vcomment.vcomment -script(src=url_for(theme.CDN.valine)) -script. - var requestSetting = function (from,set) { - var from = from - var setting = set.split(',').filter(function(item){ - return from.indexOf(item) > -1 - }); - setting = setting.length == 0 ? from :setting; - return setting - } - - var guestInfo = requestSetting(['nick','mail','link'],'#{ theme.valine.guest_info }') - var requiredFields = requestSetting(['nick','mail'],'#{ theme.valine.requiredFields }') - - window.valine = new Valine({ - el:'#vcomment', - appId: '#{theme.valine.appId}', - appKey: '#{theme.valine.appKey}', - placeholder: '#{theme.valine.placeholder}', - avatar: '#{theme.valine.avatar}', - meta: guestInfo, - pageSize: '#{theme.valine.pageSize}', - lang: '#{theme.valine.lang}', - recordIP: #{theme.valine.recordIP}, - serverURLs: '#{theme.valine.serverURLs}', - emojiCDN: '#{theme.valine.emojiCDN}', - emojiMaps: !{emojiMaps}, - enableQQ: #{theme.valine.enableQQ}, - requiredFields: requiredFields - }); diff --git a/layout/includes/footer.pug b/layout/includes/footer.pug index c1e710d..405c90c 100644 --- a/layout/includes/footer.pug +++ b/layout/includes/footer.pug @@ -1,24 +1,23 @@ #footer-wrap - - var now = new Date() - - var nowYear = now.getFullYear() - if theme.since && theme.since != nowYear - .copyright!= `©${theme.since} - ${nowYear} By ${config.author}` - else - .copyright!= `©${nowYear} By ${config.author}` - if theme.footer_copyright + if theme.footer.owner.enable + - var now = new Date() + - var nowYear = now.getFullYear() + if theme.footer.owner.since && theme.footer.owner.since != nowYear + .copyright!= `©${theme.footer.owner.since} - ${nowYear} By ${config.author}` + else + .copyright!= `©${nowYear} By ${config.author}` + if theme.footer.copyright .framework-info - span= _p('footer.driven') + ' ' - a(href='https://hexo.io') - span Hexo + span= _p('footer.framework') + ' ' + a(href='https://hexo.io')= 'Hexo' span.footer-separator | span= _p('footer.theme') + ' ' - a(href='https://github.com/jerryc127/hexo-theme-butterfly') - span Butterfly - if theme.footer_custom_text - .footer_custom_text!=`${theme.footer_custom_text}` - if theme.ICP.enable + a(href='https://github.com/jerryc127/hexo-theme-butterfly')= 'Butterfly' + if theme.footer.custom_text + .footer_custom_text!=`${theme.footer.custom_text}` + if theme.footer.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 + a(href=theme.footer.ICP.url) + if theme.footer.ICP.icon + img.icp-icon(src=url_for(theme.footer.ICP.icon)) + span=theme.footer.ICP.text diff --git a/layout/includes/head.pug b/layout/includes/head.pug index bb40a6c..ea3808f 100644 --- a/layout/includes/head.pug +++ b/layout/includes/head.pug @@ -35,10 +35,6 @@ if theme.disable_baidu_transformation meta(http-equiv="Cache-Control" content="no-transform") meta(http-equiv="Cache-Control" content="no-siteapp") -if theme.douban - if theme.douban.meta && (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict])) - meta(name="referrer" content="no-referrer") - //- 預解析 !=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache}) @@ -48,6 +44,11 @@ if theme.douban //- Open_Graph include ./head/Open_Graph.pug +if theme.facebook_comments.app_id + meta(property="fb:app_id" content=theme.facebook_comments.app_id ) +if theme.facebook_comments.user_id + meta(property="fb:admins" content=theme.facebook_comments.user_id) + //- PWA if (theme.pwa && theme.pwa.enable) !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache}) @@ -65,19 +66,10 @@ if theme.fancybox if (theme.snackbar && theme.snackbar.enable) link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css)) -if is_post() - if(page.prev) - link(rel="prev" title=page.prev.title href=url_for(page.prev.permalink) ) - if(page.next) - link(rel="next" title=page.next.title href=url_for(page.next.permalink) ) - if theme.algolia_search.enable - link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.algolia_search_css)) + link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css)) script(src=url_for(theme.CDN.algolia_search) defer) -//- comment css -include ./head/comment.pug - //- google_adsense !=partial('includes/head/google_adsense', {}, {cache:theme.fragment_cache}) @@ -96,5 +88,3 @@ include ./head/noscript.pug !=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)}) -if page.aplayer - include ./head/aplayer.pug \ No newline at end of file diff --git a/layout/includes/head/analytics.pug b/layout/includes/head/analytics.pug index 768b3e6..01b0469 100644 --- a/layout/includes/head/analytics.pug +++ b/layout/includes/head/analytics.pug @@ -9,14 +9,12 @@ if theme.baidu_analytics })(); if theme.google_analytics + script(async src=`https://www.googletagmanager.com/gtag/js?id=${theme.google_analytics}`) script. - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); - - ga('create', '!{theme.google_analytics}', 'auto'); - ga('send', 'pageview'); + window.dataLayer = window.dataLayer || []; + function gtag(){dataLayer.push(arguments);} + gtag('js', new Date()); + gtag('config', '!{theme.google_analytics}'); if theme.tencent_analytics - script(src=`https://tajs.qq.com/stats?sId=${theme.tencent_analytics}` charset="UTF-8") + script(src=`https://tajs.qq.com/stats?sId=${theme.tencent_analytics}` charset="UTF-8" data-pjax) diff --git a/layout/includes/head/comment.pug b/layout/includes/head/comment.pug deleted file mode 100644 index 3597780..0000000 --- a/layout/includes/head/comment.pug +++ /dev/null @@ -1,14 +0,0 @@ -if (theme.facebook_comments.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home()) - if theme.facebook_comments.app_id - meta(property="fb:app_id" content=theme.facebook_comments.app_id ) - if theme.facebook_comments.user_id - meta(property="fb:admins" content=theme.facebook_comments.user_id) - -if (theme.disqusjs && theme.disqusjs.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home()) - link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.disqusjs_css)) - -if (theme.gitalk && theme.gitalk.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home()) - link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.gitalk_css)) - script(src=url_for(theme.CDN.gitalk)) - script(src=url_for(theme.CDN.blueimp_md5)) - diff --git a/layout/includes/head/config.pug b/layout/includes/head/config.pug index 3ffe6d2..3ad380a 100644 --- a/layout/includes/head/config.pug +++ b/layout/includes/head/config.pug @@ -36,14 +36,15 @@ }) } - var copyright = 'undefined' ; - if (theme.copy.enable && theme.copy.copyright){ - copyright = JSON.stringify({ + var copyright = 'undefined'; + if (theme.copy.enable && theme.copy.copyright.enable){ + copyright = JSON.stringify({ + limitCount: theme.copy.copyright.limit_count, languages: { - author: _p("copy_copyright.author") + ': ' + config.author, - link: _p("copy_copyright.link") + ': ', - source: _p("copy_copyright.source") + ': ' + config.title, - info: _p("copy_copyright.info") + author: _p("copy_copyright.author") + ': ' + config.author, + link: _p("copy_copyright.link") + ': ', + source: _p("copy_copyright.source") + ': ' + config.title, + info: _p("copy_copyright.info") } }) } @@ -74,12 +75,23 @@ }) } + var noticeOutdate = 'undefined'; + if (theme.noticeOutdate && theme.noticeOutdate.enable) { + noticeOutdate = JSON.stringify({ + limitDay: theme.noticeOutdate.limit_day, + position: theme.noticeOutdate.position, + messagePrev: theme.noticeOutdate.message_prev, + messageNext: theme.noticeOutdate.message_next, + }) + } + script. var GLOBAL_CONFIG = { root: '!{config.root}', algolia: !{algolia}, localSearch: !{localSearch}, translate: !{translate}, + noticeOutdate: !{noticeOutdate}, copy: { success: '!{_p("copy.success")}', error: '!{_p("copy.error")}', diff --git a/layout/includes/head/config_site.pug b/layout/includes/head/config_site.pug index 84167e8..c896b48 100644 --- a/layout/includes/head/config_site.pug +++ b/layout/includes/head/config_site.pug @@ -1,17 +1,19 @@ - let isHighlightShrink if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined' - else if (page.highlight_shrink !== null && page.toc !== undefined ) isHighlightShrink = page.highlight_shrink + else if (page.highlight_shrink === true || page.highlight_shrink === false) isHighlightShrink = page.highlight_shrink else isHighlightShrink = theme.highlight_shrink - const pageToc = page.toc !== null && page.toc !== undefined ? page.toc : theme.toc.enable + const pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true ) - -script. - var GLOBAL_CONFIG_SITE = { - isPost: !{is_post()}, - isHome: !{is_home()}, - isHighlightShrink: !{isHighlightShrink}, - isSidebar: !{showToc} +script#config_change + . + var GLOBAL_CONFIG_SITE = { + isPost: !{is_post()}, + isHome: !{is_home()}, + isHighlightShrink: !{isHighlightShrink}, + isSidebar: !{showToc}, + postUpdate: '!{full_date(page.updated)}' } diff --git a/layout/includes/head/google_adsense.pug b/layout/includes/head/google_adsense.pug index b3210ef..3ef1af9 100644 --- a/layout/includes/head/google_adsense.pug +++ b/layout/includes/head/google_adsense.pug @@ -1,7 +1,9 @@ if (theme.google_adsense && theme.google_adsense.enable) script(async src=theme.google_adsense.js) - script. - (adsbygoogle = window.adsbygoogle || []).push({ - google_ad_client: '!{theme.google_adsense.client}', - enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}' - }); \ No newline at end of file + + if theme.google_adsense.auto_ads + script. + (adsbygoogle = window.adsbygoogle || []).push({ + google_ad_client: '!{theme.google_adsense.client}', + enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}' + }); \ No newline at end of file diff --git a/layout/includes/head/noscript.pug b/layout/includes/head/noscript.pug index 761826c..bf995d7 100644 --- a/layout/includes/head/noscript.pug +++ b/layout/includes/head/noscript.pug @@ -3,7 +3,7 @@ noscript. #nav { opacity: 1 } - .justified-gallery img{ + .justified-gallery img { opacity: 1 } \ No newline at end of file diff --git a/layout/includes/head/pwa.pug b/layout/includes/head/pwa.pug index ca927dc..f318808 100644 --- a/layout/includes/head/pwa.pug +++ b/layout/includes/head/pwa.pug @@ -1,13 +1,13 @@ -link(rel="manifest" href=theme.pwa.manifest) +link(rel="manifest" href=url_for(theme.pwa.manifest)) if(theme.pwa.theme_color) meta(name="theme-color" content=theme.pwa.theme_color) if(theme.pwa.theme_color) meta(name="msapplication-TileColor" content=theme.pwa.theme_color) if(theme.pwa.apple_touch_icon) - link(rel="apple-touch-icon" sizes="180x180" href=theme.pwa.apple_touch_icon) + link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon)) if(theme.pwa.favicon_32_32) - link(rel="icon" type="image/png" sizes="32x32" href=theme.pwa.favicon_32_32) + link(rel="icon" type="image/png" sizes="32x32" href=url_for(theme.pwa.favicon_32_32)) if(theme.pwa.favicon_16_16) - link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16) + link(rel="icon" type="image/png" sizes="16x16" href=url_for(theme.pwa.favicon_16_16)) if(theme.pwa.mask_icon) - link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5") + link(rel="mask-icon" href=url_for(theme.pwa.mask_icon) color="#5bbad5") diff --git a/layout/includes/head/site_verification.pug b/layout/includes/head/site_verification.pug index 969883b..cae5742 100644 --- a/layout/includes/head/site_verification.pug +++ b/layout/includes/head/site_verification.pug @@ -9,3 +9,6 @@ if theme.baidu_site_verification if theme.qihu_site_verification meta(name="360-site-verification" content=theme.qihu_site_verification) + +if theme.yandex_site_verification + meta(name="yandex-verification" content=theme.yandex_site_verification) \ No newline at end of file diff --git a/layout/includes/head/subtitle.pug b/layout/includes/head/subtitle.pug deleted file mode 100644 index 8f73b82..0000000 --- a/layout/includes/head/subtitle.pug +++ /dev/null @@ -1,130 +0,0 @@ -if theme.subtitle.enable - - var source = theme.subtitle.source - - var subtitleEffect = theme.subtitle.effect - - if subtitleEffect - script(src=url_for(theme.CDN.typed)) - - if source == '1' - script. - var subtitleType = function () { - var subtitleEffect = !{ subtitleEffect } - fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',) - .then(function (res) { - return res.json() - }) - .then(function (data) { - if (subtitleEffect) { - var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') - var both = sub.unshift(data.text) - var typed = new Typed('#subtitle', { - strings: sub, - startDelay: 300, - typeSpeed: 150, - loop: !{theme.subtitle.loop}, - backSpeed: 50, - }) - } else { - document.getElementById('subtitle').innerHTML = data.text - } - }) - .catch(function (err) { - console.error(err) - }) - } - window.addEventListener('load', subtitleType) - - else if source == '2' - script. - var subtitleType = function () { - var subtitleEffect = !{ subtitleEffect } - fetch('https://v1.hitokoto.cn') - .then(function (res) { - return res.json() - }) - .then(function (data) { - if (subtitleEffect) { - var from = '出自 ' + data.from - var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') - var both = sub.unshift(data.hitokoto, from) - var typed = new Typed('#subtitle', { - strings: sub, - startDelay: 300, - typeSpeed: 150, - loop: !{theme.subtitle.loop}, - backSpeed: 50, - }) - } else { - document.getElementById('subtitle').innerHTML = data.hitokoto - } - }) - .catch(function (err) { - console.error(err) - }) - } - window.addEventListener('load', subtitleType) - - else if source == '3' - script. - var subtitleType = function () { - loadScript('http://yijuzhan.com/api/word.php?m=js', function () { - var subtitleEffect = !{ subtitleEffect } - var con = str[0] - if (subtitleEffect) { - var from = '出自 ' + str[1] - var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') - var both = sub.unshift(con, from) - var typed = new Typed('#subtitle', { - strings: sub, - startDelay: 300, - typeSpeed: 150, - loop: !{theme.subtitle.loop}, - backSpeed: 50, - }) - } else { - document.getElementById('subtitle').innerHTML = con - } - }) - } - window.addEventListener('load', subtitleType) - - else if source == '4' - script. - var subtitleType = function () { - loadScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () { - var subtitleEffect = !{ subtitleEffect } - jinrishici.load(function (result) { - if (subtitleEffect) { - var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') - var content = result.data.content - var both = sub.unshift(content) - var typed = new Typed('#subtitle', { - strings: sub, - startDelay: 300, - typeSpeed: 150, - loop: !{theme.subtitle.loop}, - backSpeed: 50, - }) - } else { - document.getElementById('subtitle').innerHTML = result.data.content - } - }) - } - ) - } - window.addEventListener('load', subtitleType) - - else - script. - var subtitleEffect = !{subtitleEffect} - if (subtitleEffect) { - var typed = new Typed("#subtitle", { - strings: "!{theme.subtitle.sub}".split(","), - startDelay: 300, - typeSpeed: 150, - loop: !{theme.subtitle.loop}, - backSpeed: 50 - }) - } else { - document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}' - } diff --git a/layout/includes/header/menu_item.pug b/layout/includes/header/menu_item.pug index f029ad0..8b58c96 100644 --- a/layout/includes/header/menu_item.pug +++ b/layout/includes/header/menu_item.pug @@ -1,22 +1,23 @@ -.menus_items - each value, label in theme.menu - if !Array.isArray(value) - .menus_item - a.site-page(href=url_for(trim(value.split('||')[0]))) - if value.split('||')[1] - i.fa-fw(class=trim(value.split('||')[1])) - span=' '+label - else - .menus_item - a.site-page - if label.split('||')[1] - i.fa-fw(class=trim(label.split('||')[1]) ) - span=' '+ trim(label.split('||')[0]) - i.fas.fa-chevron-down.menus-expand - ul.menus_item_child - each i in value - li - a.site-page(href=url_for(trim(i.split('||')[1]))) - if i.split('||')[2] - i.fa-fw(class=trim(i.split('||')[2])) - span=' '+trim(i.split('||')[0]) \ No newline at end of file +if theme.menu + .menus_items + each value, label in theme.menu + if !Array.isArray(value) + .menus_item + a.site-page(href=url_for(trim(value.split('||')[0]))) + if value.split('||')[1] + i.fa-fw(class=trim(value.split('||')[1])) + span=' '+label + else + .menus_item + a.site-page(href='javascript:void(0);') + if label.split('||')[1] + i.fa-fw(class=trim(label.split('||')[1])) + span=' '+ trim(label.split('||')[0]) + i.fas.fa-chevron-down.expand + ul.menus_item_child + each i in value + li + a.site-page(href=url_for(trim(i.split('||')[1]))) + if i.split('||')[2] + i.fa-fw(class=trim(i.split('||')[2])) + span=' '+trim(i.split('||')[0]) \ No newline at end of file diff --git a/layout/includes/header/nav.pug b/layout/includes/header/nav.pug index 79bf9d6..eab38aa 100644 --- a/layout/includes/header/nav.pug +++ b/layout/includes/header/nav.pug @@ -3,7 +3,7 @@ nav#nav a#site-name.blog_title(href=url_for('/')) #[=config.title] span.pull-right.menus - if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable) + if (theme.algolia_search.enable || theme.local_search.enable) #search_button a.site-page.social-icon.search i.fas.fa-search.fa-fw diff --git a/layout/includes/header/post-info.pug b/layout/includes/header/post-info.pug index 63439df..9fe7134 100644 --- a/layout/includes/header/post-info.pug +++ b/layout/includes/header/post-info.pug @@ -5,84 +5,79 @@ #post-meta .meta-firstline if (theme.post_meta.post.date_type) - if (theme.post_meta.post.date_type === 'both') - time.post-meta__date - span.post-meta__date-created(title= _p('post.created')+' '+full_date(page.date)) - i.far.fa-calendar-alt.fa-fw - =' '+_p('post.created')+' '+date(page.date, config.date_format) - span.post-meta__separator | - span.post-meta__date-updated(title= _p('post.updated')+' '+full_date(page.updated)) - i.fas.fa-history.fa-fw - =' '+_p('post.updated')+' '+date(page.updated, config.date_format) - else - - var data_type_update = theme.post_meta.post.date_type === 'updated' - - var date_type = data_type_update ? 'updated' : 'date' - - var date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt' - - var data_info = data_type_update ? _p('post.updated') : _p('post.created') - time.post-meta__date(title=data_info + ' ' + full_date(page[date_type])) - i.fa-fw(class=date_icon) - =' ' + data_info + ' ' + date(page[date_type], config.date_format) - + span.post-meta-date + if (theme.post_meta.post.date_type === 'both') + i.far.fa-calendar-alt.fa-fw.post-meta-icon + span.post-meta-label= _p('post.created') + time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))=date(page.date, config.date_format) + span.post-meta-separator | + i.fas.fa-history.fa-fw.post-meta-icon + span.post-meta-label= _p('post.updated') + time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))=date(page.updated, config.date_format) + else + - let data_type_update = theme.post_meta.post.date_type === 'updated' + - let date_type = data_type_update ? 'updated' : 'date' + - let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt' + - let data_info = data_type_update ? _p('post.updated') : _p('post.created') + i.fa-fw.post-meta-icon(class=date_icon) + span.post-meta-label= data_info + time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format) if (theme.post_meta.post.categories && page.categories.data.length > 0) - span.post-meta__categories + span.post-meta-categories if (theme.post_meta.post.date_type) - span.post-meta__separator | + span.post-meta-separator | each item, index in page.categories.data - i.fas.fa-inbox.fa-fw.post-meta__icon - a(href=url_for(item.path)).post-meta__categories #[=item.name] + i.fas.fa-inbox.fa-fw.post-meta-icon + a(href=url_for(item.path)).post-meta-categories #[=item.name] if (index < page.categories.data.length - 1) - i.fas.fa-angle-right.post-meta__separator + i.fas.fa-angle-right.post-meta-separator .meta-secondline - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read) if (postWordcount) + span.post-meta-separator | span.post-meta-wordcount if theme.wordcount.post_wordcount - i.far.fa-file-word.fa-fw.post-meta__icon - span= _p('post.wordcount') + ':' + i.far.fa-file-word.fa-fw.post-meta-icon + span.post-meta-label= _p('post.wordcount') + ':' span.word-count= wordcount(page.content) if theme.wordcount.min2read - span.post-meta__separator | + span.post-meta-separator | if theme.wordcount.min2read - i.far.fa-clock.fa-fw.post-meta__icon - span= _p('post.min2read', min2read(page.content, {cn: 350, en: 160})) + i.far.fa-clock.fa-fw.post-meta-icon + span.post-meta-label= _p('post.min2read') + ':' + span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit') - .meta-thirdline - span.post-meta-pv-cv - if (postWordcount && theme.busuanzi.page_pv) - span.post-meta__separator | - if theme.busuanzi.page_pv - i.far.fa-eye.fa-fw.post-meta__icon - span=_p('post.page_pv') + ':' + if theme.busuanzi.page_pv + span.post-meta-separator | + span.post-meta-pv-cv + i.far.fa-eye.fa-fw.post-meta-icon + span.post-meta-label=_p('post.page_pv') + ':' span#busuanzi_value_page_pv - span.post-meta-commentcount - if ((theme.disqus && theme.disqus.enable && theme.disqus.count && page.comments !== false) || (theme.disqusjs && theme.disqusjs.enable && theme.disqusjs.count && page.comments !== false)) - if (postWordcount || theme.busuanzi.page_pv) - span.post-meta__separator | - i.far.fa-comments.fa-fw.post-meta__icon - span= _p('post.comments') + ':' - span.disqus-comment-count.comment-count - a(href=full_url_for(page.path) + '#disqus_thread') - else if (theme.valine && theme.valine.enable && theme.valine.count && page.comments !== false) - if (postWordcount || theme.busuanzi.page_pv) - span.post-meta__separator | - i.far.fa-comments.fa-fw.post-meta__icon - span= _p('post.comments') + ':' - a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl") - span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount") - else if (theme.gitalk && theme.gitalk.enable && theme.gitalk.count && page.comments !== false) - if (postWordcount || theme.busuanzi.page_pv) - span.post-meta__separator | - i.far.fa-comments.fa-fw.post-meta__icon - span= _p('post.comments') + ':' - a(href=url_for(page.path) + '#post-comment') - span.gitalk-comment-count.comment-count - else if theme.facebook_comments.enable && theme.facebook_comments.count && page.comments !== false - if (postWordcount || theme.busuanzi.page_pv) - span.post-meta__separator | - i.far.fa-comments.fa-fw.post-meta__icon - span= _p('post.comments') + ':' - a.comment-count(href=url_for(page.path) + '#post-comment') - span.fb-comments-count(data-href=urlNoIndex()) \ No newline at end of file + if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count + - var whichCount = theme.comments.use[0] + if whichCount !== 'Livere' && whichCount !== 'Utterances' + span.post-meta-separator | + span.post-meta-commentcount + if whichCount === 'Disqus' || whichCount === 'Disqusjs' + i.far.fa-comments.fa-fw.post-meta-icon + span.post-meta-label= _p('post.comments') + ':' + span.disqus-comment-count.comment-count + a(href=full_url_for(page.path) + '#disqus_thread') + else if whichCount === 'Valine' + i.far.fa-comments.fa-fw.post-meta-icon + span.post-meta-label= _p('post.comments') + ':' + a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl") + span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount") + else if whichCount === 'Gitalk' + i.far.fa-comments.fa-fw.post-meta-icon + span.post-meta-label= _p('post.comments') + ':' + a(href=url_for(page.path) + '#post-comment') + span.gitalk-comment-count.comment-count + else if whichCount === 'Facebook Comments' + i.far.fa-comments.fa-fw.post-meta-icon + span.post-meta-label= _p('post.comments') + ':' + a.comment-count(href=url_for(page.path) + '#post-comment') + span.fb-comments-count(data-href=urlNoIndex()) \ No newline at end of file diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug index dae1612..467aca9 100644 --- a/layout/includes/layout.pug +++ b/layout/includes/layout.pug @@ -1,6 +1,4 @@ - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : '' -- var pageHighlightShrinkSet = page.highlight_shrink !== undefined ? page.highlight_shrink : theme.highlight_shrink -- var pageHighlightShrink = theme.highlight_shrink !== 'none' && pageHighlightShrinkSet ? 'code-close' : '' doctype html html(lang=config.language data-theme=theme.display_mode) @@ -10,18 +8,14 @@ html(lang=config.language data-theme=theme.display_mode) if theme.preloader !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache}) - if theme.fireworks && theme.fireworks.enable - canvas.fireworks - !=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache}) - include ./sidebar.pug - - #body-wrap(class=pageHighlightShrink) + #body-wrap if theme.background - var is_photo = theme.background.startsWith('url') ? 'photo':'color' #web_bg(data-type=is_photo) + include ./sidebar.pug include ./header/index.pug if (!is_post()) @@ -44,5 +38,5 @@ html(lang=config.language data-theme=theme.display_mode) !=partial('includes/footer', {}, {cache:theme.fragment_cache}) include ./rightside.pug - !=partial('includes/search/index', {}, {cache:theme.fragment_cache}) + !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache}) include ./additional-js.pug \ No newline at end of file diff --git a/layout/includes/math/mathjax.pug b/layout/includes/math/mathjax.pug deleted file mode 100644 index a28d1c0..0000000 --- a/layout/includes/math/mathjax.pug +++ /dev/null @@ -1,27 +0,0 @@ -script(type="text/x-mathjax-config"). - MathJax.Hub.Config({ - tex2jax: { - inlineMath: [ ['$','$'], ["\\(","\\)"] ], - processEscapes: true, - skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code'] - }, - CommonHTML: { - linebreaks: { automatic: true, width: "90% container" } - }, - "HTML-CSS": { - linebreaks: { automatic: true, width: "90% container" } - }, - "SVG": { - linebreaks: { automatic: true, width: "90% container" } - } - }); - -script(type="text/x-mathjax-config"). - MathJax.Hub.Queue(function() { - var all = MathJax.Hub.getAllJax(), i; - for (i=0; i < all.length; i += 1) { - all[i].SourceElement().parentNode.className += ' has-jax'; - } - }); - -script(src=theme.CDN.mathjax) \ No newline at end of file diff --git a/layout/includes/math/mermaid.pug b/layout/includes/math/mermaid.pug deleted file mode 100644 index 7984358..0000000 --- a/layout/includes/math/mermaid.pug +++ /dev/null @@ -1,8 +0,0 @@ -script. - if (document.getElementsByClassName('mermaid').length) { - loadScript('!{theme.CDN.mermaid}',function () { - mermaid.initialize({ - theme: '!{theme.mermaid.theme}', - }) - }) - } \ No newline at end of file diff --git a/layout/includes/mixins/article-sort.pug b/layout/includes/mixins/article-sort.pug index 22b35a2..c2f1b5e 100644 --- a/layout/includes/mixins/article-sort.pug +++ b/layout/includes/mixins/article-sort.pug @@ -2,19 +2,22 @@ mixin articleSort(posts) .article-sort - var year - posts.each(function (article) { - - var tempYear = date(article.date, 'YYYY') - - var no_cover = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : '' + - let tempYear = date(article.date, 'YYYY') + - let no_cover = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : '' + - let title = article.title || _p('no_title') if tempYear !== year - year = tempYear .article-sort-item.year= year .article-sort-item(class=no_cover) if article.cover && theme.cover.archives_enable - .article-sort-img - a.article-sort-item__img(href=url_for(article.path)) - img(src=url_for(article.cover) alt=article.title || 'No Title' onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'`) - .article-sort-post - a.article-sort-item__post(href=url_for(article.path)) + a.article-sort-item-img(href=url_for(article.path) title=title) + if theme.lazyload.enable + img(data-lazy-src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`) + else + img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`) + .article-sort-item-info + .article-sort-item-time i.far.fa-calendar-alt - time.article-sort-item__time(title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format) - .article-sort-item__title= article.title || 'No Title' + time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format) + a.article-sort-item-title(href=url_for(article.path) title=title)= title - }) \ No newline at end of file diff --git a/layout/includes/mixins/post-ui.pug b/layout/includes/mixins/post-ui.pug index e9455d0..51543c6 100644 --- a/layout/includes/mixins/post-ui.pug +++ b/layout/includes/mixins/post-ui.pug @@ -1,16 +1,16 @@ mixin postUI(posts) each article , index in page.posts.data .recent-post-item - - var link = article.link || article.path - - var title = article.title || _p('no_title') - - var leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius' - - var post_cover = article.cover - - var no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : '' + - let link = article.link || article.path + - let title = article.title || _p('no_title') + - let leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius' + - let post_cover = article.cover + - let no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : '' if post_cover && theme.cover.index_enable .post_cover(class=leftOrRight) a(href=url_for(link) title=title) if theme.lazyload.enable - img.post_bg(data-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title) + img.post_bg(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title) else img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title) .recent-post-info(class=no_cover) @@ -22,23 +22,23 @@ mixin postUI(posts) span.sticky= _p('sticky') span.article-meta__separator | if (theme.post_meta.page.date_type) - if (theme.post_meta.page.date_type === 'both') - time.post-meta__date - span.post-meta__date-created(title=_p('post.created') + ' ' + full_date(article.date)) - i.far.fa-calendar-alt - =date(article.date, config.date_format) + span.post-meta-date + if (theme.post_meta.page.date_type === 'both') + i.far.fa-calendar-alt + span.article-meta-label=_p('post.created') + time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))=date(article.date, config.date_format) span.article-meta__separator | - span.post-meta__date-updated(title=_p('post.updated') + ' ' + full_date(article.updated)) - i.fas.fa-history - =date(article.updated, config.date_format) - else - - var data_type_updated = theme.post_meta.page.date_type === 'updated' - - var date_type = data_type_updated ? 'updated' : 'date' - - var date_icon = data_type_updated ? 'fas fa-history' :'far fa-calendar-alt' - - var date_title = data_type_updated ? _p('post.updated') : _p('post.created') - time.post-meta__date(title=date_title + ' ' + full_date(article[date_type])) + i.fas.fa-history + span.article-meta-label=_p('post.updated') + time.post-meta-date-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated))=date(article.updated, config.date_format) + else + - let data_type_updated = theme.post_meta.page.date_type === 'updated' + - let date_type = data_type_updated ? 'updated' : 'date' + - let date_icon = data_type_updated ? 'fas fa-history' :'far fa-calendar-alt' + - let date_title = data_type_updated ? _p('post.updated') : _p('post.created') i(class=date_icon) - =date(article[date_type], config.date_format) + span.article-meta-label=date_title + time(datetime=date_xml(article[date_type]) title=date_title + ' ' + full_date(article[date_type]))=date(article[date_type], config.date_format) if (theme.post_meta.page.categories && article.categories.data.length > 0) span.article-meta span.article-meta__separator | diff --git a/layout/includes/mobile-sidebar/mobile-menus.pug b/layout/includes/mobile-sidebar/mobile-menus.pug index ac562cd..42a0bed 100644 --- a/layout/includes/mobile-sidebar/mobile-menus.pug +++ b/layout/includes/mobile-sidebar/mobile-menus.pug @@ -1,6 +1,9 @@ #mobile-sidebar-menus .mobile_author_icon - img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar") + if theme.lazyload.enable + img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar") + else + img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar") .mobile_post_data if site.posts.length .mobile_data_item.is-center diff --git a/layout/includes/pagination.pug b/layout/includes/pagination.pug index 0783343..ab09c1a 100644 --- a/layout/includes/pagination.pug +++ b/layout/includes/pagination.pug @@ -18,7 +18,7 @@ else - var pagination_cover = page.prev.cover === false ? page.prev.randomcover : page.prev.cover a(href=url_for(page.prev.path)) if theme.lazyload.enable - img.prev-cover(data-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` ) + img.prev-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` ) else img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` ) .pagination-info @@ -31,7 +31,7 @@ else .next-post(class=hasPagePrev) a(href=url_for(page.next.path)) if theme.lazyload.enable - img.next-cover(data-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`) + img.next-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`) else img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`) .pagination-info diff --git a/layout/includes/post/post-copyright.pug b/layout/includes/post/post-copyright.pug index ee8c659..dfa346d 100644 --- a/layout/includes/post/post-copyright.pug +++ b/layout/includes/post/post-copyright.pug @@ -1,13 +1,17 @@ -if (theme.post_copyright && theme.post_copyright.enable && page.copyright != false) +if theme.post_copyright.enable && page.copyright !== false + - let author = page.copyright_author ? page.copyright_author : config.author + - let authorHref = page.copyright_author_href ? page.copyright_author_href : `mailto:${config.email}` + - let url = page.copyright_url ? page.copyright_url : page.permalink + - let info = page.copyright_info ? page.copyright_info : _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title) .post-copyright .post-copyright__author span.post-copyright-meta= _p('post.copyright.author') + ": " span.post-copyright-info - a(href=`mailto:${config.email}`) #[=config.author] + a(href=authorHref)=author .post-copyright__type span.post-copyright-meta= _p('post.copyright.link') + ": " span.post-copyright-info - a(href=url_for(page.permalink))= theme.post_copyright.decode ? decodeURI(page.permalink) : page.permalink + a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url .post-copyright__notice span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": " - span.post-copyright-info!= _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title) + span.post-copyright-info!= info diff --git a/layout/includes/post/reward.pug b/layout/includes/post/reward.pug index 3c5ac28..1bf9381 100644 --- a/layout/includes/post/reward.pug +++ b/layout/includes/post/reward.pug @@ -1,5 +1,5 @@ .post-reward - button.reward-button + .reward-button i.fas.fa-qrcode = ' ' + _p('donate') .reward-main @@ -7,6 +7,10 @@ each item in theme.reward.QR_code - var clickTo = (item.itemlist||item).link ? (item.itemlist||item).link : (item.itemlist||item).img li.reward-item - img.post-qr-code__img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text onclick=`window.open('${url_for(clickTo)}')`) - .post-qr-code__desc=(item.itemlist||item).text + a(href=clickTo target='_blank') + if theme.lazyload.enable + img.post-qr-code-img(data-lazy-src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text) + else + img.post-qr-code-img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text) + .post-qr-code-desc=(item.itemlist||item).text diff --git a/layout/includes/rightside.pug b/layout/includes/rightside.pug index 90e0dc0..7a7f99c 100644 --- a/layout/includes/rightside.pug +++ b/layout/includes/rightside.pug @@ -1,32 +1,32 @@ -section#rightside.rightside +section#rightside #rightside-config-hide if is_post() if theme.readmode - button#readmode(title=_p('rightside.readmode_title')) + button#readmode(type="button" title=_p('rightside.readmode_title')) i.fas.fa-book-open - button#font_plus(title=_p('rightside.font_plus_title')) + button#font_plus(type="button" title=_p('rightside.font_plus_title')) i.fas.fa-plus - button#font_minus(title=_p('rightside.font_minus_title')) + button#font_minus(type="button" title=_p('rightside.font_minus_title')) i.fas.fa-minus if theme.translate && theme.translate.enable - button#translateLink.translate_chn_to_cht(title=_p('rightside.translate_title'))= theme.translate.default + button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default if theme.darkmode.enable && theme.darkmode.button - button#darkmode(title=_p('rightside.night_mode_title')) + button#darkmode(type="button" title=_p('rightside.night_mode_title')) i.fas.fa-adjust #rightside-config-show - button#rightside_config(title=_p("rightside.setting")) + button#rightside_config(type="button" title=_p("rightside.setting")) i.fas.fa-cog - if is_post() && page.comments !== false && isComment + if is_post() && page.comments !== false && theme.comments.use a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment")) - i.scroll_to_comment.fas.fa-comments + i.fas.fa-comments if showToc - button#mobile-toc-button.close(title=_p("rightside.toc")) + button#mobile-toc-button.close(type="button" title=_p("rightside.toc")) i.fas.fa-list-ul - if theme.chat_btn && (theme.chatra.enable || theme.tidio.enable || theme.daovoice.enable || theme.gitter.enable) - button#chat_btn(title=_p("rightside.chat_btn")) + if theme.chat_btn + button#chat_btn(type="button" title=_p("rightside.chat_btn")) i.fas.fa-sms - button#go-up(title=_p("rightside.back_to_top")) + button#go-up(type="button" title=_p("rightside.back_to_top")) i.fas.fa-arrow-up diff --git a/layout/includes/search/index.pug b/layout/includes/search/index.pug deleted file mode 100644 index 19dd228..0000000 --- a/layout/includes/search/index.pug +++ /dev/null @@ -1,5 +0,0 @@ -if (theme.algolia_search.enable) - include ./algolia.pug -if (theme.local_search) - if (!theme.algolia_search.enable && theme.local_search.enable) - include ./local-search.pug \ No newline at end of file diff --git a/layout/includes/share/index.pug b/layout/includes/share/index.pug deleted file mode 100644 index 7b29796..0000000 --- a/layout/includes/share/index.pug +++ /dev/null @@ -1,7 +0,0 @@ -.post_share - if theme.addThis.enable - include ./add-this.pug - else if theme.sharejs && theme.sharejs.enable - include ./share-js.pug - else if theme.addtoany.enable - include ./addtoany.pug diff --git a/layout/includes/share/share-js.pug b/layout/includes/share/share-js.pug deleted file mode 100644 index 85f84dd..0000000 --- a/layout/includes/share/share-js.pug +++ /dev/null @@ -1,4 +0,0 @@ -if (theme.sharejs && theme.sharejs.enable) - .social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites) - link(rel="stylesheet" href=url_for(theme.CDN.sharejs_css)) - script(src=url_for(theme.CDN.sharejs)) \ No newline at end of file diff --git a/layout/includes/sidebar.pug b/layout/includes/sidebar.pug index c155dab..ed56729 100644 --- a/layout/includes/sidebar.pug +++ b/layout/includes/sidebar.pug @@ -5,8 +5,8 @@ - if(showToc) - i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar) #sidebar + i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar) .sidebar-toc div.sidebar-toc__title= _p('sidebar.catalog') div.sidebar-toc__progress diff --git a/layout/includes/third-party/canvas-nest.pug b/layout/includes/third-party/canvas-nest.pug deleted file mode 100644 index bb790be..0000000 --- a/layout/includes/third-party/canvas-nest.pug +++ /dev/null @@ -1 +0,0 @@ -script#canvas_nest(color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest)) \ No newline at end of file diff --git a/layout/includes/third-party/canvas-ribbon-piao.pug b/layout/includes/third-party/canvas-ribbon-piao.pug deleted file mode 100644 index 505af83..0000000 --- a/layout/includes/third-party/canvas-ribbon-piao.pug +++ /dev/null @@ -1 +0,0 @@ -script(id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao)) \ No newline at end of file diff --git a/layout/includes/third-party/canvas-ribbon.pug b/layout/includes/third-party/canvas-ribbon.pug deleted file mode 100644 index 9fc03fc..0000000 --- a/layout/includes/third-party/canvas-ribbon.pug +++ /dev/null @@ -1,3 +0,0 @@ -script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size -alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`) - diff --git a/layout/includes/chat/chatra.pug b/layout/includes/third-party/chat/chatra.pug similarity index 86% rename from layout/includes/chat/chatra.pug rename to layout/includes/third-party/chat/chatra.pug index 0566392..b6c1201 100644 --- a/layout/includes/chat/chatra.pug +++ b/layout/includes/third-party/chat/chatra.pug @@ -12,10 +12,13 @@ script. })(document, window, 'Chatra'); if (!{theme.chat_btn}) { - var chatBtn = document.getElementById("chat_btn") + var chatBtnFn = () => { + var chatBtn = document.getElementById("chat_btn") chatBtn.addEventListener("click", function(){ Chatra('openChat') }); + } + chatBtnFn() } else { if (!{theme.chat_hide_show}) { function chatBtnHide () { diff --git a/layout/includes/third-party/chat/crisp.pug b/layout/includes/third-party/chat/crisp.pug new file mode 100644 index 0000000..cc57e8d --- /dev/null +++ b/layout/includes/third-party/chat/crisp.pug @@ -0,0 +1,36 @@ +script. + window.$crisp = []; + window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}"; + (function () { + d = document; + s = d.createElement("script"); + s.src = "https://client.crisp.chat/l.js"; + s.async = 1; + d.getElementsByTagName("head")[0].appendChild(s); + })(); + $crisp.push(["safe", true]) + + if (!{theme.chat_btn}) { + $crisp.push(["do", "chat:hide"]) + $crisp.push(["on", "chat:closed", function() { + $crisp.push(["do", "chat:hide"]) + }]) + var chatBtnFn = () => { + var chatBtn = document.getElementById("chat_btn") + chatBtn.addEventListener("click", function(){ + $crisp.push(["do", "chat:show"]) + $crisp.push(["do", "chat:open"]) + + }); + } + chatBtnFn() + } else { + if (!{theme.chat_hide_show}) { + function chatBtnHide () { + $crisp.push(["do", "chat:hide"]) + } + function chatBtnShow () { + $crisp.push(["do", "chat:show"]) + } + } + } \ No newline at end of file diff --git a/layout/includes/chat/daovoice.pug b/layout/includes/third-party/chat/daovoice.pug similarity index 85% rename from layout/includes/chat/daovoice.pug rename to layout/includes/third-party/chat/daovoice.pug index dd0e047..3c6b064 100644 --- a/layout/includes/chat/daovoice.pug +++ b/layout/includes/third-party/chat/daovoice.pug @@ -13,10 +13,13 @@ script. daovoice('update'); if (isChatBtn) { - var chatBtn = document.getElementById("chat_btn") - chatBtn.addEventListener("click", function(){ - daovoice('show') - }); + var chatBtnFn = () => { + var chatBtn = document.getElementById("chat_btn") + chatBtn.addEventListener("click", function(){ + daovoice('show') + }); + } + chatBtnFn() } else { if (!{theme.chat_hide_show}) { function chatBtnHide () { diff --git a/layout/includes/third-party/chat/gitter.pug b/layout/includes/third-party/chat/gitter.pug new file mode 100644 index 0000000..05c5bc4 --- /dev/null +++ b/layout/includes/third-party/chat/gitter.pug @@ -0,0 +1,43 @@ +if theme.chat_btn + script. + ((window.gitter = {}).chat = {}).options = { + disableDefaultChat: true, + }; + document.addEventListener('gitter-sidecar-ready', (e) => { + const GitterChat = e.detail.Chat + let chat + + function initGitter () { + chat = new GitterChat({ + room: '#{theme.gitter.room}', + activationElement: '#chat_btn' + }); + } + + initGitter() + + if (!{theme.pjax}) { + document.addEventListener('pjax:complete', () => { + chat.destroy() + initGitter() + }) + } + + }) +else + script. + ((window.gitter = {}).chat = {}).options = { + room: '#{theme.gitter.room}', + }; + + if (!{theme.chat_hide_show}) { + function chatBtnHide () { + document.getElementsByClassName('gitter-open-chat-button')[0].style.display= 'none' + } + + function chatBtnShow () { + document.getElementsByClassName('gitter-open-chat-button')[0].style.display= 'block' + } + } + +script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer) diff --git a/layout/includes/chat/index.pug b/layout/includes/third-party/chat/index.pug similarity index 73% rename from layout/includes/chat/index.pug rename to layout/includes/third-party/chat/index.pug index 48b8585..db78a34 100644 --- a/layout/includes/chat/index.pug +++ b/layout/includes/third-party/chat/index.pug @@ -5,4 +5,6 @@ else if theme.tidio && theme.tidio.enable else if theme.daovoice && theme.daovoice.enable include ./daovoice.pug else if theme.gitter && theme.gitter.enable - include ./gitter.pug \ No newline at end of file + include ./gitter.pug +else if theme.crisp && theme.crisp.enable + include ./crisp.pug \ No newline at end of file diff --git a/layout/includes/third-party/chat/tidio.pug b/layout/includes/third-party/chat/tidio.pug new file mode 100644 index 0000000..6b0097f --- /dev/null +++ b/layout/includes/third-party/chat/tidio.pug @@ -0,0 +1,41 @@ +script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async) + +if theme.chat_btn + script. + function onTidioChatApiReady() { + window.tidioChatApi.hide(); + window.tidioChatApi.on("close", function() { + window.tidioChatApi.hide(); + }); + } + if (window.tidioChatApi) { + window.tidioChatApi.on("ready", onTidioChatApiReady); + } else { + document.addEventListener("tidioChat-ready", onTidioChatApiReady); + } + + var chatBtnFn = () => { + document.getElementById("chat_btn").addEventListener("click", function(){ + window.tidioChatApi.show(); + window.tidioChatApi.open(); + }); + } + chatBtnFn() + +else if theme.chat_hide_show + script. + function chatBtnHide () { + if (window.tidioChatApi) { + //- window.tidioChatApi.hide(); + document.getElementById('tidio-chat').style.display= 'none' + } + } + + function chatBtnShow () { + if (window.tidioChatApi) { + //- window.tidioChatApi.show(); + document.getElementById('tidio-chat').style.display= 'block' + } + } + + diff --git a/layout/includes/third-party/comments/disqus.pug b/layout/includes/third-party/comments/disqus.pug new file mode 100644 index 0000000..dcbe896 --- /dev/null +++ b/layout/includes/third-party/comments/disqus.pug @@ -0,0 +1,45 @@ +script. + function loadDisqus () { + var disqus_config = function () { + this.page.url = '!{ page.permalink }' + this.page.identifier = '!{ page.path }' + this.page.title = '!{ page.title }' + }; + + window.disqusReset = () => { + DISQUS.reset({ + reload: true, + config: disqus_config + }) + } + + if (window.DISQUS) disqusReset() + else { + (function() { + var d = document, s = d.createElement('script'); + s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js'; + s.setAttribute('data-timestamp', +new Date()); + (d.head || d.body).appendChild(s); + })(); + } + } + + if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.getElementById('disqus_thread'), loadDisqus) + else loadDisqus() + } else { + function loadOtherComment () { + loadDisqus() + } + } + +if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqus' + script. + if (window.DISQUSWIDGETS === undefined) { + var d = document, s = d.createElement('script'); + s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js'; + s.id = 'dsq-count-scr'; + (d.head || d.body).appendChild(s); + } else { + DISQUSWIDGETS.getCount({reset: true}); + } diff --git a/layout/includes/third-party/comments/disqusjs.pug b/layout/includes/third-party/comments/disqusjs.pug new file mode 100644 index 0000000..76d7b85 --- /dev/null +++ b/layout/includes/third-party/comments/disqusjs.pug @@ -0,0 +1,57 @@ +script. + function loadDisqusjs () { + function addDisqusjsCSS () { + const ele = document.createElement('link') + ele.rel = 'stylesheet' + ele.href= '!{url_for(theme.CDN.disqusjs_css)}' + document.getElementsByTagName('head')[0].appendChild(ele) + } + + function initDisqusjs () { + window.DISQUS = null + new DisqusJS({ + shortname: '!{theme.disqusjs.shortname}', + siteName: '!{theme.disqusjs.siteName}', + identifier: '!{ page.path }', + url: '!{ page.permalink }', + title: '!{ page.title }', + api: '!{theme.disqusjs.api}', + apikey: '!{theme.disqusjs.apikey}', + nocomment: '!{theme.disqusjs.nocomment}', + admin: '!{theme.disqusjs.admin}', + adminLabel: '!{theme.disqusjs.adminLabel}' + }); + } + + window.disqusReset = initDisqusjs + + if (window.disqusJsLoad) initDisqusjs() + else { + addDisqusjsCSS() + $.getScript('!{url_for(theme.CDN.disqusjs)}', initDisqusjs) + window.disqusJsLoad = true + } + } + + if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.getElementById('disqus_thread'), loadDisqusjs) + else loadDisqusjs() + } + else { + function loadOtherComment () { + loadDisqusjs() + } + } + + +if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs' + script. + if (window.DISQUSWIDGETS === undefined) { + var d = document, s = d.createElement('script'); + s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js'; + s.id = 'dsq-count-scr'; + (d.head || d.body).appendChild(s); + } else { + DISQUSWIDGETS.getCount({reset: true}); + } + diff --git a/layout/includes/third-party/comments/facebook_comments.pug b/layout/includes/third-party/comments/facebook_comments.pug new file mode 100644 index 0000000..65a1fbd --- /dev/null +++ b/layout/includes/third-party/comments/facebook_comments.pug @@ -0,0 +1,26 @@ +#fb-root +script. + function loadFBComment () { + var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light' + document.getElementsByClassName('fb-comments')[0].setAttribute('data-colorscheme',themeNow) + + if (typeof FB === 'object') FB.XFBML.parse() + else { + let ele = document.createElement('script') + ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v7.0') + ele.setAttribute('async', 'true') + ele.setAttribute('defer', 'true') + ele.setAttribute('crossorigin', 'anonymous') + document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele) + } + } + + if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment) + else loadFBComment() + } else { + function loadOtherComment () { + loadFBComment() + } + } + diff --git a/layout/includes/third-party/comments/gitalk.pug b/layout/includes/third-party/comments/gitalk.pug new file mode 100644 index 0000000..834b42a --- /dev/null +++ b/layout/includes/third-party/comments/gitalk.pug @@ -0,0 +1,52 @@ +script. + function addGitalkSource () { + const ele = document.createElement('link') + ele.rel = 'stylesheet' + ele.href= '!{url_for(theme.CDN.gitalk_css)}' + document.getElementsByTagName('head')[0].appendChild(ele) + } + + function loadGitalk () { + function initGitalk () { + var gitalk = new Gitalk({ + clientID: '!{theme.gitalk.client_id}', + clientSecret: '!{theme.gitalk.client_secret}', + repo: '!{theme.gitalk.repo}', + owner: '!{theme.gitalk.owner}', + admin: ['!{theme.gitalk.admin}'], + id: '!{md5(page.path)}', + language: '!{theme.gitalk.language}', + perPage: !{theme.gitalk.perPage}, + distractionFreeMode: !{theme.gitalk.distractionFreeMode}, + pagerDirection: '!{theme.gitalk.pagerDirection}', + createIssueManually: !{theme.gitalk.createIssueManually}, + updateCountCallback: commentCount + }) + gitalk.render('gitalk-container') + } + + if (typeof Gitalk === 'function') initGitalk() + else { + addGitalkSource() + $.getScript('!{url_for(theme.CDN.gitalk)}', initGitalk) + } + } + + function commentCount(n){ + let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count') + if (isCommentCount) { + isCommentCount.innerHTML= n + } + } + + if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.getElementById('gitalk-container'), loadGitalk) + else loadGitalk() + } else { + function loadOtherComment () { + loadGitalk() + } + } + + + diff --git a/layout/includes/third-party/comments/index.pug b/layout/includes/third-party/comments/index.pug new file mode 100644 index 0000000..b8ae62f --- /dev/null +++ b/layout/includes/third-party/comments/index.pug @@ -0,0 +1,38 @@ +- let defaultComment = theme.comments.use[0] +hr +#post-comment + .comment-head + .comment-headline + i.fas.fa-comments.fa-fw + span= ' ' + _p('comment') + + if theme.comments.use.length > 1 + .comment-switch + span.first-comment=defaultComment + label + input#switch-comments-btn(type="checkbox") + span.slider + span.second-comment=theme.comments.use[1] + + + .comment-wrap + each name in theme.comments.use + div + case name + when 'Disqus' + #disqus_thread + when 'Valine' + #vcomment.vcomment + when 'Disqusjs' + #disqus_thread + when 'Livere' + #lv-container(data-id="city" data-uid=theme.livere.uid) + when 'Gitalk' + #gitalk-container + when 'Utterances' + #utterances-wrap + when 'Facebook Comments' + .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light' + data-numposts= theme.facebook_comments.pageSize || 10 + data-order-by= theme.facebook_comments.order_by || 'social' + data-width="100%") diff --git a/layout/includes/third-party/comments/js.pug b/layout/includes/third-party/comments/js.pug new file mode 100644 index 0000000..23f9d71 --- /dev/null +++ b/layout/includes/third-party/comments/js.pug @@ -0,0 +1,16 @@ +each name in theme.comments.use + case name + when 'Valine' + !=partial('includes/third-party/comments/valine', {}, {cache:theme.fragment_cache}) + when 'Disqus' + include ./disqus.pug + when 'Disqusjs' + include ./disqusjs.pug + when 'Livere' + !=partial('includes/third-party/comments/livere', {}, {cache:theme.fragment_cache}) + when 'Gitalk' + include ./gitalk.pug + when 'Utterances' + !=partial('includes/third-party/comments/utterances', {}, {cache:theme.fragment_cache}) + when 'Facebook Comments' + !=partial('includes/third-party/comments/facebook_comments', {}, {cache:theme.fragment_cache}) diff --git a/layout/includes/comments/livere.pug b/layout/includes/third-party/comments/livere.pug similarity index 50% rename from layout/includes/comments/livere.pug rename to layout/includes/third-party/comments/livere.pug index f530901..faaa60e 100644 --- a/layout/includes/comments/livere.pug +++ b/layout/includes/third-party/comments/livere.pug @@ -1,5 +1,5 @@ -#lv-container(data-id="city" data-uid=theme.livere.uid) - script. +script. + function loadLivere () { (function(d, s) { var j, e = d.getElementsByTagName(s)[0]; if (typeof LivereTower === 'function') { return; } @@ -8,3 +8,14 @@ j.async = true; e.parentNode.insertBefore(j, e); })(document, 'script'); + } + + if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.getElementById('lv-container'), loadLivere) + else loadLivere() + } + else { + function loadOtherComment () { + loadLivere() + } + } \ No newline at end of file diff --git a/layout/includes/third-party/comments/utterances.pug b/layout/includes/third-party/comments/utterances.pug new file mode 100644 index 0000000..7911a3e --- /dev/null +++ b/layout/includes/third-party/comments/utterances.pug @@ -0,0 +1,34 @@ +script. + function loadUtterances () { + let ele = document.createElement('script') + ele.setAttribute('id', 'utterances_comment') + ele.setAttribute('src', '!{url_for(theme.CDN.utterances)}') + ele.setAttribute('repo', '!{theme.utterances.repo}') + ele.setAttribute('issue-term', '!{theme.utterances.issue_term}') + let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}' + ele.setAttribute('theme', nowTheme) + ele.setAttribute('crossorigin', 'anonymous') + ele.setAttribute('async', 'true') + document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele) + } + + function utterancesTheme () { + if (document.querySelector('.utterances-frame')) { + const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}' + const message = { + type: 'set-theme', + theme: theme + }; + const iframe = document.querySelector('.utterances-frame'); + iframe.contentWindow.postMessage(message, 'https://utteranc.es'); + } + } + + if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.getElementById('utterances-wrap'), loadUtterances) + else loadUtterances() + } else { + function loadOtherComment () { + loadUtterances() + } + } diff --git a/layout/includes/third-party/comments/valine.pug b/layout/includes/third-party/comments/valine.pug new file mode 100644 index 0000000..a547529 --- /dev/null +++ b/layout/includes/third-party/comments/valine.pug @@ -0,0 +1,40 @@ +- let emojiMaps = '""' +if site.data.valine + - emojiMaps = JSON.stringify(site.data.valine) + +script. + function loadValine () { + function initValine () { + window.valine = new Valine({ + el: '#vcomment', + appId: '#{theme.valine.appId}', + appKey: '#{theme.valine.appKey}', + placeholder: '#{theme.valine.placeholder}', + avatar: '#{theme.valine.avatar}', + meta: '#{theme.valine.guest_info }'.split(','), + pageSize: '#{theme.valine.pageSize}', + lang: '#{theme.valine.lang}', + recordIP: #{theme.valine.recordIP}, + serverURLs: '#{theme.valine.serverURLs}', + emojiCDN: '#{theme.valine.emojiCDN}', + emojiMaps: !{emojiMaps}, + enableQQ: #{theme.valine.enableQQ}, + path: window.location.pathname, + }); + if ('#{theme.valine.requiredFields}') { valine.config.requiredFields= '#{theme.valine.requiredFields}'.split(',') } + } + + if (typeof Valine === 'function') initValine() + else $.getScript('!{url_for(theme.CDN.valine)}', initValine) + } + + if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) { + if (!{theme.comments.lazyload}) loadComment(document.querySelector('#vcomment'),loadValine) + else setTimeout(() => loadValine(), 0) + } else { + function loadOtherComment () { + loadValine() + } + } + + diff --git a/layout/includes/third-party/effect.pug b/layout/includes/third-party/effect.pug new file mode 100644 index 0000000..335a70c --- /dev/null +++ b/layout/includes/third-party/effect.pug @@ -0,0 +1,28 @@ +if theme.fireworks && theme.fireworks.enable + canvas.fireworks + script(src=url_for(theme.CDN.anime)) + script(src=url_for(theme.CDN.fireworks)) + +if (theme.canvas_ribbon && theme.canvas_ribbon.enable) + script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size + alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`) + +if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable) + script(defer id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao)) + +if (theme.canvas_nest && theme.canvas_nest.enable) + script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest)) + +if theme.activate_power_mode.enable + script(src=url_for(theme.CDN.activate_power_mode)) + script. + POWERMODE.colorful = #{theme.activate_power_mode.colorful}; + POWERMODE.shake = #{theme.activate_power_mode.shake}; + document.body.addEventListener('input', POWERMODE); + +//- 鼠標特效 +if theme.click_heart + script(src=url_for(theme.CDN.click_heart) async) + +if theme.ClickShowText && theme.ClickShowText.enable + script(src=url_for(theme.CDN.ClickShowText) async) diff --git a/layout/includes/math/index.pug b/layout/includes/third-party/math/index.pug similarity index 89% rename from layout/includes/math/index.pug rename to layout/includes/third-party/math/index.pug index 68b3416..4ce6692 100644 --- a/layout/includes/math/index.pug +++ b/layout/includes/third-party/math/index.pug @@ -13,3 +13,6 @@ if theme.katex && theme.katex.enable else if page.katex include ./katex.pug + +if theme.mermaid.enable + include ./mermaid.pug \ No newline at end of file diff --git a/layout/includes/math/katex.pug b/layout/includes/third-party/math/katex.pug similarity index 100% rename from layout/includes/math/katex.pug rename to layout/includes/third-party/math/katex.pug diff --git a/layout/includes/third-party/math/mathjax.pug b/layout/includes/third-party/math/mathjax.pug new file mode 100644 index 0000000..b2b0747 --- /dev/null +++ b/layout/includes/third-party/math/mathjax.pug @@ -0,0 +1,45 @@ +//- Mathjax 3 +//- http://docs.mathjax.org/en/latest/upgrading/v2.html#changes-in-the-mathjax-api +//- https://github.com/mathjax/MathJax/issues/2209 +//- http://docs.mathjax.org/en/latest/options/input/tex.html#the-configuration-block +//- http://docs.mathjax.org/en/latest/web/typeset.html#resetting-automatic-equation-numbering + +script. + if (!window.MathJax) { + window.MathJax = { + loader: { + source: { + '[tex]/amsCd': '[tex]/amscd' + } + }, + tex: { + inlineMath: [ ['$','$'], ["\\(","\\)"]], + tags: 'ams' + }, + options: { + renderActions: { + findScript: [10, doc => { + for (const node of document.querySelectorAll('script[type^="math/tex"]')) { + const display = !!node.type.match(/; *mode=display/) + const math = new doc.options.MathItem(node.textContent, doc.inputJax[0], display) + const text = document.createTextNode('') + node.parentNode.replaceChild(text, node) + math.start = {node: text, delim: '', n: 0} + math.end = {node: text, delim: '', n: 0} + doc.math.push(math) + } + }, ''] + } + } + } + + var script = document.createElement('script') + script.src = '!{theme.CDN.mathjax}' + script.id = 'MathJax-script' + script.async = true + document.head.appendChild(script) + } else { + MathJax.startup.document.state(0) + MathJax.texReset() + MathJax.typeset() + } \ No newline at end of file diff --git a/layout/includes/third-party/math/mermaid.pug b/layout/includes/third-party/math/mermaid.pug new file mode 100644 index 0000000..0d46012 --- /dev/null +++ b/layout/includes/third-party/math/mermaid.pug @@ -0,0 +1,15 @@ +script. + if (document.getElementsByClassName('mermaid').length) { + if (window.mermaidJsLoad) mermaid.init() + else { + $.getScript('!{theme.CDN.mermaid}', function () { + window.mermaidJsLoad = true + mermaid.initialize({ + theme: '!{theme.mermaid.theme}', + }) + !{theme.pjax} && mermaid.init() + }) + } + } + + diff --git a/layout/includes/third-party/pangu.pug b/layout/includes/third-party/pangu.pug index 8477369..229c69b 100644 --- a/layout/includes/third-party/pangu.pug +++ b/layout/includes/third-party/pangu.pug @@ -1,12 +1,19 @@ -script(src=url_for(theme.CDN.pangu)) -if theme.pangu.field === 'post' && is_post() - script. - document.addEventListener('DOMContentLoaded', function() { - pangu.autoSpacingPage() - }) -else if theme.pangu.field === 'site' - script. - document.addEventListener('DOMContentLoaded', function() { - pangu.autoSpacingPage() - }) +script. + function panguFn () { + if (typeof pangu === 'object') pangu.spacingElementById('content-inner') + else { + $.getScript('!{url_for(theme.CDN.pangu)}', () => { + pangu.spacingElementById('content-inner') + }) + } + } + function panguInit () { + if (!{theme.pangu.field === 'post'}){ + GLOBAL_CONFIG_SITE.isPost && panguFn() + } else { + panguFn() + } + } + + document.addEventListener('DOMContentLoaded', panguFn) diff --git a/layout/includes/third-party/pjax.pug b/layout/includes/third-party/pjax.pug new file mode 100644 index 0000000..b15b058 --- /dev/null +++ b/layout/includes/third-party/pjax.pug @@ -0,0 +1,56 @@ +script(src=url_for(theme.CDN.pjax)) +script. + var pjax = new Pjax({ + elements: 'a:not([target="_blank"])', + selectors: [ + 'title', + 'meta[name=description]', + '#config_change', + '#body-wrap', + '#rightside-config-hide', + '#rightside-config-show', + '.js-pjax' + ], + cacheBust: false, + }) + + document.addEventListener('pjax:complete', function () { + refreshFn() + + $('script[data-pjax]').each(function () { + $(this).parent().append($(this).remove()) + }) + + GLOBAL_CONFIG.islazyload && lazyLoadInstance.update() + + typeof chatBtnFn === 'function' && chatBtnFn() + typeof panguInit === 'function' && panguInit() + + if (typeof gtag === 'function') { + gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname}); + } + + typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting() + + }) + + document.addEventListener('pjax:send', function () { + if (window.aplayers) { + for (let i = 0; i < window.aplayers.length; i++) { + if (!window.aplayers[i].options.fixed) { + window.aplayers[i].destroy() + } + } + } + + typeof typed === 'object' && typed.destroy() + + $(window).off('scroll') + + //reset readmode + $('body').hasClass('read-mode') && $('body').removeClass('read-mode') + + //reset font-size + $('body').css('font-size') !== originFontSize && $('body').css('font-size', parseFloat(originFontSize)) + }) + diff --git a/layout/includes/search/algolia.pug b/layout/includes/third-party/search/algolia.pug similarity index 95% rename from layout/includes/search/algolia.pug rename to layout/includes/third-party/search/algolia.pug index 7041dc1..15cbb9d 100644 --- a/layout/includes/search/algolia.pug +++ b/layout/includes/third-party/search/algolia.pug @@ -9,4 +9,4 @@ #algolia-stats span.search-close-button i.fas.fa-times -.search-mask +#search-mask diff --git a/layout/includes/third-party/search/index.pug b/layout/includes/third-party/search/index.pug new file mode 100644 index 0000000..c1bd03a --- /dev/null +++ b/layout/includes/third-party/search/index.pug @@ -0,0 +1,4 @@ +if theme.algolia_search.enable + include ./algolia.pug +else if theme.local_search.enable + include ./local-search.pug \ No newline at end of file diff --git a/layout/includes/search/local-search.pug b/layout/includes/third-party/search/local-search.pug similarity index 98% rename from layout/includes/search/local-search.pug rename to layout/includes/third-party/search/local-search.pug index 74ca4c7..545d775 100644 --- a/layout/includes/search/local-search.pug +++ b/layout/includes/third-party/search/local-search.pug @@ -20,4 +20,4 @@ | #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search] span.search-close-button i.fas.fa-times -.search-mask \ No newline at end of file +#search-mask \ No newline at end of file diff --git a/layout/includes/share/add-this.pug b/layout/includes/third-party/share/add-this.pug similarity index 100% rename from layout/includes/share/add-this.pug rename to layout/includes/third-party/share/add-this.pug diff --git a/layout/includes/share/addtoany.pug b/layout/includes/third-party/share/addtoany.pug similarity index 100% rename from layout/includes/share/addtoany.pug rename to layout/includes/third-party/share/addtoany.pug diff --git a/layout/includes/third-party/share/index.pug b/layout/includes/third-party/share/index.pug new file mode 100644 index 0000000..41892a6 --- /dev/null +++ b/layout/includes/third-party/share/index.pug @@ -0,0 +1,7 @@ +.post_share + if theme.addThis.enable + !=partial('includes/third-party/share/add-this', {}, {cache:theme.fragment_cache}) + else if theme.sharejs.enable + include ./share-js.pug + else if theme.addtoany.enable + !=partial('includes/third-party/share/addtoany', {}, {cache:theme.fragment_cache}) diff --git a/layout/includes/third-party/share/share-js.pug b/layout/includes/third-party/share/share-js.pug new file mode 100644 index 0000000..538c905 --- /dev/null +++ b/layout/includes/third-party/share/share-js.pug @@ -0,0 +1,3 @@ +.social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites) +link(rel="stylesheet" href=url_for(theme.CDN.sharejs_css)) +script(src=url_for(theme.CDN.sharejs) defer) \ No newline at end of file diff --git a/layout/includes/third-party/subtitle.pug b/layout/includes/third-party/subtitle.pug new file mode 100644 index 0000000..05b95fc --- /dev/null +++ b/layout/includes/third-party/subtitle.pug @@ -0,0 +1,137 @@ +- var source = theme.subtitle.source +if source == '1' + script. + function subtitleType () { + $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) { + if (!{theme.subtitle.effect}) { + var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') + var both = sub.unshift(data.text) + typed = new Typed('#subtitle', { + strings: sub, + startDelay: 300, + typeSpeed: 150, + loop: !{theme.subtitle.loop}, + backSpeed: 50, + }) + } else { + document.getElementById('subtitle').innerHTML = data.text + } + }) + } + + if (!{theme.subtitle.effect}) { + if (typeof Typed === 'function') subtitleType() + else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType) + } else { + subtitleType() + } + +else if source == '2' + script. + function subtitleType () { + $.getJSON('https://v1.hitokoto.cn', function (data) { + if (!{theme.subtitle.effect}) { + var from = '出自 ' + data.from + var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') + var both = sub.unshift(data.hitokoto, from) + var typed = new Typed('#subtitle', { + strings: sub, + startDelay: 300, + typeSpeed: 150, + loop: !{theme.subtitle.loop}, + backSpeed: 50, + }) + } else { + document.getElementById('subtitle').innerHTML = data.hitokoto + } + }) + } + + if (!{theme.subtitle.effect}) { + if (typeof Typed === 'function') subtitleType() + else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType) + } else { + subtitleType() + } + +else if source == '3' + script. + function subtitleType () { + $.getScript('http://yijuzhan.com/api/word.php?m=js', function () { + var con = str[0] + if (!{theme.subtitle.effect}) { + var from = '出自 ' + str[1] + var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') + var both = sub.unshift(con, from) + var typed = new Typed('#subtitle', { + strings: sub, + startDelay: 300, + typeSpeed: 150, + loop: !{theme.subtitle.loop}, + backSpeed: 50, + }) + } else { + document.getElementById('subtitle').innerHTML = con + } + }) + } + + if (!{theme.subtitle.effect}) { + if (typeof Typed === 'function') subtitleType() + else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType) + } else { + subtitleType() + } + +else if source == '4' + script. + function subtitleType () { + $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () { + jinrishici.load(function (result) { + if (!{theme.subtitle.effect}) { + var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',') + var content = result.data.content + var both = sub.unshift(content) + var typed = new Typed('#subtitle', { + strings: sub, + startDelay: 300, + typeSpeed: 150, + loop: !{theme.subtitle.loop}, + backSpeed: 50, + }) + } else { + document.getElementById('subtitle').innerHTML = result.data.content + } + }) + }) + } + + if (!{theme.subtitle.effect}) { + if (typeof Typed === 'function') subtitleType() + else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType) + } else { + subtitleType() + } + +else + script. + function subtitleType () { + if (!{theme.subtitle.effect}) { + var typed = new Typed("#subtitle", { + strings: "!{theme.subtitle.sub}".split(","), + startDelay: 300, + typeSpeed: 150, + loop: !{theme.subtitle.loop}, + backSpeed: 50 + }) + } else { + document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}' + } + } + + if (!{theme.subtitle.effect}) { + if (typeof Typed === 'function') subtitleType() + else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType) + } else { + subtitleType() + } \ No newline at end of file diff --git a/layout/includes/widget/card_author.pug b/layout/includes/widget/card_author.pug index 95fea9d..57b69c3 100644 --- a/layout/includes/widget/card_author.pug +++ b/layout/includes/widget/card_author.pug @@ -1,7 +1,10 @@ .card-widget.card-info .card-content .card-info-avatar.is-center - img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar") + if theme.lazyload.enable + img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar") + else + img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar") .author-info__name= config.author .author-info__description!= theme.aside.card_author.description || config.description @@ -19,15 +22,14 @@ .length_num= site.tags.length if site.categories.length - .card-info-data-item.is-center + .card-info-data-item.is-center a(href=url_for(config.category_dir)) .headline= _p('aside.categories') .length_num= site.categories.length - .card-info-bookmark.is-center - button#bookmark-it.button--animated(title= _p('aside.card_bookmark')) - i.fas.fa-bookmark - span= _p('aside.card_bookmark') || 'Follow Me' + a#card-info-btn.button--animated(href=theme.aside.card_author.button.link) + i(class=theme.aside.card_author.button.icon) + span=theme.aside.card_author.button.text if(theme.social) .card-info-social-icons.is-center diff --git a/layout/includes/widget/card_recent_post.pug b/layout/includes/widget/card_recent_post.pug index 5995c45..1b5e9ba 100644 --- a/layout/includes/widget/card_recent_post.pug +++ b/layout/includes/widget/card_recent_post.pug @@ -4,23 +4,24 @@ i.fas.fa-history span= _p('aside.card_recent_post') .aside-recent-item - - var postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5 - - site.posts.sort('date', -1).limit(postLimit).each(function(article){ + - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5 + - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date' + - site.posts.sort(sort, -1).limit(postLimit).each(function(article){ .aside-recent-post - - var link = article.link || article.path - - var title = article.title || _p('no_title') - - var no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-aside-cover' : '' - - var post_cover = article.cover - - a(href=url_for(link)) - if post_cover && theme.cover.aside_enable - .aside-post-cover - if theme.lazyload.enable - img.aside-post-bg(data-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` title=title alt=title) - else - img.aside-post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` title=title alt=title) - .aside-post-title(class=no_cover) - .aside-post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title') - time.aside-post_meta.post-meta__date(title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)] - + - let link = article.link || article.path + - let title = article.title || _p('no_title') + - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-aside-cover' : '' + - let post_cover = article.cover + if post_cover && theme.cover.aside_enable + a.aside-post-cover(href=url_for(link) title=title) + if theme.lazyload.enable + img.aside-post-bg(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title) + else + img.aside-post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title) + .aside-post-info(class=no_cover) + a.aside-post-title(href=url_for(link) title=title)= title + if theme.aside.card_recent_post.sort === 'updated' + time.aside-post_meta.post-meta-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)] + else + time.aside-post_meta.post-meta-date(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)] - }) diff --git a/layout/page.pug b/layout/page.pug index ff3aa6f..099db09 100644 --- a/layout/page.pug +++ b/layout/page.pug @@ -8,8 +8,9 @@ block content span.tag-cloud__amount= site.tags.length .tag-cloud-tags !=cloudTags({source: site.tags, minfontsize: 15, maxfontsize: 30, limit: 0}) - if page.comments !== false - include includes/comments/index.pug + if page.comments !== false && theme.comments && theme.comments.use + - var commentsJsLoad = true + !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache}) else if page.type === 'link' include flink.pug else if page.type === 'categories' @@ -19,10 +20,15 @@ block content | - span.category__amount= site.categories.length div!= list_categories() - if page.comments !== false - include includes/comments/index.pug + if page.comments !== false && theme.comments && theme.comments.use + - var commentsJsLoad = true + !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache}) else #page + if theme.douban && theme.douban.meta + if (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict])) + meta(name="referrer" content="no-referrer") #article-container!= page.content - if page.comments !== false - include includes/comments/index.pug \ No newline at end of file + if page.comments !== false && theme.comments && theme.comments.use + - var commentsJsLoad = true + !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache}) \ No newline at end of file diff --git a/layout/post.pug b/layout/post.pug index 56b1859..aef16e0 100644 --- a/layout/post.pug +++ b/layout/post.pug @@ -9,7 +9,7 @@ block content .post-meta__tag-list each item, index in page.tags.data a(href=url_for(item.path)).post-meta__tags #[=item.name] - !=partial('includes/share/index', {}, {cache:theme.fragment_cache}) + include includes/third-party/share/index.pug if theme.reward.enable !=partial('includes/post/reward', {}, {cache:theme.fragment_cache}) @@ -21,5 +21,8 @@ block content include includes/pagination.pug if theme.related_post && theme.related_post.enable != related_posts(page,site.posts) - if page.comments !== false - include includes/comments/index.pug \ No newline at end of file + + if page.comments !== false && theme.comments && theme.comments.use + - var commentsJsLoad = true + !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache}) + \ No newline at end of file diff --git a/package.json b/package.json index 641ee07..baa77f4 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,32 @@ { "name": "hexo-theme-butterfly", - "version": "3.0.0-rc-1", - "private": true, - "engines": { - "node": ">=8.10.0" - }, + "version": "3.0.0-rc2", "description": "A Simple and Card UI Design theme for Hexo", + "main": "package.json", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, "keywords": [ "hexo", "theme", "butterfly", - "Card UI Design" + "Card UI Design", + "Jerry", + "hexo-theme-butterfly" ], - "repository": "https://github.com/jerryc127/hexo-theme-butterfly.git", + "repository": { + "type" : "git", + "url" : "https://github.com/jerryc127/hexo-theme-butterfly.git" + }, + "bugs": { + "url": "https://github.com/jerryc127/hexo-theme-butterfly/issues", + "email": "wong@jerryc.me" + }, + "dependencies": { + "hexo-renderer-marked": "^3.0.0", + "hexo-renderer-pug": "^1.0.0" + }, + "homepage": "https://demo.jerryc.me/", "author": "Jerry ", - "license": "MIT" -} \ No newline at end of file + "license": "Apache-2.0" +} diff --git a/scripts/filters/post_lazyload.js b/scripts/filters/post_lazyload.js index 3ae664c..b5cb3b1 100644 --- a/scripts/filters/post_lazyload.js +++ b/scripts/filters/post_lazyload.js @@ -1,23 +1,15 @@ /** * Butterfly * lazyload - * replace src to data-src + * replace src to data-lazy-src */ -//
'use strict' const urlFor = require('hexo-util').url_for.bind(hexo) -function lazyProcess (htmlContent) { - var bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs=' - return htmlContent.replace(/( { if (!hexo.theme.config.lazyload.enable) return - data.content = lazyProcess.call(this, data.content) - return data -} - -hexo.extend.filter.register('after_post_render', processPost) + const bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs=' + return data.content.replace(/( { @@ -35,19 +35,19 @@ hexo.extend.helper.register('aside_categories', function (categories, options) { const hierarchicalList = (t, level, parent, topparent = true) => { let result = '' - var isTopParent = topparent + const isTopParent = topparent if (t > 0) { prepareQuery(parent).forEach((cat, i) => { if (t > 0) { t = t - 1 let child if (!depth || level + 1 < depth) { - var childList = hierarchicalList(t, level + 1, cat._id, false) + const childList = hierarchicalList(t, level + 1, cat._id, false) child = childList[0] t = childList[1] } - var parentClass = isExpand && isTopParent && child ? 'parent' : '' + const parentClass = isExpand && isTopParent && child ? 'parent' : '' result += `
  • ` @@ -79,8 +79,8 @@ hexo.extend.helper.register('aside_categories', function (categories, options) { const list = hierarchicalList(limit, 0) - var moreButton = function () { - var moreHtml = '' + const moreButton = function () { + let moreHtml = '' if (categories.length <= limit) return '' moreHtml += '
  • ' moreHtml += ` diff --git a/scripts/helpers/page.js b/scripts/helpers/page.js index 74e7674..f827ccf 100644 --- a/scripts/helpers/page.js +++ b/scripts/helpers/page.js @@ -9,6 +9,7 @@ 'use strict' const { stripHTML, escapeHTML } = require('hexo-util') +const crypto = require('crypto') hexo.extend.helper.register('page_description', function () { const { config, page } = this @@ -25,7 +26,7 @@ hexo.extend.helper.register('page_description', function () { hexo.extend.helper.register('injectHtml', function (data) { let result = '' if (!data) return '' - for (var i = 0; i < data.length; i++) { + for (let i = 0; i < data.length; i++) { result += data[i] } return result @@ -41,8 +42,8 @@ hexo.extend.helper.register('cloudTags', function (options = {}) { let result = '' const tagLimit = limit === 0 ? source.length : limit source.sort('name').limit(tagLimit).forEach(function (tags) { - var fontSize = Math.floor(Math.random() * (maxfontsize - minfontsize) + minfontsize) + 'px' - var color = 'rgb(' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ')' // 0,0,0 -> 200,200,200 + const fontSize = Math.floor(Math.random() * (maxfontsize - minfontsize) + minfontsize) + 'px' + const 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 @@ -56,3 +57,7 @@ hexo.extend.helper.register('urlNoIndex', function () { } return url }) + +hexo.extend.helper.register('md5', function (path) { + return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex') +}) diff --git a/scripts/helpers/related_post.js b/scripts/helpers/related_post.js index 60c1e6c..4fa0c69 100644 --- a/scripts/helpers/related_post.js +++ b/scripts/helpers/related_post.js @@ -7,11 +7,11 @@ 'use strict' hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { - var relatedPosts = [] + let relatedPosts = [] currentPost.tags.forEach(function (tag) { allPosts.forEach(function (post) { if (isTagRelated(tag.name, post.tags)) { - var relatedPost = { + const relatedPost = { title: post.title, path: post.path, cover: post.cover, @@ -20,7 +20,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { updated: post.updated, created: post.date } - var index = findItem(relatedPosts, 'path', post.path) + const index = findItem(relatedPosts, 'path', post.path) if (index !== -1) { relatedPosts[index].weight += 1 } else { @@ -34,14 +34,14 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { if (relatedPosts.length === 0) { return '' } - var result = '' + let result = '' const hexoConfig = hexo.theme.config.rootConfig const config = hexo.theme.config - var limitNum = config.related_post.limit || 6 - var dateType = config.related_post.date_type || 'created' - var headlineLang = this._p('post.recommend') - var lazySrc = config.lazyload.enable ? 'data-src' : 'src' + const limitNum = config.related_post.limit || 6 + const dateType = config.related_post.date_type || 'created' + const headlineLang = this._p('post.recommend') + const lazySrc = config.lazyload.enable ? 'data-lazy-src' : 'src' relatedPosts = relatedPosts.sort(compare('weight')) @@ -54,8 +54,8 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { '' result += '
    ' - for (var i = 0; i < Math.min(relatedPosts.length, limitNum); i++) { - var cover = + for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) { + const cover = relatedPosts[i].cover === false ? relatedPosts[i].randomcover : relatedPosts[i].cover @@ -96,7 +96,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { }) function isTagRelated (tagName, TBDtags) { - var result = false + let result = false TBDtags.forEach(function (tag) { if (tagName === tag.name) { result = true @@ -106,7 +106,7 @@ function isTagRelated (tagName, TBDtags) { } function findItem (arrayToSearch, attr, val) { - for (var i = 0; i < arrayToSearch.length; i++) { + for (let i = 0; i < arrayToSearch.length; i++) { if (arrayToSearch[i][attr] === val) { return i } @@ -116,8 +116,8 @@ function findItem (arrayToSearch, attr, val) { function compare (attr) { return function (a, b) { - var val1 = a[attr] - var val2 = b[attr] + const val1 = a[attr] + const val2 = b[attr] return val2 - val1 } } diff --git a/scripts/tags/button.js b/scripts/tags/button.js index 8e7ea43..bb5a18a 100644 --- a/scripts/tags/button.js +++ b/scripts/tags/button.js @@ -11,17 +11,18 @@ const urlFor = require('hexo-util').url_for.bind(hexo) function btn (args) { args = args.join(' ').split(',') - var url = args[0] || '' - var text = args[1] || '' - var icon = args[2] || '' - var option = args[3] || '' + let url = args[0] || '' + let text = args[1] || '' + let icon = args[2] || '' + let option = args[3] || '' url = url.trim() text = text.trim() icon = icon.trim() option = option.trim() - return `${icon.length > 0 ? `` : ''} ${text} ` + return `${icon.length > 0 ? `` : ''}${text}` } hexo.extend.tag.register('btn', btn, { ends: false }) diff --git a/scripts/tags/gallery.js b/scripts/tags/gallery.js index ecefe6b..a285008 100644 --- a/scripts/tags/gallery.js +++ b/scripts/tags/gallery.js @@ -5,7 +5,7 @@ 'use strict' -const url_for = require('hexo-util').url_for.bind(hexo) +const urlFor = require('hexo-util').url_for.bind(hexo) function gallery (args, content) { return `
    ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')} @@ -15,8 +15,8 @@ function gallery (args, content) { function galleryGroup (args) { const name = args[0] const desrc = args[1] - const url = url_for(args[2]) - const img = url_for(args[3]) + const url = urlFor(args[2]) + const img = urlFor(args[3]) return `
    diff --git a/scripts/tags/hide.js b/scripts/tags/hide.js index c3c9361..5decb7e 100644 --- a/scripts/tags/hide.js +++ b/scripts/tags/hide.js @@ -18,42 +18,42 @@ function hideInline (args) { args = args.join(' ').split(',') - var content = args[0] - var display = args[1] || 'Click' - var bg = args[2] || false - var color = args[3] || false - var group = 'style="' + const content = args[0] + const display = args[1] || 'Click' + const bg = args[2] || false + const color = args[3] || false + let group = 'style="' if (bg) group += `background-color: ${bg};` if (color) group += `color: ${color}` group += '"' - return `${content}` } function hideBlock (args, content) { args = args.join(' ').split(',') - var display = args[0] || 'Click' - var bg = args[1] || false - var color = args[2] || false - var group = 'style="' + const display = args[0] || 'Click' + const bg = args[1] || false + const color = args[2] || false + let group = 'style="' if (bg) group += `background-color: ${bg};` if (color) group += `color: ${color}` group += '"' - return `
    ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
    ` } function hideToggle (args, content) { args = args.join(' ').split(',') - var display = args[0] - var bg = args[1] || false - var color = args[2] || false - var group = 'style="' - var border = '' + const display = args[0] + const bg = args[1] || false + const color = args[2] || false + let group = 'style="' + let border = '' if (bg) { border = `style="border: 1px solid ${bg}"` diff --git a/scripts/tags/tabs.js b/scripts/tags/tabs.js index c5db8fa..e71087e 100644 --- a/scripts/tags/tabs.js +++ b/scripts/tags/tabs.js @@ -44,10 +44,10 @@ function postTabs (args, content) { const icon = tabIcon.trim() tabIcon.length > 0 && (tabIcon = ``) - const toTop = '' + const toTop = '' const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : '' - tabNav += `
    • ` + tabNav += `
    • ` tabContent += `
    ${postContent + toTop}
    ` } diff --git a/source/css/_global/function.styl b/source/css/_global/function.styl index d793d45..2499d6a 100644 --- a/source/css/_global/function.styl +++ b/source/css/_global/function.styl @@ -16,3 +16,31 @@ font-family: 'Font Awesome 5 Free' text-rendering: auto -webkit-font-smoothing: antialiased + +[data-theme='light'] + --global-bg: $body-bg + --font-color: $font-black + --hr-border: lighten($theme-hr-color, 50%) + --hr-before-color: lighten($theme-hr-color, 30%) + --search-bg: $search-bg + --search-input-color: $search-input-color + --search-result-title: $search-result-title + --preloader-bg: $preloader-bg + --preloader-color: $preloader-word-color + --tab-border-color: $tab-border-color + --tab-botton-bg: $tab-botton-bg + --tab-botton-color: $tab-botton-color + --tab-button-hover-bg: $tab-button-hover-bg + --tab-button-active-bg: $tab-button-active-bg + --card-bg: $card-bg + --sidebar-bg: $sidebar-background + --btn-hover-color: $button-hover-color + --btn-color: $button-color + --btn-bg: $button-bg + --text-bg-hover: $text-bg-hover + --light-grey: $light-grey + --white: $white + --text-highlight-color: $text-highlight-color + --blockquote-color: $blockquote-color + --blockquote-bg: $blockquote-background-color + --reward-pop: $reward-pop-up-bg \ No newline at end of file diff --git a/source/css/_global/index.styl b/source/css/_global/index.styl index 5f0db29..4877bc4 100644 --- a/source/css/_global/index.styl +++ b/source/css/_global/index.styl @@ -5,8 +5,8 @@ html body position: relative min-height: 100% - background: $body-bg - color: $font-black + background: var(--global-bg) + color: var(--font-color) font-size: $font-size font-family: $font-family line-height: $text-line-height @@ -20,11 +20,14 @@ body height: 8px *::-webkit-scrollbar-thumb - background: $light-blue + background: var(--btn-bg) *::-webkit-scrollbar-track background-color: transparent +input::placeholder + color: var(--font-color) + #web_bg position: fixed z-index: -999 @@ -44,7 +47,7 @@ h5, h6 position: relative margin: 1rem 0 .7rem - color: lighten($font-color, 15%) + color: var(--text-highlight-color) font-weight: bold code @@ -53,19 +56,10 @@ h6 * box-sizing: border-box -#toggle-sidebar - position: fixed - bottom: $sidebar-icon-top - left: $sidebar-icon-left - z-index: 100 - font-size: $sidebar-icon-size - cursor: pointer - transition: all .2s - hr position: relative margin: 2rem auto - border: 2px dashed lighten($theme-hr-color, 50%) + border: 2px dashed var(--hr-border) if hexo-config('hr_icon.enable') width: calc(100% - 4px) @@ -79,7 +73,7 @@ hr top: $hr-icon-top left: 5% z-index: 1 - color: lighten($theme-hr-color, 30%) + color: var(--hr-before-color) content: $hr-icon font-size: 20px line-height: 1 @@ -103,7 +97,7 @@ table th, td padding: .3rem .6rem - border: 1px solid darken($light-grey, 10%) + border: 1px solid var(--light-grey) vertical-align: middle *::selection @@ -111,7 +105,6 @@ table color: #F7F7F7 button - margin: 0 padding: 0 outline: 0 border: none @@ -157,8 +150,9 @@ button float: right .button--animated - transition-duration: 1s - transition-property: color + position: relative + z-index: 1 + transition: color 1s &:before position: absolute @@ -167,11 +161,9 @@ button bottom: 0 left: 0 z-index: -1 - background: $theme-button-hover-color + background: var(--btn-hover-color) content: '' - transition-timing-function: ease-out - transition-duration: .5s - transition-property: transform + transition: transform .5s ease-out transform: scaleX(0) transform-origin: 0 50% @@ -186,16 +178,11 @@ img:not([src]) .img-alt margin: -.5rem 0 .5rem - color: $font-black + color: #858585 &:hover text-decoration: none !important -.comment_headling - margin-bottom: 10px - font-weight: 700 - font-size: 20px - .post-ad margin: 2rem 0 @@ -256,6 +243,14 @@ if hexo-config('avatar.effect') == true .sidebar-toc__content animation: tocsidebarRtoL .7s +#mobile-sidebar-menus + &.open + transform: translate3d(-100%, 0, 0) + + for i in 1 2 3 4 + > :nth-child({i}) + animation: sidebarItem (i / 5) s + @keyframes scroll-down-effect 0% top: 0 @@ -378,4 +373,4 @@ if hexo-config('avatar.effect') == true transform: translateX(-200px) 100% - transform: translateX(0) + transform: translateX(0) \ No newline at end of file diff --git a/source/css/_highlight/diff.styl b/source/css/_highlight/diff.styl index db787d4..6bb5106 100644 --- a/source/css/_highlight/diff.styl +++ b/source/css/_highlight/diff.styl @@ -1,73 +1,78 @@ // For diff highlight -pre .deletion - color: $highlight-deletion +figure.highlight + table + &::-webkit-scrollbar-thumb + background: $highlight-scrollbar -pre .addition - color: $highlight-addition + pre .deletion + color: $highlight-deletion -pre .meta - color: $highlight-purple + pre .addition + color: $highlight-addition -pre - .comment - color: $highlight-comment - - .variable, - .attribute, - .regexp, - .ruby .constant, - .xml .tag .title, - .xml .pi, - .xml .doctype, - .html .doctype, - .css .id, - .tag .name, - .css .class, - .css .pseudo - color: $highlight-red - - .tag - color: $highlight-aqua - - .number, - .preprocessor, - .literal, - .params, - .constant, - .command - color: $highlight-orange - - .built_in - color: $highlight-yellow - - .ruby .class .title, - .css .rules .attribute, - .string, - .value, - .inheritance, - .header, - .ruby .symbol, - .xml .cdata, - .special, - .number, - .formula - color: $highlight-green - - .keyword, - .title, - .css .hexcolor - color: $highlight-aqua - - .function, - .python .decorator, - .python .title, - .ruby .function .title, - .ruby .title .keyword, - .perl .sub, - .javascript .title, - .coffeescript .title - color: $highlight-blue - - .tag .attr, - .javascript .function + pre .meta color: $highlight-purple + + pre + .comment + color: $highlight-comment + + .variable, + .attribute, + .regexp, + .ruby .constant, + .xml .tag .title, + .xml .pi, + .xml .doctype, + .html .doctype, + .css .id, + .tag .name, + .css .class, + .css .pseudo + color: $highlight-red + + .tag + color: $highlight-aqua + + .number, + .preprocessor, + .literal, + .params, + .constant, + .command + color: $highlight-orange + + .built_in + color: $highlight-yellow + + .ruby .class .title, + .css .rules .attribute, + .string, + .value, + .inheritance, + .header, + .ruby .symbol, + .xml .cdata, + .special, + .number, + .formula + color: $highlight-green + + .keyword, + .title, + .css .hexcolor + color: $highlight-aqua + + .function, + .python .decorator, + .python .title, + .ruby .function .title, + .ruby .title .keyword, + .perl .sub, + .javascript .title, + .coffeescript .title + color: $highlight-blue + + .tag .attr, + .javascript .function + color: $highlight-purple diff --git a/source/css/_highlight/highlight.styl b/source/css/_highlight/highlight.styl index 809cdac..7635643 100644 --- a/source/css/_highlight/highlight.styl +++ b/source/css/_highlight/highlight.styl @@ -24,8 +24,8 @@ blockquote margin: 0 0 1rem padding: .1rem .8rem border-left: .2rem solid $blockquote-padding-color - background-color: $blockquote-background-color - color: $blockquote-color + background-color: var(--blockquote-bg) + color: var(--blockquote-color) a word-break: break-all @@ -123,9 +123,6 @@ blockquote padding-left: .5rem width: 100% - .line - height: 1rem - .highlight-tools position: relative overflow: hidden @@ -135,17 +132,19 @@ blockquote color: $highlight-tools.color font-size: 14px - .code-expand + &.closed + table + display: none + + .expand position: absolute padding: .4rem .7rem cursor: pointer - transition: all .3s - transform: rotate(0) + transition: transform .3s & + .code-lang left: 1.7rem - &.code-closed + &.closed transition: all .3s transform: rotate(-90deg) !important @@ -182,11 +181,11 @@ blockquote td border: none - if $highlight_theme == 'mac' + if $highlight_theme == 'mac' || ($highlight_theme == 'mac light') figure.highlight margin: 0 0 1.2rem border-radius: 7px - box-shadow: 0 5px 10px 0 rgba(0, 0, 0, .4) + box-shadow: 0 5px 10px 0 $highlight-mac-border -webkit-transform: translateZ(0) .highlight-tools @@ -201,10 +200,10 @@ blockquote box-shadow: 20px 0 #fdbc40, 40px 0 #35cd4b content: ' ' - .code-expand + .expand right: 0 - &.code-closed + &.closed transition: all .3s transform: rotate(90deg) !important @@ -216,9 +215,3 @@ blockquote .code-lang left: 3.8rem !important - -// when the page.highlight_shrink set to true -#body-wrap.code-close - figure.highlight - & > :not(.highlight-tools) - display: none diff --git a/source/css/_highlight/theme.styl b/source/css/_highlight/theme.styl index 2c4ae7c..2219861 100644 --- a/source/css/_highlight/theme.styl +++ b/source/css/_highlight/theme.styl @@ -23,6 +23,7 @@ if $highlight_theme == 'default' color: alpha($highlight-foreground, .8), bg-color: darken($highlight-background, 2) } + $highlight-scrollbar = darken($highlight-background, 6) if $highlight_theme == 'darker' || ($highlight_theme == 'mac') $highlight-background = #212121 @@ -39,6 +40,7 @@ if $highlight_theme == 'darker' || ($highlight_theme == 'mac') $highlight-purple = #C792EA $highlight-deletion = #BF42BF $highlight-addition = #105EDE + $highlight-mac-border = rgba(0, 0, 0, .4) $highlight-gutter = { color: alpha($highlight-foreground, .5), bg-color: $highlight-background @@ -47,6 +49,7 @@ if $highlight_theme == 'darker' || ($highlight_theme == 'mac') color: alpha($highlight-foreground, .8), bg-color: darken($highlight-background, 2) } + $highlight-scrollbar = darken($highlight-background, 6) if $highlight_theme == 'pale night' $highlight-background = #292D3E @@ -71,6 +74,7 @@ if $highlight_theme == 'pale night' color: $highlight-foreground, bg-color: darken($highlight-background, 2) } + $highlight-scrollbar = darken($highlight-background, 6) if $highlight_theme == 'ocean' $highlight-background = #0F111A @@ -95,8 +99,9 @@ if $highlight_theme == 'ocean' color: $highlight-foreground, bg-color: darken($highlight-background, 2) } + $highlight-scrollbar = darken($highlight-background, 5) -if $highlight_theme == 'light' +if $highlight_theme == 'light' || ($highlight_theme == 'mac light') $highlight-background = #F6F8FA $highlight-current-line = #00346e $highlight-selection = #80CBC440 @@ -111,6 +116,7 @@ if $highlight_theme == 'light' $highlight-purple = #7C4DFF $highlight-deletion = #BF42BF $highlight-addition = #105EDE + $highlight-mac-border = rgba(144, 164, 174, .4) $highlight-gutter = { color: alpha($highlight-foreground, .5), bg-color: $highlight-background @@ -119,6 +125,7 @@ if $highlight_theme == 'light' color: $highlight-foreground, bg-color: darken($highlight-background, 5) } + $highlight-scrollbar = darken($highlight-background, 8) if $highlight_theme == false $highlight-background = #F6F8FA diff --git a/source/css/_layout/404.styl b/source/css/_layout/404.styl index 9d2ce1f..17aaafe 100644 --- a/source/css/_layout/404.styl +++ b/source/css/_layout/404.styl @@ -17,7 +17,7 @@ if hexo-config('error_404.enable') margin: 0 1rem height: 18rem border-radius: 8px - background: #fff + background: var(--card-bg) box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06) @media screen and (max-width: 768px) @@ -30,7 +30,7 @@ if hexo-config('error_404.enable') height: 100% border-top-left-radius: 8px border-bottom-left-radius: 8px - background-color: #49b1f5 + background-color: $theme-color background-position: center background-size: cover @@ -53,7 +53,6 @@ if hexo-config('error_404.enable') .error_title margin-top: -4rem - color: $font-color font-size: 9em @media screen and (max-width: 768px) @@ -62,19 +61,16 @@ if hexo-config('error_404.enable') .error_subtitle @extend .limit-more-line margin-top: -3.5rem - color: $font-color word-break: break-word font-size: 1.6em -webkit-line-clamp: 2 a - position: relative - z-index: 1 display: inline-block margin-top: .5rem padding: .3rem 1.5rem - background: $theme-color - color: white + background: var(--btn-bg) + color: var(--btn-color) i padding-right: .3rem diff --git a/source/css/_layout/aside.styl b/source/css/_layout/aside.styl index f63945c..07847b7 100644 --- a/source/css/_layout/aside.styl +++ b/source/css/_layout/aside.styl @@ -7,7 +7,7 @@ .card-widget overflow: hidden border-radius: 8px - background: $card-bg + background: var(--card-bg) box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06) transition: all .3s @@ -44,12 +44,12 @@ a .headline @extend .limit-one-line - color: $font-black + color: var(--font-color) font-size: .7rem .length_num margin-top: -.3rem - color: $dark-black + color: var(--text-highlight-color) font-size: 1rem .card-info-social-icons @@ -57,7 +57,7 @@ .social-icon margin: 0 .5rem - color: $font-black + color: var(--font-color) font-size: 1rem cursor: pointer @@ -67,13 +67,11 @@ &:hover transform: rotate(540deg) - #bookmark-it - position: relative - z-index: 1 + #card-info-btn display: block - width: 100% - background-color: $light-blue - color: $button-color + background-color: var(--btn-bg) + color: var(--btn-color) + text-align: center line-height: 1.6rem span @@ -94,7 +92,7 @@ padding: 0 .1rem &:hover - color: $light-blue !important + color: $text-hover !important .card-recent-post .aside-recent-item @@ -103,46 +101,44 @@ & > .aside-recent-post margin-bottom: 10px - & > a - color: $font-black + .aside-post-cover + float: left + overflow: hidden + width: 66px + height: 66px - .aside-post-cover - float: left - overflow: hidden - width: 66px - height: 66px + .aside-post-bg + padding: 0 + max-width: 100% + width: 100% + height: 100% + transition: all .6s + object-fit: cover - .aside-post-bg - padding: 0 - max-width: 100% - width: 100% - height: 100% - transition: all .6s - object-fit: cover + &:hover + box-shadow: none + transform: scale(1.1) - &:hover - box-shadow: none - transform: scale(1.1) + .aside-post-info + .aside-post_meta + padding-left: 10px + color: $theme-meta-color + font-size: .6rem .aside-post-title - .aside-post_meta - padding-left: 10px - color: $theme-meta-color - font-size: .6rem + @extend .limit-more-line + padding-left: 10px + height: 40px + color: var(--font-color) + line-height: 1rem + -webkit-line-clamp: 2 - .aside-post_title - @extend .limit-more-line - padding-left: 10px - height: 40px - line-height: 1rem - -webkit-line-clamp: 2 + &:hover + color: $text-hover - &:hover - color: $light-blue !important - - &.no-aside-cover - .aside-post_title - height: auto + &.no-aside-cover + .aside-post-title + height: auto .card-archives ul.card-archive-list, .card-categories ul.card-category-list @@ -156,14 +152,15 @@ display: inline-block padding: .15rem 1rem width: 100% - color: $font-black + color: var(--font-color) transition: all .4s &:hover padding: .15rem .85rem - background-color: $light-blue + background-color: var(--text-bg-hover) span + @extend .limit-one-line display: inline-block vertical-align: bottom @@ -187,7 +184,7 @@ .card-categories .card-category-list &.child - padding: 0 0 0 1rem + padding: 0 0 0 .8rem > .parent .card-category-list @@ -195,18 +192,18 @@ width: 70% !important &-count - width: 18% + width: calc(100% - 70% - 20px) text-align: right - &-icon - float: right - margin-right: -.35rem - padding: .35rem - transition: transform .3s - transform: rotate(0) + i + float: right + margin-right: -.35rem + padding: .35rem + transition: transform .3s + transform: rotate(0) - &.expand - transform: rotate(-90deg) + &.expand + transform: rotate(-90deg) if hexo-config('aside.card_categories.expand') == false + .child diff --git a/source/css/_layout/category.styl b/source/css/_layout/category.styl index 2150343..1a7f82c 100644 --- a/source/css/_layout/category.styl +++ b/source/css/_layout/category.styl @@ -1,59 +1,25 @@ .category-content - ol, ul margin-top: .4rem - padding: 0 0 0 .8rem + padding: 0 0 0 1rem list-style: none counter-reset: li - p - margin: 0 - - ol, ul - padding-left: .5rem + padding-left: .2rem li position: relative margin: .3rem 0 - padding: .1rem .5rem .1rem 1.5rem !important - - &:hover - &:before - transform: rotate(360deg) + padding: .1rem .2rem .1rem 1rem &:before position: absolute - top: 0 left: 0 - background: $light-blue - color: $card-bg cursor: pointer transition: all .3s ease-out - - ol - li - &:before - margin-top: .2rem - width: w = 1.2rem - height: h = w - border-radius: .5 * w - content: counter(li) - counter-increment: li - text-align: center - font-size: .6rem - line-height: h - - ul - li - &:hover - &:before - border-color: $theme-button-hover-color - - &:before $w = .3rem top: 10px - margin-left: .45rem width: w = $w height: h = w border: .5 * w solid $light-blue @@ -61,3 +27,7 @@ background: transparent content: '' line-height: h + + &:hover + &:before + border-color: $pseudo-hover diff --git a/source/css/_layout/comments.styl b/source/css/_layout/comments.styl new file mode 100644 index 0000000..66ac5ce --- /dev/null +++ b/source/css/_layout/comments.styl @@ -0,0 +1,76 @@ +#post-comment + .comment-head + margin-bottom: 1rem + + .comment-headline + display: inline-block + vertical-align: middle + font-weight: 700 + font-size: 20px + + .comment-switch + display: inline-block + + if hexo-config('comments.text') + float: right + margin: .1rem auto 0 + padding: .2rem .8rem + width: max-content + border-radius: 8px + background: $comments-switch-bg + else + vertical-align: middle + + > span + display: none + + .first-comment + color: $comments-switch-first-text + + .second-comment + color: $comments-switch-second-text + + label + position: relative + display: inline-block + margin: 0 .4rem + width: 42px + height: 22px + vertical-align: sub + + input#switch-comments-btn + width: 0 + height: 0 + opacity: 0 + + &:checked + .slider + background-color: $comments-switch-second-text + + &:checked + .slider:before + transform: translateX(20px) + + .slider + position: absolute + top: 0 + right: 0 + bottom: 0 + left: 0 + border-radius: 34px + background-color: $comments-switch-first-text + cursor: pointer + transition: .4s + + &:before + position: absolute + bottom: 4px + left: 4px + width: 14px + height: 14px + border-radius: 50% + background-color: $comments-switch-round + content: '' + transition: .4s + + .comment-wrap + > div:nth-child(2) + display: none \ No newline at end of file diff --git a/source/css/_layout/flink.styl b/source/css/_layout/flink.styl index 5d40731..c93ddd0 100644 --- a/source/css/_layout/flink.styl +++ b/source/css/_layout/flink.styl @@ -11,12 +11,12 @@ position: relative float: left overflow: hidden - margin: 20px 7px + margin: 15px 7px width: calc(100% / 3 - 15px) height: 90px border-radius: 8px line-height: 17px - transform: perspective(1px) translateZ(0) + -webkit-transform: translateZ(0) @media screen and (max-width: 1100px) width: calc(50% - 15px) !important @@ -35,11 +35,9 @@ bottom: 0 left: 0 z-index: -1 - background: $light-blue + background: var(--text-bg-hover) content: '' - transition-timing-function: ease-out - transition-duration: .3s - transition-property: transform + transition: transform .3s ease-out transform: scale(0) &:hover:before, @@ -48,14 +46,14 @@ transform: scale(1) a - color: $font-color + color: var(--font-color) text-decoration: none img float: left - margin: 13px 0 0 10px - width: 65px - height: 65px + margin: 15px 10px + width: 60px + height: 60px border-radius: 35px transition: all .3s @@ -64,6 +62,7 @@ .flink-item-name @extend .limit-one-line + display: block padding: 16px 10px 0 0 height: 40px font-weight: bold @@ -71,6 +70,7 @@ .flink-item-desc @extend .limit-one-line - padding: 16px 10px + display: block + padding: 16px 10px 16px 0 height: 50px font-size: 13px diff --git a/source/css/_layout/footer.styl b/source/css/_layout/footer.styl index 23b7f4d..ee2e343 100644 --- a/source/css/_layout/footer.styl +++ b/source/css/_layout/footer.styl @@ -16,15 +16,13 @@ #footer-wrap position: relative padding: 2rem 1rem - color: $light-grey + color: var(--light-grey) text-align: center a - color: $light-grey - cursor: pointer + color: var(--light-grey) &:hover - color: $theme-color text-decoration: underline .footer-separator diff --git a/source/css/_layout/head.styl b/source/css/_layout/head.styl index d141cd0..c604396 100644 --- a/source/css/_layout/head.styl +++ b/source/css/_layout/head.styl @@ -22,27 +22,37 @@ #site_title, #site_subtitle, #scroll_down .scroll-down-effects - color: $light-grey text-align: center text-shadow: .1rem .1rem .2rem rgba(0, 0, 0, .15) line-height: 1.5 #site_title margin: 0 + color: var(--white) font-size: 1.3rem + @media screen and (min-width: $sm) + font-size: 2rem + #site_subtitle + color: var(--light-grey) font-size: .8rem + @media screen and (min-width: $sm) + font-size: 1.2rem + #site_social_icons display: none margin: 0 auto width: 15rem text-align: center + @media screen and (max-width: $sm) + display: block + .social-icon margin: 0 .5rem - color: $light-grey + color: var(--light-grey) text-shadow: .1rem .1rem .2rem rgba(0, 0, 0, .15) font-size: 1rem cursor: pointer @@ -56,22 +66,32 @@ .scroll-down-effects position: relative width: 100% + color: var(--light-grey) font-size: 30px // page &.not-index-bg height: 20rem + @media screen and (max-width: $sm) + height: 14rem + #page_site-info position: absolute top: 10rem padding: 0 .5rem width: 100% + @media screen and (max-width: $sm) + top: 7rem + // post &.post-bg height: 20rem + @media screen and (max-width: $sm) + height: 18rem + &:before position: absolute top: 0 @@ -87,43 +107,60 @@ bottom: 1.5rem padding: 0 8% width: 100% - color: $light-grey text-align: left + @media screen and (max-width: $sm) + bottom: 1.1rem + padding: 0 1.1rem + #post-title margin-bottom: .4rem font-size: 1.5rem + @media screen and (max-width: $sm) + font-size: 1.2rem + .posttitle @extend .limit-more-line + color: var(--white) line-height: 1.5 -webkit-line-clamp: 3 #post-meta + color: var(--light-grey) font-size: 95% - > .meta-secondline, - > .meta-thirdline - display: inline + @media screen and (min-width: $sm) + > .meta-secondline + > span:first-child + display: none - .word-count, - #busuanzi_value_page_pv, - .comment-count - padding-left: .2rem + @media screen and (max-width: $sm) + font-size: 90% + + > .meta-firstline, + > .meta-secondline + display: inline .post-meta - &__separator - margin: 0 .3rem + &-separator + margin: 0 .25rem - &__icon + &-icon margin-right: .2rem + &-label + if hexo-config('post_meta.post.label') + margin-right: .2rem + else + display: none + a - color: $light-grey + color: var(--light-grey) transition: all .3s ease-out &:hover - color: $light-blue + color: $text-hover text-decoration: underline // css hack @@ -145,6 +182,9 @@ _:future, opacity: 0 transition: all .5s + @media screen and (max-width: $sm) + padding: 10px .8rem + &:not(.fixed) .menus padding-right: 0 !important @@ -155,30 +195,30 @@ _:future, vertical-align: top &:hover - color: $white + color: var(--white) &.is-visible-inline .site-page font-size: inherit a - color: $light-grey + color: var(--light-grey) &:hover - color: $white + color: var(--white) &.fixed position: fixed top: -60px z-index: 91 - background: alpha($white, .8) + background: rgba(255, 255, 255, .8) box-shadow: 0 5px 6px -5px alpha($grey, .6) transition: transform .2s ease-in-out, opacity .2s ease-in-out a, #site-name, .toggle-menu - color: $font-black + color: var(--font-color) text-shadow: none &:hover @@ -188,9 +228,6 @@ _:future, transition: all .5s transform: translate3d(0, 100%, 0) - .menus_item_child - background-color: $white !important - #site-name text-shadow: .1rem .1rem .2rem rgba($dark-black, .15) font-weight: bold @@ -208,13 +245,12 @@ _:future, .menus_item_child display: block - .menus-expand + i.expand transform: rotate(180deg) !important - .menus-expand + i.expand padding: 4px - transition: all .3s - transform: rotate(0) + transition: transform .3s & > a &:after @@ -239,7 +275,7 @@ _:future, margin-top: 8px padding: 0 width: max-content - background-color: alpha($white, .8) + background-color: var(--sidebar-bg) box-shadow: 0 5px 20px -4px rgba($dark-black, .5) animation: sub_menus .3s .1s ease both @@ -255,13 +291,13 @@ _:future, list-style: none &:hover - background: $theme-color + background: var(--text-bg-hover) a display: inline-block padding: .3rem .7rem width: 100% - color: $font-black + color: var(--font-color) text-shadow: none #search_button @@ -273,54 +309,4 @@ _:future, padding-bottom: .3rem text-shadow: .05rem .05rem .1rem rgba($dark-black, .3) font-size: .7rem - cursor: pointer - -@media screen and (min-width: $sm) - #page-header - #site_title - font-size: 2rem - - #site_subtitle - font-size: 1.2rem - -@media screen and (max-width: $sm) - #nav - padding: 10px .8rem - - #page-header - #site_social_icons - display: block - - &.not-index-bg - height: 14rem - - #page_site-info - top: 7rem - - &.post-bg - height: 18rem - - & > #post-info - bottom: 1rem - padding: 0 5% - - & > #post-title - font-size: 1.2rem - - & > #post-meta - font-size: 90% - - .post-meta__categories - display: none - - .meta-thirdline - display: block - - .post-meta-pv-cv - .post-meta__separator:first-child - display: none - - if !hexo-config('busuanzi.page_pv') - .post-meta-commentcount - .post-meta__separator - display: none \ No newline at end of file + cursor: pointer \ No newline at end of file diff --git a/source/css/_layout/loadding.styl b/source/css/_layout/loading.styl similarity index 89% rename from source/css/_layout/loadding.styl rename to source/css/_layout/loading.styl index 6b4aa1d..3319a9a 100644 --- a/source/css/_layout/loadding.styl +++ b/source/css/_layout/loading.styl @@ -1,18 +1,18 @@ if hexo-config('preloader') - loading-bg() + .loading-bg position: fixed z-index: 1000 width: 50% height: 100% - background-color: $preloader-bg + background-color: var(--preloader-bg) transition: all .5s #loading-box .loading-left-bg - loading-bg() + @extend .loading-bg .loading-right-bg - loading-bg() + @extend .loading-bg right: 0 .spinner-box @@ -43,13 +43,13 @@ if hexo-config('preloader') .loading-word position: absolute - color: $white + color: var(--preloader-color) font-size: .8rem .configure-core width: 100% height: 100% - background-color: $preloader-bg + background-color: var(--preloader-bg) &.loaded .loading-left-bg diff --git a/source/css/_layout/mobile-sidebar.styl b/source/css/_layout/mobile-sidebar.styl index 2b50b8f..3a65f5d 100644 --- a/source/css/_layout/mobile-sidebar.styl +++ b/source/css/_layout/mobile-sidebar.styl @@ -16,7 +16,7 @@ overflow-y: auto width: 250px height: 100% - background: #f6f8fa + background: var(--sidebar-bg) transition: all .5s & > .mobile_author_icon @@ -46,12 +46,12 @@ @extend .limit-one-line .length_num - color: $dark-black + color: var(--text-highlight-color) font-size: .9rem .headline display: block - color: $font-black + color: var(--font-color) font-size: .7rem hr @@ -65,7 +65,7 @@ position: relative display: block padding: .3rem 1.5rem - color: $font-black + color: var(--font-color) font-size: .8rem cursor: pointer @@ -79,14 +79,13 @@ &:hover color: $light-blue - .menus-expand + .expand position: absolute right: 0 padding: .4rem - transition: all .3s - transform: rotate(0) + transition: transform .3s - &.menus-closed + &.closed transform: rotate(90deg) !important .menus_item_child diff --git a/source/css/_layout/page.styl b/source/css/_layout/page.styl index d049c36..e85f37b 100644 --- a/source/css/_layout/page.styl +++ b/source/css/_layout/page.styl @@ -19,7 +19,7 @@ padding: 0 height: 280px border-radius: 8px - background: $card-bg + background: var(--card-bg) box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06) transition: all .3s @@ -82,31 +82,34 @@ & > .article-title @extend .limit-more-line margin-bottom: .3rem - color: $font-black + color: var(--text-highlight-color) font-size: 1.2rem line-height: 1.4 transition: all .2s ease-in-out -webkit-line-clamp: 2 &:hover - color: $light-blue !important + color: $text-hover & > .article-meta-wrap - font-size: 85% + color: $theme-meta-color + font-size: 90% - & > time - color: $theme-meta-color + & > .post-meta-date cursor: default - & > .article-meta - color: $theme-meta-color - .sticky color: $sticky-color i margin: 0 .2rem 0 0 + .article-meta-label + if hexo-config('post_meta.page.label') + padding-right: .2rem + else + display: none + .article-meta__separator margin: 0 .3rem @@ -116,12 +119,11 @@ .fa-angle-right margin: 0 .2rem - a.article-meta__categories, - a.article-meta__tags + a color: $theme-meta-color &:hover - color: $light-blue !important + color: $text-hover text-decoration: underline & > .content @@ -138,7 +140,7 @@ transition: all .3s &:hover - color: $theme-button-hover-color !important + color: $text-hover !important transform: scale(1.1) &__title @@ -152,7 +154,7 @@ .layout_page > div:first-child:not(.recent-posts) padding: 50px 40px border-radius: 8px - background: $card-bg + background: var(--card-bg) box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06) transition: all .3s @@ -178,7 +180,7 @@ &:hover &:before - border-color: $theme-button-hover-color + border-color: $pseudo-hover &:before position: absolute @@ -189,7 +191,7 @@ height: h = w border: .5 * w solid $light-blue border-radius: w - background: $card-bg + background: var(--card-bg) content: '' line-height: h transition: all .2s ease-in-out @@ -213,7 +215,7 @@ &:hover &:before - border-color: $theme-button-hover-color + border-color: $pseudo-hover &:before $w = .3rem @@ -224,7 +226,7 @@ height: h = w border: .5 * w solid $light-blue border-radius: w - background: $card-bg + background: var(--card-bg) content: '' line-height: h transition: all .2s ease-in-out @@ -234,7 +236,7 @@ flex-direction: column justify-content: center - .article-sort-post + .article-sort-item-info padding: 0 width: 100% @@ -248,26 +250,34 @@ &:before top: .7rem - border-color: $theme-button-hover-color + border-color: $pseudo-hover - &__time - padding-left: .4rem - font-size: .7rem + &-time + color: $theme-meta-color + font-size: .9em - &__title + time + padding-left: .4rem + cursor: default + + &-title @extend .limit-more-line - color: $font-black - font-size: .75rem + color: var(--font-color) + font-size: 1.1em transition: all .3s -webkit-line-clamp: 2 &:hover - color: $light-blue !important + color: $text-hover transform: translateX(20px) - &__img + &-img + float: left + overflow: hidden + width: 80px + height: 80px + img - padding: 0 width: 100% height: 100% transition: all .6s @@ -276,22 +286,11 @@ &:hover transform: scale(1.1) - &__post - color: $theme-meta-color - - &:hover - color: $theme-meta-color - - &-img - float: left - overflow: hidden - width: 80px - height: 80px - - &-post - display: inline-block - padding: 0 1rem - width: calc(100% - 80px) + &-info + display: inline-block + overflow: hidden + padding: 0 1rem + width: calc(100% - 80px) .category-lists padding: 1rem 0 1.5rem @@ -302,9 +301,12 @@ .category-list a - color: $font-black + color: var(--font-color) cursor: pointer + &:hover + color: $text-hover + .category-list-count margin-left: .4rem color: $theme-meta-color diff --git a/source/css/_layout/pagination.styl b/source/css/_layout/pagination.styl index a7c1e28..978e13e 100644 --- a/source/css/_layout/pagination.styl +++ b/source/css/_layout/pagination.styl @@ -17,7 +17,7 @@ &.current background: $theme-paginator-color - color: $button-color + color: var(--white) cursor: default img.prev-cover, @@ -39,7 +39,7 @@ .prev_info, .next_info @extend .limit-one-line - color: $button-color + color: var(--white) font-weight: 500 .next-post @@ -51,7 +51,7 @@ .prev-post .label, .next-post .label - color: alpha($white, .9) + color: var(--light-grey) text-transform: uppercase font-size: 90% diff --git a/source/css/_layout/post.styl b/source/css/_layout/post.styl index 2b3ab7c..3c49bd3 100644 --- a/source/css/_layout/post.styl +++ b/source/css/_layout/post.styl @@ -18,7 +18,6 @@ beautify() h4, h5, h6 - cursor: pointer transition: all .2s ease-out &:before @@ -59,18 +58,23 @@ beautify() list-style: none counter-reset: li + @media screen and (max-width: $sm) + padding: 0 0 0 .4rem + p margin: 0 0 .5rem ol, ul - padding-left: .5rem + padding-left: .6rem + + @media screen and (max-width: $sm) + padding-left: .2rem li &:not(.tab) position: relative margin: .2rem 0 - padding: .1rem .5rem .1rem 1.5rem &:hover &:before @@ -81,15 +85,18 @@ beautify() top: 0 left: 0 background: $light-blue - color: $card-bg + color: $white cursor: pointer transition: all .3s ease-out ol > li + &:not(.tab) + padding: .1rem .2rem .1rem 1.4rem + &:before - margin-top: .2rem - width: w = 1.2rem + margin-top: .3rem + width: w = 1rem height: h = w border-radius: .5 * w content: counter(li) @@ -100,14 +107,15 @@ beautify() ul > li:not(.tab) + padding: .1rem .2rem .1rem 1rem + &:hover &:before - border-color: $theme-button-hover-color + border-color: $pseudo-hover &:before $w = .3rem top: 10px - margin-left: .45rem width: w = $w height: h = w border: .5 * w solid $light-blue @@ -202,7 +210,7 @@ img &:hover background: $light-blue - color: $button-color + color: var(--white) .post_share display: inline-block @@ -224,7 +232,7 @@ img position: relative margin: 2rem 0 .5rem padding: .5rem .8rem - border: 1px solid $light-grey + border: 1px solid var(--light-grey) transition: box-shadow .3s ease-in-out &:before @@ -244,7 +252,7 @@ img width: w = .4rem height: w border-radius: w - background: $white + background: var(--card-bg) content: '' &:hover @@ -284,6 +292,27 @@ img iframe margin: 0 0 1rem + .post-outdate-notice + position: relative + margin: 0 0 1rem + padding: .5rem 1.2rem + border-radius: 3px + background-color: $noticeOutdate-bg + color: $noticeOutdate-color + + if hexo-config('noticeOutdate.style') == 'flat' + padding: .5rem 1.2rem .5rem 1.8rem + border-left: 5px solid $noticeOutdate-border + + &:before + @extend .fontawesomeIcon + position: absolute + top: 50% + left: 1em + color: $noticeOutdate-border + content: '\f071' + transform: translateY(-50%) + @media screen and (max-width: 1024px) .layout_post width: auto diff --git a/source/css/_layout/relatedposts.styl b/source/css/_layout/relatedposts.styl index fbdbf02..a80c07d 100644 --- a/source/css/_layout/relatedposts.styl +++ b/source/css/_layout/relatedposts.styl @@ -41,13 +41,13 @@ top: 50% padding: 0 1rem width: 100% - color: $white transform: translate(0, -50%) .relatedPosts_date - color: $light-grey + color: var(--light-grey) font-size: 90% .relatedPosts_title @extend .limit-more-line + color: var(--white) -webkit-line-clamp: 2 diff --git a/source/css/_layout/reward.styl b/source/css/_layout/reward.styl index 0e0eca0..b5d5717 100644 --- a/source/css/_layout/reward.styl +++ b/source/css/_layout/reward.styl @@ -5,13 +5,15 @@ text-align: center .reward-button - padding: .5rem 1.2rem - background: $light-blue - color: $button-color + display: inline-block + padding: .2rem 1.2rem + background: var(--btn-bg) + color: var(--btn-color) + cursor: pointer transition: all .4s &:hover - box-shadow: inset 9em 0 0 0 $theme-button-hover-color + box-shadow: inset 9em 0 0 0 var(--btn-hover-color) .reward-main display: block @@ -30,7 +32,7 @@ margin: 0 padding: 1rem .5rem border-radius: 4px - background: $reward-pop-up-bg + background: var(--reward-pop) &:before position: absolute @@ -48,7 +50,7 @@ margin: 0 auto width: 0 height: 0 - border-top: 13px solid $reward-pop-up-bg + border-top: 13px solid var(--reward-pop) border-right: 13px solid transparent border-left: 13px solid transparent content: '' @@ -63,9 +65,7 @@ width: 130px height: 130px - .post-qr-code__desc + .post-qr-code-desc padding-top: .4rem width: 130px color: $reward-pop-up-color - text-align: center - word-break: break-all diff --git a/source/css/_layout/rightside.styl b/source/css/_layout/rightside.styl index 4693169..33a586e 100644 --- a/source/css/_layout/rightside.styl +++ b/source/css/_layout/rightside.styl @@ -7,14 +7,11 @@ transition: all .5s #rightside-config-hide + transition: transform .4s transform: translate(35px, 0) - .rightside-in - transform: translate(0, 0) !important - animation: rightsideIn .3s - - .rightside-out - animation: rightsideOut .3s + &.show + transform: translate(0, 0) !important & > div & > button, @@ -23,14 +20,14 @@ margin-bottom: 2px width: 30px height: 30px - background-color: $light-blue - color: $button-color + background-color: var(--btn-bg) + color: var(--btn-color) text-align: center font-size: 16px cursor: pointer &:hover - background-color: $theme-button-hover-color + background-color: var(--btn-hover-color) #rightside_config i @@ -41,17 +38,3 @@ @media screen and (max-width: $bg) display: block - -@keyframes rightsideIn - 0% - transform: translate(30px, 0) - - 100% - transform: translate(0, 0) - -@keyframes rightsideOut - 0% - transform: translate(0, 0) - - 100% - transform: translate(30px, 0) diff --git a/source/css/_layout/sidebar.styl b/source/css/_layout/sidebar.styl index 823d203..adc965f 100644 --- a/source/css/_layout/sidebar.styl +++ b/source/css/_layout/sidebar.styl @@ -1,3 +1,15 @@ +#toggle-sidebar + position: fixed + bottom: $sidebar-icon-top + left: $sidebar-icon-left + z-index: 100 + font-size: $sidebar-icon-size + cursor: pointer + transition: all .2s + + @media screen and (max-width: $bg) + display: none + #sidebar position: fixed top: 0 @@ -6,10 +18,21 @@ padding: 1rem 0 2rem .5rem width: $sidebar-width height: 100% - background: $sidebar-background - box-shadow: -.25rem 0 .25rem rgba($sidebar-background, .6) inset + background: var(--sidebar-bg) opacity: .9 + @media screen and (max-width: $bg) + right: -($mobile-sidebar-width) + left: auto + z-index: 103 + width: $mobile-sidebar-width + box-shadow: none + opacity: 1 + transition: all .4s + + .toc-child + display: block !important + .sidebar-toc ol, li @@ -56,19 +79,4 @@ &-bar width: 0 height: 1px - background: $theme-toc-color - -@media screen and (max-width: $bg) - i#toggle-sidebar - display: none - - #sidebar - right: -($mobile-sidebar-width) - left: auto - z-index: 103 - width: $mobile-sidebar-width - opacity: 1 - transition: all .4s - - .toc-child - display: block !important \ No newline at end of file + background: $theme-toc-color \ No newline at end of file diff --git a/source/css/_layout/third-party.styl b/source/css/_layout/third-party.styl index b31f940..80610f9 100644 --- a/source/css/_layout/third-party.styl +++ b/source/css/_layout/third-party.styl @@ -1,55 +1,27 @@ -if hexo-config('valine.enable') - #vcomment - button - padding: .3rem .8rem - border-color: $button-color - background-color: $light-blue - color: $button-color - font-size: .7rem - transition: all .3s +#vcomment + .vbtn + border: none + background: var(--btn-bg) + color: var(--btn-color) - &:hover - background-color: $theme-button-hover-color + &:hover + background: var(--btn-hover-color) - if hexo-config('valine.bg') - textarea - background: url(hexo-config('valine.bg')) 100% 100% no-repeat + if hexo-config('valine.bg') + textarea + background: url(hexo-config('valine.bg')) 100% 100% no-repeat - .vimg - transition: all .3s + .vimg + transition: all .3s - &:hover - transform: rotate(360deg) + &:hover + transform: rotate(360deg) - .vat - padding: 0 .8rem - border: 1px solid $light-blue - border-radius: 5px - color: $light-blue - font-size: .7125rem - transition: all .3s + .vcards .vcard .vcontent.expand + &:before, + &:after + z-index: 22 - &:hover - background-color: $light-blue - color: $button-color - -if hexo-config('beautify.enable') - #article-container - .aplayer - ol, - ul - margin: 0 - padding: 0 - - li - margin: 0 - padding: 0 15px - - &:before - content: none - -// third-party -// fireworks .fireworks position: fixed top: 0 @@ -75,18 +47,39 @@ if hexo-config('beautify.enable') &[data-processed] opacity: 1 -.utterances - max-width: 100% +.utterances, +.fb-comments iframe + width: 100% !important #gitalk-container .gt-meta margin: 0 0 .8em padding: .3rem 0 .8em -.has-jax - overflow: auto +// mathjax +mjx-container[jax='CHTML'][display='true'] + overflow-x: auto + overflow-y: hidden + padding-bottom: .5rem + outline: 0 + line-height: 2 + +.aplayer + color: $font-black -//aplayer #article-container .aplayer - margin: 0 0 1rem \ No newline at end of file + margin: 0 0 1rem + + if hexo-config('beautify.enable') + ol, + ul + margin: 0 + padding: 0 + + li + margin: 0 + padding: 0 15px + + &:before + content: none \ No newline at end of file diff --git a/source/css/_mode/darkmode.styl b/source/css/_mode/darkmode.styl index 7b9ab69..48adae7 100644 --- a/source/css/_mode/darkmode.styl +++ b/source/css/_mode/darkmode.styl @@ -1,11 +1,31 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark' [data-theme='dark'] - body - background-color: darken(#121212, 2) - color: alpha(#FFFFFF, .6) - - ::-webkit-scrollbar-thumb - background: lighten(#121212, 5) + --global-bg: darken(#121212, 2) + --font-color: alpha(#FFFFFF, .6) + --hr-border: alpha(#FFFFFF, .3) + --hr-before-color: alpha(#FFFFFF, .6) + --search-bg: #121212 + --search-input-color: alpha(#FFFFFF, .6) + --search-result-title: alpha(#FFFFFF, .8) + --preloader-bg: darken(#121212, 2) + --preloader-color: alpha(#FFFFFF, .6) + --tab-border-color: #2c2c2c + --tab-botton-bg: #2c2c2c + --tab-botton-color: alpha(#FFFFFF, .6) + --tab-button-hover-bg: lighten(#121212, 15) + --tab-button-active-bg: #121212 + --card-bg: #121212 + --sidebar-bg: #121212 + --btn-hover-color: lighten(#121212, 40) + --btn-color: alpha(#FFFFFF, .6) + --btn-bg: lighten(#121212, 5) + --text-bg-hover: lighten(#121212, 15) + --light-grey: alpha(#FFFFFF, .6) + --white: alpha(#FFFFFF, .8) + --text-highlight-color: alpha(#FFFFFF, .8) + --blockquote-color: alpha(#FFFFFF, .6) + --blockquote-bg: lighten(#121212, 10) + --reward-pop: lighten(#121212, 10) // 網站背景，footer背景 #web_bg[data-type=color], @@ -20,63 +40,29 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark' background-color: alpha($dark-black, .7) content: '' - #page-header, - .layout_post > #post, - .layout_page > div:first-child:not(.recent-posts) + #page-header background-color: #121212 - #sidebar - background: #121212 - box-shadow: -.25rem 0 .25rem #121212 - #article-container code background: #2c2c2c - .recent-posts - .recent-post-item - background: #121212 !important - - .article-title - color: alpha(#FFFFFF, .8) !important - // 頭部 #page-header &:before position: absolute top: 0 - right: 0 - bottom: 0 left: 0 + display: block + width: 100% + height: 100% background-color: alpha($dark-black, .7) content: '' & > #nav - a - color: alpha(#FFFFFF, .8) !important - &.fixed background: alpha(#121212, .8) box-shadow: 0 5px 6px -5px rgba(133, 133, 133, 0) - .toggle-menu, - #site-name, - a - color: alpha(#FFFFFF, .8) - - .menus_item_child - background-color: lighten(#121212, 5) !important - - li - &:hover - background: lighten(#121212, 20) !important - - a - color: alpha(#FFFFFF, .8) - - #site_subtitle - & > span - color: alpha(#FFFFFF, .6) - // 代碼框 #article-container pre, @@ -85,223 +71,45 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark' color: alpha(#FFFFFF, .6) !important figure.highlight + box-shadow: none + + table::-webkit-scrollbar-thumb + background: lighten(#121212, 5) + .line:before color: alpha(#FFFFFF, .6) !important - .gutter pre - background-color: lighten(#121212, 2) !important - .hljs background-color: lighten(#121212, 2) !important - .highlight-tools - background: lighten(#121212, 3) !important - color: #90a4ae !important + .highlight-tools + background: lighten(#121212, 3) !important + color: #90a4ae !important - blockquote - background-color: lighten(#121212, 10) - color: alpha(#FFFFFF, .6) + #post-comment + .comment-switch + if hexo-config('comments.text') + background: #2c2c2c !important - hr - border: 2px dashed alpha(#FFFFFF, .3) - background: 0 - - &:before - color: alpha(#FFFFFF, .6) - - .layout_post .tag_share .post-meta__tags - border: 1px solid alpha(#FFFFFF, .6) - color: alpha(#FFFFFF, .6) - - &:hover - background: darken(#FFFFFF, 60) - - // 文章版權 - .post-copyright - border: 1px solid alpha(#FFFFFF, .6) - - .post-copyright-meta - color: alpha(#FFFFFF, .8) - - .post-copyright-info - color: alpha(#FFFFFF, .6) - - &:after - background: #121212 - - // 音樂播放器 - .aplayer - filter: brightness(.7) - color: $dark-black - - // 右下角按鈕 - #rightside - & > div - & > button, - & > a - background-color: lighten(#121212, 5) - color: alpha(#FFFFFF, .6) - - &:hover - background: lighten(#121212, 20) - - // 打賞按鈕 - .post-reward - .reward-button - background-color: lighten(#121212, 10) !important - - .reward-all - background-color: lighten(#121212, 10) !important - - &:after - border-top: 13px solid lighten(#121212, 10) !important - - .flink-list-item:before, - .card-category-list-item a:hover, - .card-archive-list-item a:hover, - #bookmark-it - background-color: lighten(#121212, 10) !important - - img, - .gist - filter: brightness(.7) - - #article-container iframe - filter: brightness(.7) - - // 側邊欄 - #aside_content - .card-widget - background: #121212 !important - - .headline, - .length_num, - .aside-post_title, - .card-category-list-link, - .card-archive-list-link, - .social-icon, - .card-category-list-link-more, - .card-archive-list-link-more - color: alpha(#FFFFFF, .6) !important - - .button--animated:before - background: lighten(#121212, 20) - - #post-meta, - #post-meta a, - #footer-wrap, - #footer-wrap a, - .img-alt - color: alpha(#FFFFFF, .6) !important - - .posttitle, - h1, - h2, - h3, - h4, - h5, - h6 - color: alpha(#FFFFFF, .8) - - .recent-posts .post-meta__date, - .recent-posts .article-meta, - .recent-posts a, - .post-reward .reward-button, - .copy-button, - .gutter pre, - #bookmark-it, - .copy-notice, - .flink-list-item a, - .category-list-link, - .relatedPosts_date, - .prev-post .label, - .next-post .label - color: alpha(#FFFFFF, .6) !important - - .prev_info, - .next_info, - .relatedPosts_title - color: alpha(#FFFFFF, .8) !important - - // 時間軸界面 - .article-sort - &-item__title - color: alpha(#FFFFFF, .6) - - &-item:before, - &-title:before - background: #121212 - - // 手機 MENU,TOC - #mobile-sidebar - #mobile-sidebar-menus - background: #121212 - - .headline - color: alpha(#FFFFFF, .6) !important - - .length_num - color: alpha(#FFFFFF, .8) !important - - a - color: alpha(#FFFFFF, .6) !important - - // error 404 - #error-wrap - .error-content - background: #121212 - - .error-img + label filter: brightness(.7) - .error-info - .error_title - color: alpha(#FFFFFF, .8) - - .error_subtitle - color: alpha(#FFFFFF, .6) - - a - background: #2c2c2c - // note - if hexo-config('note.style') == 'modern' + if hexo-config('note.style') == 'modern' || hexo-config('note.style') == 'flat' .note filter: brightness(.7) - if hexo-config('note.style') == 'flat' - .note - filter: brightness(.7) - color: #4c4948 - // hide-tags .hide-button, - .btn-beautify - filter: brightness(.8) - - // tabs - #article-container - .tabs - border: 2px solid #2c2c2c - border-top: none - - > .nav-tabs - background: #2c2c2c - - button - border-top: 2px solid #2c2c2c - background: #2c2c2c - color: alpha(#FFFFFF, .6) - - .tab:not(.active) - button - &:hover - border-top: 2px solid lighten(#121212, 20) - background: lighten(#121212, 20) - - .active - button - background: #121212 + .btn-beautify, + .mermaid, + .post-outdate-notice, + .error-img, + #article-container iframe, + img, + .gist, + .aplayer + filter: brightness(.7) // 第三方 // 插件 hexo-blog-encrypt @@ -313,81 +121,29 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark' input background-color: #121212 - .mermaid - filter: brightness(.7) + // Gitalk + #gitalk-container + filter: brightness(.8) - if hexo-config('gitalk') && hexo-config('gitalk.enable') - #gitalk-container - .gt-header-textarea, - .gt-header-preview, - .gt-comment-content, - button, - .gt-popup - filter: brightness(.7) + svg + fill: alpha(#FFFFFF, .8) !important - svg - fill: alpha(#FFFFFF, .6) !important - - if hexo-config('valine') && hexo-config('valine.enable') - #vcomment - .vbtn, - .vat - border: 1px solid alpha(#FFFFFF, .6) - background: #121212 !important - color: alpha(#FFFFFF, .6) !important - - &:hover - background: lighten(#121212, 20) !important - - if hexo-config('local_search') && hexo-config('local_search.enable') - #local-search - background: #121212 - - .local-search-box--input - background: #121212 + // Disqus and Disqusjs + #disqus_thread + #dsqjs + .dsqjs-tab-active, + .dsqjs-no-comment color: alpha(#FFFFFF, .6) - .search-result-title + .dsqjs-order-label + background-color: lighten(#121212, 5) + + .dsqjs-post-body color: alpha(#FFFFFF, .6) - if hexo-config('algolia_search.enable') - #algolia-search - background: #121212 + code, + pre + background: #2c2c2c - .ais-search-box--input - background: #121212 - color: alpha(#FFFFFF, .6) - - #algolia-search-results - .algolia-hit-item-link + blockquote color: alpha(#FFFFFF, .6) - - if hexo-config('disqusjs.enable') - #disqus_thread - #dsqjs - .dsqjs-tab-active, - .dsqjs-no-comment - color: alpha(#FFFFFF, .6) - - .dsqjs-order-label - background-color: lighten(#121212, 5) - - .dsqjs-post-body - color: alpha(#FFFFFF, .6) - - code, - pre - background: #2c2c2c - - blockquote - color: alpha(#FFFFFF, .6) - - if hexo-config('preloader') - #loading-box - .loading-left-bg, - .loading-right-bg, - .configure-core - background-color: darken(#121212, 2) - - .loading-word - color: alpha(#FFFFFF, .6) diff --git a/source/css/_mode/readmode.styl b/source/css/_mode/readmode.styl index c39cea6..d0da99a 100644 --- a/source/css/_mode/readmode.styl +++ b/source/css/_mode/readmode.styl @@ -1,149 +1,29 @@ if hexo-config('readmode') [data-theme='light'] - $light-redmode-bg = #fff - .read-mode - background: $light-redmode-bg - - #page-header.post-bg - a - color: $font-black !important - - #article-container - pre, - .highlight:not(.js-file-line-container) - background: #f7f7f7 !important - - * - color: $font-black !important - - figure.highlight - .line:before - color: $font-black !important - - .hljs - background: #f7f7f7 !important - - code - color: #4c4948 - - blockquote - border-left: .2rem solid #ddd - background-color: $light-redmode-bg - - ol, - li - &:before - background: $light-redmode-bg - color: #4c4948 - - ul - >li - &:before - border: .2rem solid #90a4ae - - hr - border: 2px dashed #d6dbdf - background: $light-redmode-bg - - &:before - color: darken(#d6dbdf, 10) - - .hide-toggle - border: 1px solid darken(#d6dbdf, 10) !important - - .hide-button, - .btn-beautify - background: $light-redmode-bg !important - color: #4c4948 !important - - .btn-beautify - border: 1px solid darken(#d6dbdf, 10) - - &.button--animated:before - background: $light-redmode-bg - - .hide-inline, - .hide-block - & >.hide-button - border: 1px solid darken(#d6dbdf, 10) - - & > .button--animated:before - background: $light-redmode-bg - - .note - border: 2px solid #eee - background-color: $light-redmode-bg - - .tabs - border: 1px solid darken(#d6dbdf, 10) - - #rightside button - background: darken(#d6dbdf, 20) !important + --font-color: #4c4948 + --readmode-light-color: #fff + --white: #4c4948 + --light-grey: #4c4948 + --gray: #d6dbdf + --hr-border: #d6dbdf + --hr-before-color: darken(#d6dbdf, 10) + -highlight-bg: #f7f7f7 [data-theme='dark'] - $dark-readmode-bg = #0d0d0d - .read-mode - background: $dark-readmode-bg - - #article-container - pre, - .highlight:not(.js-file-line-container) - * - color: rgba(255, 255, 255, .6) !important - - code - color: rgba(255, 255, 255, .6) - - blockquote - border-left: .2rem solid rgba(255, 255, 255, .6) - background-color: $dark-readmode-bg - - ol, - li - &:before - background: $dark-readmode-bg - color: rgba(255, 255, 255, .6) - - ul - >li - &:before - border: .15rem solid rgba(255, 255, 255, .6) - - .hide-toggle - border: 1px solid rgba(255, 255, 255, .6) !important - - .hide-button, - .btn-beautify - background: $dark-readmode-bg !important - filter: none - color: rgba(255, 255, 255, .6) !important - - .btn-beautify - border: 1px solid rgba(255, 255, 255, .6) - - &.button--animated:before - background: $dark-readmode-bg !important - - .hide-inline, - .hide-block - & >.hide-button - border: 1px solid rgba(255, 255, 255, .6) - - & > .button--animated:before - background: $dark-readmode-bg !important - - .note - border: 2px solid rgba(255, 255, 255, .6) - filter: none - background-color: $dark-readmode-bg - color: rgba(255, 255, 255, .6) - - .tabs - border: 2px solid rgba(255, 255, 255, .6) + --font-color: rgba(255, 255, 255, .6) + --readmode-light-color: #0d0d0d + --white: rgba(255, 255, 255, .8) + --light-grey: rgba(255, 255, 255, .6) + --gray: rgba(255, 255, 255, .6) + --hr-border: rgba(255, 255, 255, .3) + --hr-before-color: rgba(255, 255, 255, .6) + -highlight-bg: #171717 .read-mode + background: var(--readmode-light-color) + #body-wrap padding-left: 0 !important @@ -151,15 +31,11 @@ if hexo-config('readmode') background-color: transparent background-image: none !important - a - text-shadow: none !important - &:before opacity: 0 & > #post-info padding: 0 - color: $font-black text-align: center .layout_post @@ -170,13 +46,6 @@ if hexo-config('readmode') &:hover box-shadow: none - figure.highlight - border-radius: 0 !important - box-shadow: none !important - - & > :not(.highlight-tools) - display: block !important - & > canvas display: none !important @@ -187,11 +56,10 @@ if hexo-config('readmode') #sidebar, #toggle-sidebar, #mobile-toc-button, - #nav - display: none !important - + #nav, + .post-outdate-notice, #web_bg - background: none + display: none !important if !hexo-config('chat_btn') #chatra, @@ -203,6 +71,29 @@ if hexo-config('readmode') display: none !important #article-container + a + color: #99a9bf + + pre, + .highlight:not(.js-file-line-container) + background: var(-highlight-bg) !important + + * + color: var(--font-color) !important + + figure.highlight + border-radius: 0 !important + box-shadow: none !important + + & > :not(.highlight-tools) + display: block !important + + .line:before + color: var(--font-color) !important + + .hljs + background: var(-highlight-bg) !important + h1, h2, h3, @@ -223,7 +114,20 @@ if hexo-config('readmode') &:hover:before transform: none !important + ol, + li + &:before + background: transparent !important + color: var(--font-color) !important + + ul + >li + &:before + border: .15rem solid var(--gray) !important + .tabs + border: 2px solid var(--tab-border-color) + > .nav-tabs background: transparent @@ -243,3 +147,38 @@ if hexo-config('readmode') > .tab-contents .tab-item-content.active animation: none + + code + color: var(--font-color) + + blockquote + border-left: .2rem solid var(--gray) + background-color: var(--readmode-light-color) + + .hide-toggle + border: 1px solid var(--gray) !important + + .hide-button, + .btn-beautify + background: var(--readmode-light-color) !important + color: var(--font-color) !important + + .btn-beautify + border: 1px solid var(--gray) !important + + .button--animated:before + background: var(--readmode-light-color) !important + + .hide-inline, + .hide-block + & >.hide-button + border: 1px solid var(--gray) + + & > .button--animated:before + background: var(--readmode-light-color) + + .note + border: 2px solid var(--gray) + filter: none + background-color: var(--readmode-light-color) + color: var(--font-color) \ No newline at end of file diff --git a/source/css/_search/algolia.styl b/source/css/_search/algolia.styl index 5531882..de7275e 100644 --- a/source/css/_search/algolia.styl +++ b/source/css/_search/algolia.styl @@ -11,7 +11,8 @@ outline: none border: 2px solid $search-color border-radius: 2rem - background: $search-bg + background: var(--search-bg) + color: var(--search-input-color) font-size: 14px .ais-hits--item.algolia-hit-item @@ -20,7 +21,7 @@ &:hover &:before - border-color: $theme-button-hover-color + border-color: $pseudo-hover &:before $w = .3rem @@ -38,7 +39,7 @@ a display: block - color: $font-black + color: var(--search-result-title) font-size: 14px cursor: pointer diff --git a/source/css/_search/index.styl b/source/css/_search/index.styl index 7f8ab5d..1e33134 100644 --- a/source/css/_search/index.styl +++ b/source/css/_search/index.styl @@ -7,7 +7,14 @@ margin-left: -15rem padding: 1rem width: 30rem - background: $search-bg + background: var(--search-bg) + + @media screen and (max-width: $sm) + top: 0 + left: 0 + margin: 0 + width: 100% + height: 100% hr margin: 1rem auto @@ -31,7 +38,7 @@ font-size: 1rem line-height: 1 -.search-mask +#search-mask position: fixed top: 0 right: 0 @@ -39,16 +46,4 @@ left: 0 z-index: 1000 display: none - background: rgba($dark-black, .6) - -@media screen and (max-width: $sm) - .search-dialog - top: 0 - left: 0 - margin: 0 - width: 100% - height: 100% - - .search-result-list - padding-bottom: 2rem - max-height: 75vh !important + background: rgba($dark-black, .6) \ No newline at end of file diff --git a/source/css/_search/local-search.styl b/source/css/_search/local-search.styl index e0b3c5f..65f75ad 100644 --- a/source/css/_search/local-search.styl +++ b/source/css/_search/local-search.styl @@ -12,7 +12,8 @@ outline: none border: 2px solid $search-color border-radius: 2rem - background: $search-bg + background: var(--search-bg) + color: var(--search-input-color) font-size: 14px -webkit-appearance: none @@ -23,7 +24,7 @@ &:hover &:before - border-color: $theme-button-hover-color + border-color: $pseudo-hover &:before $w = .3rem @@ -41,7 +42,7 @@ a display: block - color: $font-black + color: var(--search-result-title) font-weight: 600 font-size: 14px cursor: pointer @@ -62,4 +63,8 @@ .search-result-list overflow-y: auto - max-height: 10.5rem \ No newline at end of file + max-height: 10.5rem + + @media screen and (max-width: $sm) + padding-bottom: 2rem + max-height: 75vh !important diff --git a/source/css/_tags/button.styl b/source/css/_tags/button.styl index a828718..17ebd64 100644 --- a/source/css/_tags/button.styl +++ b/source/css/_tags/button.styl @@ -4,8 +4,6 @@ text-align: center .btn-beautify - position: relative - z-index: 1 display: inline-block margin: 0 .2rem .3rem padding: 0 1rem diff --git a/source/css/_tags/hide.styl b/source/css/_tags/hide.styl index e9b27fe..429f9f6 100644 --- a/source/css/_tags/hide.styl +++ b/source/css/_tags/hide.styl @@ -2,12 +2,10 @@ .hide-inline, .hide-block & > .hide-button - position: relative - z-index: 1 display: inline-block padding: .3rem 1rem background: $tag-hide-bg - color: $white !important + color: var(--white) &.open display: none @@ -32,7 +30,7 @@ & > .hide-button padding: .3rem .5rem background: $tag-hide-toggle-bg - color: $font-color + color: #1F2D3D cursor: pointer & > i diff --git a/source/css/_tags/note.styl b/source/css/_tags/note.styl index 841e899..96d78ed 100644 --- a/source/css/_tags/note.styl +++ b/source/css/_tags/note.styl @@ -4,19 +4,22 @@ position: relative margin: 0 0 1rem padding: 15px + if ($note-style == 'simple') - border: 1px solid $light-grey + border: 1px solid #EEEEEE border-left-width: 5px if ($note-style == 'modern') border: 1px solid transparent - background-color: $whitesmoke + background-color: var(--white)smoke + if ($note-style == 'flat') border: initial - border-left: 5px solid $light-grey - background-color: lighten($light-grey, 65%) + color: $font-black + border-left: 5px solid #EEEEEE + background-color: lighten(#EEEEEE, 65%) if hexo-config('note.border_radius') is a 'unit' border-radius: unit(hexo-config('note.border_radius'), px) @@ -47,6 +50,9 @@ &:last-child margin-bottom: 0 !important + + code + background: $code-background !important if $note-icons &:not(.no-icon) @@ -69,14 +75,11 @@ background: lookup('$note-modern-' + $type + '-bg') color: lookup('$note-modern-' + $type + '-text') - a, - span.exturl + a &:not(.btn) - border-bottom: 1px solid lookup('$note-modern-' + $type + '-text') color: lookup('$note-modern-' + $type + '-text') &:hover - border-bottom: 1px solid lookup('$note-modern-' + $type + '-hover') color: lookup('$note-modern-' + $type + '-hover') if ($note-style != 'modern') diff --git a/source/css/_tags/tabs.styl b/source/css/_tags/tabs.styl index 770bc40..8f49059 100644 --- a/source/css/_tags/tabs.styl +++ b/source/css/_tags/tabs.styl @@ -1,16 +1,18 @@ + #article-container .tabs position: relative margin: 0 0 1rem - border: 1px solid $tab-border-color - border-top: none + border-right: 1px solid var(--tab-border-color) + border-bottom: 1px solid var(--tab-border-color) + border-left: 1px solid var(--tab-border-color) > .nav-tabs display: flex flex-wrap: wrap margin: 0 padding: 0 - background: $tab-botton-bg + background: var(--tab-botton-bg) > .tab margin: 0 @@ -23,26 +25,28 @@ button display: block padding: .5rem 1rem - border-top: 2px solid $tab-border-color - background: $tab-botton-bg - color: $font-color - width 100% + width: 100% + border-top: 2px solid var(--tab-border-color) + background: var(--tab-botton-bg) + color: var(--tab-botton-color) line-height: 2 transition: all .4s - &:hover - border-top: 2px solid $tab-button-hover-bg - background: $tab-button-hover-bg - i width: 1.5em &.active button border-top: 2px solid $tab-active-border-color - background: $card-bg + background: var(--tab-button-active-bg) cursor: default + &:not(.active) + button + &:hover + border-top: 2px solid var(--tab-button-hover-bg) + background: var(--tab-button-hover-bg) + > .tab-contents .tab-item-content position: relative diff --git a/source/css/_third-party/normalize.min.css b/source/css/_third-party/normalize.min.css index 1854c29..ecc522f 100644 --- a/source/css/_third-party/normalize.min.css +++ b/source/css/_third-party/normalize.min.css @@ -1 +1,180 @@ -/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none} \ No newline at end of file +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ +html { + line-height: 1.15; + -webkit-text-size-adjust: 100% +} + +body { + margin: 0 +} + +main { + display: block +} + +h1 { + font-size: 2em; + margin: .67em 0 +} + +hr { + box-sizing: content-box; + height: 0; + overflow: visible +} + +pre { + font-family: monospace, monospace; + font-size: 1em +} + +a { + background-color: transparent +} + +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted +} + +b, +strong { + font-weight: bolder +} + +code, +kbd, +samp { + font-family: monospace, monospace; + font-size: 1em +} + +small { + font-size: 80% +} + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline +} + +sub { + bottom: -.25em +} + +sup { + top: -.5em +} + +img { + border-style: none +} + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; + font-size: 100%; + line-height: 1.15; + margin: 0 +} + +button, +input { + overflow: visible +} + +button, +select { + text-transform: none +} + +[type=button], +[type=reset], +[type=submit], +button { + -webkit-appearance: button +} + +[type=button]::-moz-focus-inner, +[type=reset]::-moz-focus-inner, +[type=submit]::-moz-focus-inner, +button::-moz-focus-inner { + border-style: none; + padding: 0 +} + +[type=button]:-moz-focusring, +[type=reset]:-moz-focusring, +[type=submit]:-moz-focusring, +button:-moz-focusring { + outline: 1px dotted ButtonText +} + +fieldset { + padding: .35em .75em .625em +} + +legend { + box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; + padding: 0; + white-space: normal +} + +progress { + vertical-align: baseline +} + +textarea { + overflow: auto +} + +[type=checkbox], +[type=radio] { + box-sizing: border-box; + padding: 0 +} + +[type=number]::-webkit-inner-spin-button, +[type=number]::-webkit-outer-spin-button { + height: auto +} + +[type=search] { + -webkit-appearance: textfield; + outline-offset: -2px +} + +[type=search]::-webkit-search-decoration { + -webkit-appearance: none +} + +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit +} + +details { + display: block +} + +summary { + display: list-item +} + +template { + display: none +} + +[hidden] { + display: none +} \ No newline at end of file diff --git a/source/css/var.styl b/source/css/var.styl index 2d265ff..4477231 100644 --- a/source/css/var.styl +++ b/source/css/var.styl @@ -6,7 +6,6 @@ $light-red = #F47466 $themeColorEnable = hexo-config('theme_color') && hexo-config('theme_color.enable') $theme-color = $themeColorEnable ? convert(hexo-config('theme_color.main')) : $bright-blue $theme-paginator-color = $themeColorEnable ? convert(hexo-config('theme_color.paginator')) : $strong-cyan -$theme-button-hover-color = $themeColorEnable ? convert(hexo-config('theme_color.button_hover')) : $light-orange $theme-text-selection-color = $themeColorEnable ? convert(hexo-config('theme_color.text_selection')) : $strong-cyan $theme-link-color = $themeColorEnable ? convert(hexo-config('theme_color.link_color')) : $bright-blue $theme-hr-color = $themeColorEnable ? convert(hexo-config('theme_color.hr_color')) : $bright-blue @@ -30,7 +29,6 @@ $title-prefix-icon-color = $beautifyEnable ? convert(hexo-config('beautify.title // Global Variables $font-size = 14px $font-color = #1F2D3D -$button-color = #fff $rem = 20px $text-line-height = 2 $sm = 768px @@ -48,8 +46,11 @@ $white = #FFFFFF $whitesmoke = #f5f5f5 $font-black = #4C4948 $card-bg = $white +$text-highlight-color = $font-color +$text-hover = $theme-color +$text-bg-hover = $theme-color // code -$line-height-code-block = 20px +$line-height-code-block = 1.6 $blockquote-color = #6a737d $blockquote-padding-color = $themeColorEnable ? convert(hexo-config('theme_color.blockquote_padding_color')) : #49B1F5 $blockquote-background-color = $themeColorEnable ? alpha(convert(hexo-config('theme_color.blockquote_background_color')), .1) : alpha($blockquote-padding-color, .1) @@ -66,6 +67,12 @@ $sidebar-width = 300px $sidebar-background = #f6f8fa $sidebar-active-color = #fff $mobile-sidebar-width = 250px +// Button +$button-color = #fff +$button-hover-color = $themeColorEnable ? convert(hexo-config('theme_color.button_hover')) : $light-orange +$button-bg= $theme-color +$pseudo-hover = $button-hover-color + // table $table-thead-bg = #99a9bf // reward @@ -73,8 +80,19 @@ $reward-pop-up-bg = #f5f5f5 $reward-pop-up-color = #858585 // search $search-bg = #f6f8fa +$search-input-color= $font-black $search-color = $theme-color $search-keyword-highlight = #F47466 +$search-result-title= $font-black +// comments +$comments-switch-first-text = $bright-blue +$comments-switch-second-text = $light-orange +$comments-switch-round = #fff +$comments-switch-bg = #f6f8fa +// noticeOutdate +$noticeOutdate-bg = #ffe6e6 +$noticeOutdate-color = #ff6666 +$noticeOutdate-border = #ff8080 // gallery $gallery-color = #fff // tag-hide @@ -82,6 +100,7 @@ $tag-hide-bg = $theme-color $tag-hide-toggle-bg = #f0f0f0 // preloader $preloader-bg = #37474f +$preloader-word-color = #fff // rightside $rightside-bottom = hexo-config('rightside-bottom') is a 'unit' ? unit(hexo-config('rightside-bottom'), px) : 40px // fireworks @@ -156,6 +175,8 @@ $btn-green-color = #5cb85c // Tag Plugins - Tab $tab-border-color = #f0f0f0 $tab-botton-bg = #f0f0f0 +$tab-botton-color = $font-color $tab-button-hover-bg = darken($tab-border-color, 8) $tab-active-border-color = $theme-color +$tab-button-active-bg= $card-bg $tab-to-top-color = #99a9bf \ No newline at end of file diff --git a/source/js/main.js b/source/js/main.js index 7e0493a..5bcbe45 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -1,122 +1,95 @@ -$(function () { - const isSnackbar = GLOBAL_CONFIG.Snackbar !== undefined +/** + * 當menu過多時，自動適配，避免UI錯亂 + * @param {*} n + * 傳入 1 sidebar打開時 + * 傳入 2 正常狀態下 + */ + +const blogNameWidth = $('#blog_name').width() +const menusWidth = $('.menus').width() +const sidebarWidth = $('#sidebar').width() + +const adjustMenu = function (n) { const $nav = $('#nav') - const $rightside = $('#rightside') - const $body = $('body') + let t + if (n === 0) t = true + else if (n === 1) t = blogNameWidth + menusWidth > $nav.width() - sidebarWidth - 30 + else t = blogNameWidth + menusWidth > $nav.width() - 30 - /** - * 當menu過多時，自動適配，避免UI錯亂 - * 傳入 1 sidebar打開時 - * 傳入 2 正常狀態下 - */ - var blogNameWidth = $('#blog_name').width() - var menusWidth = $('.menus').width() - var sidebarWidth = $('#sidebar').width() - - function isAdjust (n) { - var t - if (n === 1) { - t = blogNameWidth + menusWidth > $nav.width() - sidebarWidth - 20 - } else if (n === 2) { - t = blogNameWidth + menusWidth > $nav.width() - 20 - } - - if (t) headerAdjust() - else headerAdjustBack() - } - - function headerAdjust () { + if (t) { $nav.find('.toggle-menu').addClass('is-visible-inline') $nav.find('.menus_items').addClass('is-invisible') $nav.find('#search_button span').addClass('is-invisible') - } - - function headerAdjustBack () { + } else { $nav.find('.toggle-menu').removeClass('is-visible-inline') $nav.find('.menus_items').removeClass('is-invisible') $nav.find('#search_button span').removeClass('is-invisible') } +} - // 初始化header - function initAjust () { - if (window.innerWidth < 768) headerAdjust() - else isAdjust(2) - } - - initAjust() +// 初始化header +const initAdjust = () => { + if (window.innerWidth < 768) adjustMenu(0) + else adjustMenu(2) $('#nav').css({ opacity: '1', animation: 'headerNoOpacity 1s' }) +} - $(window).on('resize', function () { - if ($('#sidebar').hasClass('tocOpenPc') && $nav.hasClass('fixed')) { - isAdjust(1) - } else { - initAjust() - } +/** + * 進入post頁sidebar處理 + */ +const OpenSidebarAuto = () => { + if (window.innerWidth > 1024 && $('#toggle-sidebar').hasClass('on')) { + setTimeout(function () { + openSidebar() + }, 400) + } +} + +/** + * 點擊左下角箭頭,顯示sidebar + */ + +const closeSidebar = () => { + $('#sidebar').removeClass('tocOpenPc').animate({ + left: '-300px' + }, 400) + $('.menus').animate({ + paddingRight: 0 + }, 400) + $('#body-wrap').animate({ + paddingLeft: 0 + }, 400) + $('#toggle-sidebar').css({ + transform: 'rotateZ(0deg)', + color: '#1F2D3D', + opacity: '1' }) + setTimeout(function () { + adjustMenu(2) + }, 400) +} - /** - * 進入post頁sidebar處理 - */ - if (GLOBAL_CONFIG_SITE.isPost) { - if (window.innerWidth > 1024 && $('#toggle-sidebar').hasClass('on')) { - setTimeout(function () { - openSidebar() - }, 400) - } - } - - /** - * 點擊左下角箭頭,顯示sidebar - */ - - function closeSidebar () { - $('#sidebar').removeClass('tocOpenPc') - $('.menus').animate({ - paddingRight: 0 - }, 400) - $('#body-wrap').animate({ - paddingLeft: 0 - }, 400) - $('#sidebar').animate({ - left: '-300px' - }, 400) - $('#toggle-sidebar').css({ - transform: 'rotateZ(0deg)', - color: '#1F2D3D', - opacity: '1' - }) - setTimeout(function () { - isAdjust(2) - }, 400) - } - - function openSidebar () { - $('#sidebar').addClass('tocOpenPc') - $('.menus').animate({ - paddingRight: 300 - }, 400) - $('#body-wrap').animate({ - paddingLeft: 300 - }, 400) - $('#sidebar').animate({ - left: 0 - }, 400) - $('#toggle-sidebar').css({ - transform: 'rotateZ(180deg)', - color: '#99a9bf', - opacity: '1' - }) - var isAdjustTimeCount = window.setInterval(function () { - if ($nav.hasClass('fixed')) isAdjust(1) - else isAdjust(2) - }, 100) - setTimeout(function () { - clearInterval(isAdjustTimeCount) - }, 400) - } +const openSidebar = () => { + adjustMenu(1) + $('#sidebar').addClass('tocOpenPc').animate({ + left: 0 + }, 400) + $('.menus').animate({ + paddingRight: 300 + }, 400) + $('#body-wrap').animate({ + paddingLeft: 300 + }, 400) + $('#toggle-sidebar').css({ + transform: 'rotateZ(180deg)', + color: '#99a9bf', + opacity: '1' + }) +} +const toggleSidebar = function () { $('#toggle-sidebar').on('click', function () { - var isOpen = $(this).hasClass('on') + const isOpen = $(this).hasClass('on') isOpen ? $(this).removeClass('on') : $(this).addClass('on') if (isOpen) { closeSidebar() @@ -124,53 +97,49 @@ $(function () { openSidebar() } }) +} - /** - * 手機menu和toc按鈕點擊 - * 顯示menu和toc的sidebar - */ +/** + * 手機menu和toc按鈕點擊 + * 顯示menu和toc的sidebar + */ - var $toggleMenu = $('.toggle-menu') - var $mobileSidevarMenus = $('#mobile-sidebar-menus') - var $mobileTocButton = $('#mobile-toc-button') - var $menuMask = $('#menu_mask') +const sidebarFn = () => { + const $toggleMenu = $('.toggle-menu') + const $mobileSidebarMenus = $('#mobile-sidebar-menus') + const $mobileTocButton = $('#mobile-toc-button') + const $menuMask = $('#menu_mask') + const $body = $('body') + const $sidebar = $('#sidebar') function openMobileSidebar (name) { sidebarPaddingR() - $('body').css('overflow', 'hidden') + $body.css('overflow', 'hidden') $menuMask.fadeIn() if (name === 'menu') { $toggleMenu.removeClass('close').addClass('open') - $mobileSidevarMenus.css('transform', 'translate3d(-100%,0,0)') - var $mobileSidevarMenusChild = $mobileSidevarMenus.children() - for (let i = 0; i <= $mobileSidevarMenusChild.length; i++) { - const duration = i / 5 + 0.2 - $mobileSidevarMenusChild.eq(i).css('animation', 'sidebarItem ' + duration + 's') - } + $mobileSidebarMenus.addClass('open') } if (name === 'toc') { $mobileTocButton.removeClass('close').addClass('open') - $('#sidebar').addClass('tocOpenMobile') - $('#sidebar').css({ transform: 'translate3d(-100%,0,0)', left: '' }) + $sidebar.addClass('tocOpenMobile').css({ transform: 'translate3d(-100%,0,0)', left: '' }) } } function closeMobileSidebar (name) { - $('body').css({ overflow: '', 'padding-right': '' }) + $body.css({ overflow: '', 'padding-right': '' }) $menuMask.fadeOut() if (name === 'menu') { $toggleMenu.removeClass('open').addClass('close') - $mobileSidevarMenus.css('transform', '') - $('#mobile-sidebar-menus > div,#mobile-sidebar-menus > hr').css('animation', '') + $mobileSidebarMenus.removeClass('open') } if (name === 'toc') { $mobileTocButton.removeClass('open').addClass('close') - $('#sidebar').removeClass('tocOpenMobile') - $('#sidebar').css({ transform: '' }) + $sidebar.removeClass('tocOpenMobile').css({ transform: '' }) } } @@ -200,134 +169,106 @@ $(function () { const mql = window.matchMedia('(max-width: 1024px)') mql.addListener(function (ev) { if (ev.matches) { - if ($('#sidebar').hasClass('tocOpenPc')) closeSidebar() + if ($sidebar.hasClass('tocOpenPc')) closeSidebar() } else { if ($('#toggle-sidebar').hasClass('on')) openSidebar() if ($mobileTocButton.hasClass('open')) closeMobileSidebar('toc') } }) - /** - * 首頁top_img底下的箭頭 - */ + // toc元素點擊 + $sidebar.find('.toc-link').on('click', function (e) { + if (window.innerWidth <= 1024) { + closeMobileSidebar('toc') + } else { + e.preventDefault() + scrollToDest(decodeURI($(this).attr('href'))) + } + }) +} + +/** + * 首頁top_img底下的箭頭 + */ +const scrollDownInIndex = () => { $('#scroll_down').on('click', function () { scrollToDest('#content-inner') }) +} - /** - * BOOKMARK 書簽 - */ - $('#bookmark-it').on('click', function () { - if (window.sidebar && window.sidebar.addPanel) { // Mozilla Firefox Bookmark - window.sidebar.addPanel(document.title, window.location.href, '') - } else if (window.external && ('AddFavorite' in window.external)) { // IE Favorite - window.external.AddFavorite(location.href, document.title) - } else if (window.opera && window.print) { // Opera Hotlist - this.title = document.title - return true - } else { // webkit - safari/chrome - if (isSnackbar) { - var bookmarkText = GLOBAL_CONFIG.Snackbar.bookmark.message_prev + ' ' + (navigator.userAgent.toLowerCase().indexOf('mac') !== -1 ? 'Command/Cmd' : 'CTRL') + '+ D ' + GLOBAL_CONFIG.Snackbar.bookmark.message_next + '.' - snackbarShow(bookmarkText) - } else { - alert(GLOBAL_CONFIG.bookmark.message_prev + ' ' + (navigator.userAgent.toLowerCase().indexOf('mac') !== -1 ? 'Command/Cmd' : 'CTRL') + '+ D ' + GLOBAL_CONFIG.bookmark.message_next + '.') - } - } - }) - - /** - * 代碼 - * 只適用於Hexo默認的代碼渲染 - */ +/** + * 代碼 + * 只適用於Hexo默認的代碼渲染 + */ +const addHighlightTool = function () { const $figureHighlight = $('figure.highlight') + const isHighlightCopy = GLOBAL_CONFIG.highlightCopy + const isHighlightLang = GLOBAL_CONFIG.highlightLang + const isHighlightShrink = GLOBAL_CONFIG_SITE.isHighlightShrink - if ($figureHighlight.length) { - const isHighlightCopy = GLOBAL_CONFIG.highlightCopy - const isHighlightLang = GLOBAL_CONFIG.highlightLang - const isHighlightShrink = GLOBAL_CONFIG_SITE.isHighlightShrink + if ($figureHighlight.length && (isHighlightCopy || isHighlightLang || isHighlightShrink !== undefined)) { + let highlightShrinkEle = '' + let highlightCopyEle = '' + const highlightShrinkClass = isHighlightShrink === true ? 'closed' : '' - if (isHighlightCopy || isHighlightLang || isHighlightShrink !== undefined) { - $figureHighlight.prepend('
    ') + if (isHighlightShrink !== undefined) { + highlightShrinkEle = `` } - /** - * 代碼收縮 - */ - const $highlightTools = $('.highlight-tools') - if (isHighlightShrink === true) { - $highlightTools.append('') - } else if (isHighlightShrink === false) { - $highlightTools.append('') + if (isHighlightCopy) { + highlightCopyEle = '
    ' } - $(document).on('click', '.highlight-tools >.code-expand', function () { - var $hideItem = $(this).parent().nextAll() - if ($(this).hasClass('code-closed')) { - $hideItem.css('display', 'block') - $(this).removeClass('code-closed') - } else { - $hideItem.css('display', 'none') - $(this).addClass('code-closed') - } - }) - - /** - * 代碼語言 - */ if (isHighlightLang) { - var langNameIndex, langName + let langName $figureHighlight.each(function () { - langNameIndex = langName = $(this).attr('class').split(' ')[1] - if (langNameIndex === 'plain') langName = 'Code' - $(this).find('.highlight-tools').append('
    ' + langName + '
    ') + const $this = $(this) + langName = $this.attr('class').split(' ')[1] + if (langName === 'plain' || langName === undefined) langName = 'Code' + const highlightLangEle = `
    ${langName}
    ` + $this.prepend(`
    ${highlightShrinkEle + highlightLangEle + highlightCopyEle}
    `) + }) + } else { + $figureHighlight.prepend(`
    ${highlightShrinkEle + highlightCopyEle}
    `) + } + + /** + * 代碼收縮 + */ + + if (isHighlightShrink !== undefined) { + $figureHighlight.find('.highlight-tools >.expand').on('click', function () { + const $this = $(this) + const $table = $this.parent().nextAll() + $this.toggleClass('closed') + $table.is(':visible') ? $table.css('display', 'none') : $table.css('display', 'block') }) } /** - * 代碼copy - * copy function - */ + * 代碼copy + */ if (isHighlightCopy) { - $highlightTools.append('
    ') - var copy = function (text, ctx) { + const copy = function (text, ctx) { if (document.queryCommandSupported && document.queryCommandSupported('copy')) { - try { - document.execCommand('copy') // Security exception may be thrown by some browsers. - if (isSnackbar) { - snackbarShow(GLOBAL_CONFIG.copy.success) - } else { - $(ctx).prev('.copy-notice') - .text(GLOBAL_CONFIG.copy.success) - .animate({ - opacity: 1 - }, 450, function () { - setTimeout(function () { - $(ctx).prev('.copy-notice').animate({ - opacity: 0 - }, 650) - }, 400) - }) - } - } catch (ex) { - if (isSnackbar) { - snackbarShow(GLOBAL_CONFIG.copy.success) - } else { - $(ctx).prev('.copy-notice') - .text(GLOBAL_CONFIG.copy.error) - .animate({ - opacity: 1 - }, 650, function () { - setTimeout(function () { - $(ctx).prev('.copy-notice').animate({ - opacity: 0 - }, 650) - }, 400) - }) - return false - } + document.execCommand('copy') + if (GLOBAL_CONFIG.Snackbar !== undefined) { + snackbarShow(GLOBAL_CONFIG.copy.success) + } else { + $(ctx).prev('.copy-notice') + .text(GLOBAL_CONFIG.copy.success) + .animate({ + opacity: 1 + }, 450, function () { + setTimeout(function () { + $(ctx).prev('.copy-notice').animate({ + opacity: 0 + }, 650) + }, 400) + }) } } else { - if (isSnackbar) { + if (GLOBAL_CONFIG.Snackbar !== undefined) { snackbarShow(GLOBAL_CONFIG.copy.noSupport) } else { $(ctx).prev('.copy-notice').text(GLOBAL_CONFIG.copy.noSupport) @@ -336,80 +277,77 @@ $(function () { } // click events - $(document).on('click', '.highlight-tools>.copy-button', function () { - var $buttonParent = $(this).parents('figure.highlight') + $figureHighlight.find('.highlight-tools >.copy-button').on('click', function () { + const $buttonParent = $(this).parents('figure.highlight') $buttonParent.addClass('copy-true') - var selection = window.getSelection() - var range = document.createRange() + const selection = window.getSelection() + const range = document.createRange() range.selectNodeContents($buttonParent.find('table .code pre')[0]) selection.removeAllRanges() selection.addRange(range) - var text = selection.toString() + const text = selection.toString() copy(text, this) selection.removeAllRanges() $buttonParent.removeClass('copy-true') }) } } +} - /** +/** * PhotoFigcaption */ - function addPhotoFigcaption () { - const images = $('#article-container img').not('.justified-gallery img') - images.each(function (i, o) { - var $this = $(o) - if ($this.attr('alt')) { - var t = $('
    ' + $this.attr('alt') + '
    ') - $this.after(t) - } - }) - } - if (GLOBAL_CONFIG.isPhotoFigcaption) addPhotoFigcaption() +function addPhotoFigcaption () { + const images = $('#article-container img').not('.justified-gallery img') + images.each(function (i, o) { + const $this = $(o) + if ($this.attr('alt')) { + const t = $('
    ' + $this.attr('alt') + '
    ') + $this.after(t) + } + }) +} - /** - * justified-gallery 圖庫排版 - */ - var $justifiedGallery = $('.justified-gallery') - var isJustifiedGallery = false +/** + * justified-gallery 圖庫排版 + */ + +let detectJgJsLoad = false +const runJustifiedGallery = function () { + const $justifiedGallery = $('.justified-gallery') if ($justifiedGallery.length) { - isJustifiedGallery = true - var $imgList = $justifiedGallery.find('img') + const $imgList = $justifiedGallery.find('img') $imgList.unwrap() if ($imgList.length) { $imgList.each(function (i, o) { - if ($(o).attr('data-src')) $(o).attr('src', $(o).attr('data-src')) + if ($(o).attr('data-lazy-src')) $(o).attr('src', $(o).attr('data-lazy-src')) $(o).wrap('
    ') }) } - $('head').append(``) - loadScript(`${GLOBAL_CONFIG.justifiedGallery.js}`, function () { - initJustifiedGallery($justifiedGallery) - }) - var initJustifiedGallery = function (selector) { - selector.each(function (i, o) { - if ($(this).is(':visible')) { - $(this).justifiedGallery({ - rowHeight: 220, - margins: 4 - }) - } + if (detectJgJsLoad) initJustifiedGallery($justifiedGallery) + else { + $('head').append(``) + $.getScript(`${GLOBAL_CONFIG.justifiedGallery.js}`, function () { + initJustifiedGallery($justifiedGallery) }) + detectJgJsLoad = true } } +} - /** - * fancybox和 mediumZoom - */ - - var isMediumZoom = GLOBAL_CONFIG.medium_zoom - var isFancybox = GLOBAL_CONFIG.fancybox +/** + * fancybox和 mediumZoom + */ +const addLightBox = function () { + const isMediumZoom = GLOBAL_CONFIG.medium_zoom + const isFancybox = GLOBAL_CONFIG.fancybox if (isFancybox) { - var images = $('#article-container img:not(.gallery-group-img)').not($('a>img')) + const images = $('#article-container img:not(.gallery-group-img)').not($('a>img')) images.each(function (i, o) { - var lazyloadSrc = $(o).attr('data-src') ? $(o).attr('data-src') : $(o).attr('src') - $(o).wrap(``) + const lazyloadSrc = $(o).attr('data-lazy-src') ? $(o).attr('data-lazy-src') : $(o).attr('src') + const dataCaption = $(o).attr('alt') ? $(o).attr('alt') : '' + $(o).wrap(``) }) $().fancybox({ @@ -417,28 +355,33 @@ $(function () { loop: true, transitionEffect: 'slide', protect: true, - buttons: ['slideShow', 'fullScreen', 'thumbs', 'close'] + buttons: ['slideShow', 'fullScreen', 'thumbs', 'close'], + hash: false }) } else if (isMediumZoom) { const zoom = mediumZoom(document.querySelectorAll('#article-container :not(a)>img')) zoom.on('open', function (event) { - var photoBg = $(document.documentElement).attr('data-theme') === 'dark' ? '#121212' : '#fff' + const photoBg = $(document.documentElement).attr('data-theme') === 'dark' ? '#121212' : '#fff' zoom.update({ background: photoBg }) }) } +} - /** - * 滾動處理 - */ - var initTop = 0 - var isChatShow = true - var isChatBtnHide = typeof chatBtnHide === 'function' - var isChatBtnShow = typeof chatBtnShow === 'function' +/** + * 滾動處理 + */ +const scrollFn = function () { + let initTop = 0 + let isChatShow = true + const $rightside = $('#rightside') + const $nav = $('#nav') + const isChatBtnHide = typeof chatBtnHide === 'function' + const isChatBtnShow = typeof chatBtnShow === 'function' $(window).scroll(throttle(function (event) { - var currentTop = $(this).scrollTop() - var isDown = scrollDirection(currentTop) + const currentTop = $(this).scrollTop() + const isDown = scrollDirection(currentTop) if (currentTop > 56) { if (isDown) { if ($nav.hasClass('visible')) $nav.removeClass('visible') @@ -467,325 +410,398 @@ $(function () { // find the scroll direction function scrollDirection (currentTop) { - var result = currentTop > initTop // true is down & false is up + const result = currentTop > initTop // true is down & false is up initTop = currentTop return result } +} - /** - * 點擊滾回頂部 - */ - $('#go-up').on('click', function () { - scrollToDest('body') - }) +/** + * toc + */ +const tocFn = function () { + $('.toc-child').hide() - /** - * toc - */ + // main of scroll + $(window).scroll(throttle(function (event) { + const currentTop = $(this).scrollTop() + scrollPercent(currentTop) + findHeadPosition(currentTop) + autoScrollToc(currentTop) + }, 100)) - if (GLOBAL_CONFIG_SITE.isPost && GLOBAL_CONFIG_SITE.isSidebar) { - $('.toc-child').hide() - - // main of scroll - $(window).scroll(throttle(function (event) { - var currentTop = $(this).scrollTop() - scrollPercent(currentTop) - findHeadPosition(currentTop) - autoScrollToc(currentTop) - }, 100)) - - // scroll - $('.toc-link').on('click', function (e) { - if (window.innerWidth <= 1024) { - closeMobileSidebar('toc') - } else { - e.preventDefault() - scrollToDest($(this).attr('href')) - } - }) - - // expand toc-item - var expandToc = function ($item) { - if ($item.is(':visible')) { - return - } - $item.fadeIn(400) + // expand toc-item + const expandToc = function ($item) { + if ($item.is(':visible')) { + return } + $item.fadeIn(400) + } - var scrollPercent = function (currentTop) { - var docHeight = $('#article-container').height() - var winHeight = $(window).height() - var contentMath = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight) - var scrollPercent = (currentTop) / (contentMath) - var scrollPercentRounded = Math.round(scrollPercent * 100) - var percentage = (scrollPercentRounded > 100) ? 100 - : (scrollPercentRounded <= 0) ? 0 - : scrollPercentRounded - $('.progress-num').text(percentage) - $('.sidebar-toc__progress-bar').animate({ - width: percentage + '%' - }, 100) - } + const scrollPercent = function (currentTop) { + const docHeight = $('#article-container').height() + const winHeight = $(window).height() + const contentMath = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight) + const scrollPercent = (currentTop) / (contentMath) + const scrollPercentRounded = Math.round(scrollPercent * 100) + const percentage = (scrollPercentRounded > 100) ? 100 + : (scrollPercentRounded <= 0) ? 0 + : scrollPercentRounded + $('.progress-num').text(percentage) + $('.sidebar-toc__progress-bar').animate({ + width: percentage + '%' + }, 100) + } - // anchor - var isanchor = GLOBAL_CONFIG.isanchor - var updateAnchor = function (anchor) { - if (window.history.replaceState && anchor !== window.location.hash) { - window.history.replaceState(undefined, undefined, anchor) - } - } - - // find head position & add active class - // DOM Hierarchy: - // ol.toc > (li.toc-item, ...) - // li.toc-item > (a.toc-link, ol.toc-child > (li.toc-item, ...)) - var findHeadPosition = function (top) { - // assume that we are not in the post page if no TOC link be found, - // thus no need to update the status - if ($('.toc-link').length === 0) { - return false - } - - var list = $('#article-container').find('h1,h2,h3,h4,h5,h6') - var currentId = '' - list.each(function () { - var head = $(this) - if (top > head.offset().top - 25) { - currentId = '#' + $(this).attr('id') - } - }) - - if (currentId === '') { - $('.toc-link').removeClass('active') - $('.toc-child').hide() - } - - var currentActive = $('.toc-link.active') - if (currentId && currentActive.attr('href') !== currentId) { - if (isanchor) updateAnchor(currentId) - - $('.toc-link').removeClass('active') - - var _this = $('.toc-link[href="' + currentId + '"]') - _this.addClass('active') - - var parents = _this.parents('.toc-child') - // Returned list is in reverse order of the DOM elements - // Thus `parents.last()` is the outermost .toc-child container - // i.e. list of subsections - var topLink = (parents.length > 0) ? parents.last() : _this - expandToc(topLink.closest('.toc-item').find('.toc-child')) - topLink - // Find all top-level .toc-item containers, i.e. sections - // excluding the currently active one - .closest('.toc-item').siblings('.toc-item') - // Hide their respective list of subsections - .find('.toc-child').hide() - } - } - - var autoScrollToc = function (currentTop) { - if ($('.toc-link').hasClass('active')) { - var activePosition = $('.active').offset().top - var sidebarScrolltop = $('#sidebar .sidebar-toc__content').scrollTop() - if (activePosition > (currentTop + $(window).height() - 100)) { - $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrolltop + 100) - } - if (activePosition < currentTop + 100) { - $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrolltop - 100) - } - } + // anchor + const isAnchor = GLOBAL_CONFIG.isanchor + const updateAnchor = function (anchor) { + if (window.history.replaceState && anchor !== window.location.hash) { + window.history.replaceState(undefined, undefined, anchor) } } - /** - * 閲讀模式 - */ - $('#readmode').click(function () { - $('body').toggleClass('read-mode') - }) - - /** - * 字體調整 - */ - $('#font_plus').click(function () { - $body.css('font-size', parseFloat($body.css('font-size')) + 1) - }) - $('#font_minus').click(function () { - $body.css('font-size', parseFloat($body.css('font-size')) - 1) - }) - - /** - * menu - * 側邊欄sub-menu 展開/收縮 - * 解決menus在觸摸屏下，滑動屏幕menus_item_child不消失的問題（手機hover的bug) - */ - $('#mobile-sidebar-menus .menus-expand').on('click', function () { - if ($(this).hasClass('menus-closed')) { - $(this).parents('.menus_item').find('.menus_item_child').slideDown() - $(this).removeClass('menus-closed') - } else { - $(this).parents('.menus_item').find('.menus_item_child').slideUp() - $(this).addClass('menus-closed') + // find head position & add active class + // DOM Hierarchy: + // ol.toc > (li.toc-item, ...) + // li.toc-item > (a.toc-link, ol.toc-2child > (li.toc-item, ...)) + const findHeadPosition = function (top) { + // assume that we are not in the post page if no TOC link be found, + // thus no need to update the status + if ($('.toc-link').length === 0) { + return false } + + const list = $('#article-container').find('h1,h2,h3,h4,h5,h6') + let currentId = '' + list.each(function () { + const head = $(this) + if (top > head.offset().top - 25) { + currentId = '#' + encodeURI($(this).attr('id')) + } + }) + + if (currentId === '') { + $('.toc-link').removeClass('active') + $('.toc-child').hide() + } + + const currentActive = $('.toc-link.active') + if (currentId && currentActive.attr('href') !== currentId) { + if (isAnchor) updateAnchor(currentId) + + $('.toc-link').removeClass('active') + + const _this = $('.toc-link[href="' + currentId + '"]') + _this.addClass('active') + + const parents = _this.parents('.toc-child') + // Returned list is in reverse order of the DOM elements + // Thus `parents.last()` is the outermost .toc-child container + // i.e. list of subsections + const topLink = (parents.length > 0) ? parents.last() : _this + expandToc(topLink.closest('.toc-item').find('.toc-child')) + topLink + // Find all top-level .toc-item containers, i.e. sections + // excluding the currently active one + .closest('.toc-item').siblings('.toc-item') + // Hide their respective list of subsections + .find('.toc-child').hide() + } + } + + const autoScrollToc = function (currentTop) { + if ($('.toc-link').hasClass('active')) { + const activePosition = $('.active').offset().top + const sidebarScrollTop = $('#sidebar .sidebar-toc__content').scrollTop() + if (activePosition > (currentTop + $(window).height() - 100)) { + $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrollTop + 100) + } + if (activePosition < currentTop + 100) { + $('#sidebar .sidebar-toc__content').scrollTop(sidebarScrollTop - 100) + } + } + } +} + +/** + * Rightside + */ + +const $rightsideEle = $('#rightside') + +// read-mode +$rightsideEle.on('click', '#readmode', function () { + $('body').toggleClass('read-mode') +}) + +// font change +const originFontSize = $('body').css('font-size') +$rightsideEle.on('click', '#font_plus', () => { + const nowFontSize = parseFloat($('body').css('font-size')) + if (nowFontSize < 20) { + $('body').css('font-size', nowFontSize + 1) + } +}) + +$rightsideEle.on('click', '#font_minus', () => { + const nowFontSize = parseFloat($('body').css('font-size')) + if (nowFontSize > 10) { + $('body').css('font-size', nowFontSize - 1) + } +}) + +// Switch Between Light And Dark Mode +if ($('#darkmode').length) { + const switchReadMode = function () { + const nowMode = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light' + if (nowMode === 'light') { + activateDarkMode() + Cookies.set('theme', 'dark', 2) + GLOBAL_CONFIG.Snackbar !== undefined && snackbarShow(GLOBAL_CONFIG.Snackbar.day_to_night) + } else { + activateLightMode() + Cookies.set('theme', 'light', 2) + GLOBAL_CONFIG.Snackbar !== undefined && snackbarShow(GLOBAL_CONFIG.Snackbar.night_to_day) + } + } + + $rightsideEle.on('click', '#darkmode', () => { + switchReadMode() + typeof utterancesTheme === 'function' && utterancesTheme() + typeof FB === 'object' && window.loadFBComment() + window.DISQUS && $('#disqus_thread').children().length && setTimeout(() => window.disqusReset(), 200) + }) +} + +// rightside 點擊設置 按鈕 展開 +$rightsideEle.on('click', '#rightside_config', () => $('#rightside-config-hide').toggleClass('show')) + +// Back to top +$rightsideEle.on('click', '#go-up', () => scrollToDest('body')) + +/** + * menu + * 側邊欄sub-menu 展開/收縮 + * 解決menus在觸摸屏下，滑動屏幕menus_item_child不消失的問題（手機hover的bug) + */ +const clickFnOfSubMenu = function () { + $('#mobile-sidebar-menus .expand').on('click', function () { + $(this).parents('.menus_item').find('> .menus_item_child').slideToggle() + $(this).toggleClass('closed') }) $(window).on('touchmove', function (e) { - var $menusChild = $('#nav .menus_item_child') + const $menusChild = $('#nav .menus_item_child') if ($menusChild.is(':visible')) { $menusChild.css('display', 'none') } }) +} - /** - * rightside 點擊設置 按鈕 展開 - */ - $('#rightside_config').on('click', function () { - if ($('#rightside-config-hide').hasClass('rightside-in')) { - $('#rightside-config-hide').removeClass('rightside-in').addClass('rightside-out') +/** + * 複製時加上版權信息 + */ +const addCopyright = () => { + const copyright = GLOBAL_CONFIG.copyright + document.body.oncopy = (e) => { + e.preventDefault() + let textFont; const copyFont = window.getSelection(0).toString() + if (copyFont.length > copyright.limitCount) { + textFont = copyFont + '\n' + '\n' + '\n' + + copyright.languages.author + '\n' + + copyright.languages.link + window.location.href + '\n' + + copyright.languages.source + '\n' + + copyright.languages.info } else { - $('#rightside-config-hide').removeClass('rightside-out').addClass('rightside-in') + textFont = copyFont } - }) - - /** - * 複製時加上版權信息 - */ - var copyright = GLOBAL_CONFIG.copyright - if (copyright !== undefined) { - document.body.oncopy = function (event) { - event.preventDefault() - let textFont; const copyFont = window.getSelection(0).toString() - if (copyFont.length > 45) { - textFont = copyFont + '\n' + '\n' + '\n' + - copyright.languages.author + '\n' + - copyright.languages.link + window.location.href + '\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) - } - } - } - - /** - * Darkmode - */ - var $darkModeButtom = $('#darkmode') - function switchReadMode () { - var nowMode = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light' - if (nowMode === 'light') { - activateDarkMode() - Cookies.set('theme', 'dark', 2) - if (isSnackbar) snackbarShow(GLOBAL_CONFIG.Snackbar.day_to_night) + if (e.clipboardData) { + return e.clipboardData.setData('text', textFont) } else { - activateLightMode() - Cookies.set('theme', 'light', 2) - if (isSnackbar) snackbarShow(GLOBAL_CONFIG.Snackbar.night_to_day) + return window.clipboardData.setData('text', textFont) } } +} - $darkModeButtom.click(function () { - switchReadMode() - if (typeof utterancesTheme === 'function') utterancesTheme() - }) - - /** - * 網頁運行時間 - */ - if (GLOBAL_CONFIG.runtime) { - // get user config - var $runtimeCount = $('#webinfo-runtime-count') - var startDate = $runtimeCount.attr('publish_date') - var showDateTime = function () { - var BirthDay = new Date(startDate) - var today = new Date() - var timeold = (today.getTime() - BirthDay.getTime()) - var daysold = Math.floor(timeold / (24 * 60 * 60 * 1000)) - $runtimeCount.text(daysold + ' ' + GLOBAL_CONFIG.runtime_unit) - } - var interval - showDateTime() - clearInterval(interval) - interval = setInterval(showDateTime, 10000) +/** + * 網頁運行時間 + */ +const addRuntime = () => { + const $runtimeCount = $('#webinfo-runtime-count') + if ($runtimeCount.length) { + const publishDate = $runtimeCount.attr('publish_date') + $runtimeCount.text(diffDate(publishDate) + ' ' + GLOBAL_CONFIG.runtime_unit) } +} - /** - * table overflow - */ - - var $table = $('#article-container table').not($('figure.highlight > table')) +/** + * table overflow + */ +const addTableWrap = function () { + const $table = $('#article-container table').not($('figure.highlight > table')) $table.each(function () { $(this).wrap('
    ') }) +} - /** - * 百度推送 - */ - if (GLOBAL_CONFIG.baiduPush) { - (function () { - var bp = document.createElement('script') - var curProtocol = window.location.protocol.split(':')[0] - if (curProtocol === 'https') { - bp.src = 'https://zz.bdstatic.com/linksubmit/push.js' - } else { - bp.src = 'http://push.zhanzhang.baidu.com/push.js' - } - var s = document.getElementsByTagName('script')[0] - s.parentNode.insertBefore(bp, s) - })() +/** + * 百度推送 + */ +const pushToBaidu = () => { + const bp = document.createElement('script') + const curProtocol = window.location.protocol.split(':')[0] + if (curProtocol === 'https') { + bp.src = 'https://zz.bdstatic.com/linksubmit/push.js' + } else { + bp.src = 'http://push.zhanzhang.baidu.com/push.js' } + bp.dataset.pjax = '' + const s = document.getElementsByTagName('script')[0] + s.parentNode.insertBefore(bp, s) +} - /** - * tag-hide - */ - var $hideInline = $('.hide-button') +/** + * tag-hide + */ +const clickFnOfTagHide = function () { + const $hideInline = $('.hide-button') if ($hideInline.length) { $hideInline.on('click', function (e) { - var $this = $(this) - var $hideContent = $(this).next('.hide-content') + const $this = $(this) + const $hideContent = $(this).next('.hide-content') $this.toggleClass('open') $hideContent.toggle() if ($this.hasClass('open')) { - if (isJustifiedGallery && $hideContent.find('.justified-gallery').length > 0) { + if ($hideContent.find('.justified-gallery').length > 0) { initJustifiedGallery($hideContent.find('.justified-gallery')) } } }) } +} +const clickFnOfTabs = function () { const $tab = $('#article-container .tabs') - $tab.find('.tab button').on('click', function (e) { + $tab.find('.tab > button').on('click', function (e) { const $this = $(this) const $tabItem = $this.parent() if (!$tabItem.hasClass('active')) { - const $tacbContent = $this.parents('.nav-tabs').next() + const $tabContent = $this.parents('.nav-tabs').next() $tabItem.siblings('.active').removeClass('active') $tabItem.addClass('active') const tabId = $this.attr('data-href') - $tacbContent.find('> .tab-item-content').removeClass('active') - $tacbContent.find(`> ${tabId}`).addClass('active') - const $isTabJustifiedGallery = $tacbContent.find(tabId).find('.justified-gallery') - if (isJustifiedGallery && $isTabJustifiedGallery.length > 0) { + $tabContent.find('> .tab-item-content').removeClass('active') + $tabContent.find(`> ${tabId}`).addClass('active') + const $isTabJustifiedGallery = $tabContent.find(tabId).find('.justified-gallery') + if ($isTabJustifiedGallery.length > 0) { initJustifiedGallery($isTabJustifiedGallery) } } }) +} - var $cardCategory = $('.card-category-list-item.parent a') +const toggleCardCategory = function () { + const $cardCategory = $('.card-category-list-item.parent i') $cardCategory.on('click', function (e) { - if ($(event.target).hasClass('card-category-list-icon')) { - var $this = $(this) - $this.find('.card-category-list-icon').toggleClass('expand') - $this.parent().next().toggle() - return false + e.preventDefault() + const $this = $(this) + $this.toggleClass('expand') + $this.parents('.parent').next().toggle() + }) +} + +const switchComments = function () { + let switchDone = false + $('#switch-comments-btn').on('click', function () { + $('#post-comment > .comment-wrap > div').each(function () { + if ($(this).is(':visible')) { + $(this).hide() + } else { + $(this).css({ + display: 'block', + animation: 'tabshow .5s' + }) + } + }) + if (!switchDone && typeof loadOtherComment === 'function') { + switchDone = true + loadOtherComment() } }) +} + +const addPostOutdateNotice = function () { + const data = GLOBAL_CONFIG.noticeOutdate + var diffDay = diffDate(GLOBAL_CONFIG_SITE.postUpdate) + if (diffDay >= data.limitDay) { + const code = `
    ${data.messagePrev + ' ' + diffDay + ' ' + data.messageNext}
    ` + if (data.position === 'top') { + $('#article-container').prepend(code) + } else { + $('#article-container').append(code) + } + } +} + +/** + * lazyload + */ + +if (GLOBAL_CONFIG.islazyload) { + window.lazyLoadOptions = { + elements_selector: 'img', + threshold: 0, + data_src: 'lazy-src' + } + window.addEventListener( + 'LazyLoad::Initialized', + function (event) { + window.lazyLoadInstance = event.detail.instance + }, + false + ) +} + +const unRefreshFn = function () { + $(window).on('resize', function () { + if (window.innerWidth < 768) adjustMenu(0) + else if ($('#sidebar').hasClass('tocOpenPc') && $('#nav').hasClass('fixed')) adjustMenu(1) + else adjustMenu(2) + }) + + clickFnOfSubMenu() + GLOBAL_CONFIG.copyright !== undefined && addCopyright() + GLOBAL_CONFIG.baiduPush && pushToBaidu() +} + +const refreshFn = function () { + initAdjust() + + if (GLOBAL_CONFIG_SITE.isPost) { + OpenSidebarAuto() + toggleSidebar() + GLOBAL_CONFIG_SITE.isSidebar && tocFn() + GLOBAL_CONFIG.noticeOutdate !== undefined && addPostOutdateNotice() + } + + sidebarFn() + GLOBAL_CONFIG_SITE.isHome && scrollDownInIndex() + addHighlightTool() + GLOBAL_CONFIG.isPhotoFigcaption && addPhotoFigcaption() + runJustifiedGallery() + addLightBox() + scrollFn() + GLOBAL_CONFIG.runtime && addRuntime() + addTableWrap() + clickFnOfTagHide() + clickFnOfTabs() + toggleCardCategory() + switchComments() +} + +$(function () { + refreshFn() + unRefreshFn() }) diff --git a/source/js/search/algolia.js b/source/js/search/algolia.js index b8b63e9..4f0632b 100644 --- a/source/js/search/algolia.js +++ b/source/js/search/algolia.js @@ -1,9 +1,9 @@ $(function () { - $('a.social-icon.search').on('click', function () { + const openSearch = () => { $('body').css({ width: '100%', overflow: 'hidden' }) - $('.search-dialog').css('display', 'block') + $('#algolia-search').css('display', 'block') $('.ais-search-box--input').focus() - $('.search-mask').fadeIn() + $('#search-mask').fadeIn() // shortcut: ESC document.addEventListener('keydown', function f (event) { if (event.code === 'Escape') { @@ -11,35 +11,43 @@ $(function () { document.removeEventListener('keydown', f) } }) - }) + } - var closeSearch = function () { - $('body').css('width', '') - $('body').css('overflow', '') - $('.search-dialog').css({ + const closeSearch = () => { + $('body').css({ width: '', overflow: '' }) + $('#algolia-search').css({ animation: 'search_close .5s' }) - $('.search-dialog').animate({}, function () { - setTimeout(function () { - $('.search-dialog').css({ - animation: '', - display: 'none' - }) - }, 500) - }) + setTimeout(function () { + $('#algolia-search').css({ + animation: '', + display: 'none' + }) + }, 500) - $('.search-mask').fadeOut() + $('#search-mask').fadeOut() } - $('.search-mask, .search-close-button').on('click touchstart', closeSearch) - var algolia = GLOBAL_CONFIG.algolia - var isAlgoliaValid = algolia.appId && algolia.apiKey && algolia.indexName + const searchClickFn = () => { + $('a.social-icon.search').on('click', openSearch) + $('#search-mask, .search-close-button').on('click touchstart', closeSearch) + } + + searchClickFn() + + window.addEventListener('pjax:success', function () { + closeSearch() + searchClickFn() + }) + + const algolia = GLOBAL_CONFIG.algolia + const isAlgoliaValid = algolia.appId && algolia.apiKey && algolia.indexName if (!isAlgoliaValid) { return console.error('Algolia setting is invalid!') } - var search = instantsearch({ + const search = instantsearch({ appId: algolia.appId, apiKey: algolia.apiKey, indexName: algolia.indexName, @@ -47,7 +55,7 @@ $(function () { hitsPerPage: algolia.hits.per_page || 10 }, searchFunction: function (helper) { - var searchInput = $('#algolia-search-input').find('input') + const searchInput = $('#algolia-search-input').find('input') if (searchInput.val()) { helper.search() @@ -68,7 +76,7 @@ $(function () { container: '#algolia-hits', templates: { item: function (data) { - var link = data.permalink ? data.permalink : (GLOBAL_CONFIG.root + data.path) + const link = data.permalink ? data.permalink : (GLOBAL_CONFIG.root + data.path) return ( '' + data._highlightResult.title.value + @@ -94,7 +102,7 @@ $(function () { container: '#algolia-stats', templates: { body: function (data) { - var stats = GLOBAL_CONFIG.algolia.languages.hits_stats + const stats = GLOBAL_CONFIG.algolia.languages.hits_stats .replace(/\$\{hits}/, data.nbHits) .replace(/\$\{time}/, data.processingTimeMS) return ( @@ -130,4 +138,8 @@ $(function () { }) ) search.start() + + window.pjax && search.on('render', () => { + window.pjax.refresh(document.getElementById('algolia-hits')) + }) }) diff --git a/source/js/search/local-search.js b/source/js/search/local-search.js index c2bee81..b23f1f2 100644 --- a/source/js/search/local-search.js +++ b/source/js/search/local-search.js @@ -1,13 +1,13 @@ $(function () { - var loadFlag = false - $('a.social-icon.search').on('click', function () { + let loadFlag = false + const openSearch = function () { $('body').css({ width: '100%', overflow: 'hidden' }) - $('.search-dialog').css('display', 'block') + $('#local-search').css('display', 'block') $('#local-search-input input').focus() - $('.search-mask').fadeIn() + $('#search-mask').fadeIn() if (!loadFlag) { search(GLOBAL_CONFIG.localSearch.path) loadFlag = true @@ -20,27 +20,37 @@ $(function () { document.removeEventListener('keydown', f) } }) - }) + } - var closeSearch = function () { - $('body').css('width', '') - $('body').css('overflow', '') - $('.search-dialog').css({ + const closeSearch = function () { + $('body').css({ + width: '', + overflow: '' + }) + $('#local-search').css({ animation: 'search_close .5s' }) - $('.search-dialog').animate({}, function () { - setTimeout(function () { - $('.search-dialog').css({ - animation: '', - display: 'none' - }) - }, 500) - }) + setTimeout(function () { + $('#local-search').css({ + animation: '', + display: 'none' + }) + }, 500) - $('.search-mask').fadeOut() + $('#search-mask').fadeOut() } - $('.search-mask, .search-close-button').on('click touchstart', closeSearch) + + const searchClickFn = () => { + $('a.social-icon.search').on('click', openSearch) + $('#search-mask, .search-close-button').on('click', closeSearch) + } + + searchClickFn() + window.addEventListener('pjax:success', function () { + $('#local-search').is(':visible') && closeSearch() + searchClickFn() + }) function search (path) { $.ajax({ @@ -48,7 +58,7 @@ $(function () { dataType: 'xml', success: function (xmlResponse) { // get the contents from search data - var datas = $('entry', xmlResponse).map(function () { + const datas = $('entry', xmlResponse).map(function () { return { title: $('title', this).text(), content: $('content', this).text(), @@ -56,29 +66,29 @@ $(function () { } }).get() - var $input = $('#local-search-input input')[0] - var $resultContent = $('#local-hits')[0] + const $input = $('#local-search-input input')[0] + const $resultContent = $('#local-hits')[0] $input.addEventListener('input', function () { - var str = '
    ' - var keywords = this.value.trim().toLowerCase().split(/[\s]+/) + let str = '
    ' + const keywords = this.value.trim().toLowerCase().split(/[\s]+/) $resultContent.innerHTML = '' if (this.value.trim().length <= 0) { $('.local-search-stats__hr').hide() return } - var count = 0 + let count = 0 // perform local searching datas.forEach(function (data) { - var isMatch = true + let isMatch = true if (!data.title || data.title.trim() === '') { data.title = 'Untitled' } - var dataTitle = data.title.trim().toLowerCase() - var dataContent = data.content.trim().replace(/<[^>]+>/g, '').toLowerCase() - var dataUrl = data.url - var indexTitle = -1 - var indexContent = -1 - var firstOccur = -1 + let dataTitle = data.title.trim().toLowerCase() + const dataContent = data.content.trim().replace(/<[^>]+>/g, '').toLowerCase() + const dataUrl = data.url + let indexTitle = -1 + let indexContent = -1 + let firstOccur = -1 // only match artiles with not empty titles and contents if (dataTitle !== '' || dataContent !== '') { keywords.forEach(function (keyword, i) { @@ -101,11 +111,11 @@ $(function () { // show search results if (isMatch) { - var content = data.content.trim().replace(/<[^>]+>/g, '') + const content = data.content.trim().replace(/<[^>]+>/g, '') if (firstOccur >= 0) { // cut out 130 characters - var start = firstOccur - 30 - var end = firstOccur + 100 + let start = firstOccur - 30 + let end = firstOccur + 100 if (start < 0) { start = 0 @@ -119,11 +129,11 @@ $(function () { end = content.length } - var matchContent = content.substring(start, end) + let matchContent = content.substring(start, end) // highlight all keywords keywords.forEach(function (keyword) { - var regS = new RegExp(keyword, 'gi') + const regS = new RegExp(keyword, 'gi') matchContent = matchContent.replace(regS, '' + keyword + '') dataTitle = dataTitle.replace(regS, '' + keyword + '') }) @@ -145,6 +155,7 @@ $(function () { } str += '
    ' $resultContent.innerHTML = str + window.pjax && window.pjax.refresh($resultContent) }) } }) diff --git a/source/js/third-party/piao.js b/source/js/third-party/piao.js index 1e020ba..2b59f0a 100644 --- a/source/js/third-party/piao.js +++ b/source/js/third-party/piao.js @@ -1,334 +1,332 @@ - - (function (name, factory) { - if (typeof window === "object") { - window[name] = factory() - } - })("Ribbons", function () { - var _w = window, - _b = document.body, - _d = document.documentElement; - var random = function () { - if (arguments.length === 1) { - if (Array.isArray(arguments[0])) { - var index = Math.round(random(0, arguments[0].length - 1)); - return arguments[0][index] - } - return random(0, arguments[0]) - } else if (arguments.length === 2) { - return Math.random() * (arguments[1] - arguments[0]) + arguments[0] - } - return 0 - }; - var screenInfo = function (e) { - var width = Math.max(0, _w.innerWidth || _d.clientWidth || _b.clientWidth || 0), - height = Math.max(0, _w.innerHeight || _d.clientHeight || _b.clientHeight || 0), - scrollx = Math.max(0, _w.pageXOffset || _d.scrollLeft || _b.scrollLeft || 0) - (_d.clientLeft || 0), - scrolly = Math.max(0, _w.pageYOffset || _d.scrollTop || _b.scrollTop || 0) - (_d.clientTop || 0); - return { - width: width, - height: height, - ratio: width / height, - centerx: width / 2, - centery: height / 2, - scrollx: scrollx, - scrolly: scrolly - } - }; - var mouseInfo = function (e) { - var screen = screenInfo(e), - mousex = e ? Math.max(0, e.pageX || e.clientX || 0) : 0, - mousey = e ? Math.max(0, e.pageY || e.clientY || 0) : 0; - return { - mousex: mousex, - mousey: mousey, - centerx: mousex - screen.width / 2, - centery: mousey - screen.height / 2 - } - }; - var Point = function (x, y) { - this.x = 0; - this.y = 0; - this.set(x, y) - }; - Point.prototype = { - constructor: Point, - set: function (x, y) { - this.x = x || 0; - this.y = y || 0 - }, - copy: function (point) { - this.x = point.x || 0; - this.y = point.y || 0; - return this - }, - multiply: function (x, y) { - this.x *= x || 1; - this.y *= y || 1; - return this - }, - divide: function (x, y) { - this.x /= x || 1; - this.y /= y || 1; - return this - }, - add: function (x, y) { - this.x += x || 0; - this.y += y || 0; - return this - }, - subtract: function (x, y) { - this.x -= x || 0; - this.y -= y || 0; - return this - }, - clampX: function (min, max) { - this.x = Math.max(min, Math.min(this.x, max)); - return this - }, - clampY: function (min, max) { - this.y = Math.max(min, Math.min(this.y, max)); - return this - }, - flipX: function () { - this.x *= -1; - return this - }, - flipY: function () { - this.y *= -1; - return this - } - }; - var Factory = function (options) { - this._canvas = null; - this._context = null; - this._sto = null; - this._width = 0; - this._height = 0; - this._scroll = 0; - this._ribbons = []; - this._options = { - colorSaturation: "80%", - colorBrightness: "60%", - colorAlpha: 0.65, - colorCycleSpeed: 6, - verticalPosition: "center", - horizontalSpeed: 150, - ribbonCount: 5, - strokeSize: 5, - parallaxAmount: -0.5, - animateSections: true - }; - this._onDraw = this._onDraw.bind(this); - this._onResize = this._onResize.bind(this); - this._onScroll = this._onScroll.bind(this); - this.setOptions(options); - this.init() - }; - Factory.prototype = { - constructor: Factory, - setOptions: function (options) { - if (typeof options === "object") { - for (var key in options) { - if (options.hasOwnProperty(key)) { - this._options[key] = options[key] - } - } - } - }, - init: function () { - try { - this._canvas = document.createElement("canvas"); - this._canvas.style["display"] = "block"; - this._canvas.style["position"] = "fixed"; - this._canvas.style["margin"] = "0"; - this._canvas.style["padding"] = "0"; - this._canvas.style["border"] = "0"; - this._canvas.style["outline"] = "0"; - this._canvas.style["left"] = "0"; - this._canvas.style["top"] = "0"; - this._canvas.style["width"] = "100%"; - this._canvas.style["height"] = "100%"; - this._canvas.style["z-index"] = "-1"; - this._onResize(); - this._context = this._canvas.getContext("2d"); - this._context.clearRect(0, 0, this._width, this._height); - this._context.globalAlpha = this._options.colorAlpha; - window.addEventListener("resize", this._onResize); - window.addEventListener("scroll", this._onScroll); - document.body.appendChild(this._canvas) - } catch (e) { - console.warn("Canvas Context Error: " + e.toString()); - return - } - this._onDraw() - }, - addRibbon: function () { - var dir = Math.round(random(1, 9)) > 5 ? "right" : "left", - stop = 1000, - hide = 200, - min = 0 - hide, - max = this._width + hide, - movex = 0, - movey = 0, - startx = dir === "right" ? min : max, - starty = Math.round(random(0, this._height)); - if (/^(top|min)$/i.test(this._options.verticalPosition)) { - starty = 0 + hide - } else if (/^(middle|center)$/i.test(this._options.verticalPosition)) { - starty = this._height / 2 - } else if (/^(bottom|max)$/i.test(this._options.verticalPosition)) { - starty = this._height - hide - } - var ribbon = [], - point1 = new Point(startx, starty), - point2 = new Point(startx, starty), - point3 = null, - color = Math.round(random(0, 360)), - delay = 0; - while (true) { - if (stop <= 0) break; - stop--; - movex = Math.round((Math.random() * 1 - 0.2) * this._options.horizontalSpeed); - movey = Math.round((Math.random() * 1 - 0.5) * (this._height * 0.25)); - point3 = new Point(); - point3.copy(point2); - if (dir === "right") { - point3.add(movex, movey); - if (point2.x >= max) break - } else if (dir === "left") { - point3.subtract(movex, movey); - if (point2.x <= min) break - } - ribbon.push({ - point1: new Point(point1.x, point1.y), - point2: new Point(point2.x, point2.y), - point3: point3, - color: color, - delay: delay, - dir: dir, - alpha: 0, - phase: 0 - }); - point1.copy(point2); - point2.copy(point3); - delay += 4; - color += this._options.colorCycleSpeed - } - this._ribbons.push(ribbon) - }, - _drawRibbonSection: function (section) { - if (section) { - if (section.phase >= 1 && section.alpha <= 0) { - return true - } - if (section.delay <= 0) { - section.phase += 0.02; - section.alpha = Math.sin(section.phase) * 1; - section.alpha = section.alpha <= 0 ? 0 : section.alpha; - section.alpha = section.alpha >= 1 ? 1 : section.alpha; - if (this._options.animateSections) { - var mod = Math.sin(1 + section.phase * Math.PI / 2) * 0.1; - if (section.dir === "right") { - section.point1.add(mod, 0); - section.point2.add(mod, 0); - section.point3.add(mod, 0) - } else { - section.point1.subtract(mod, 0); - section.point2.subtract(mod, 0); - section.point3.subtract(mod, 0) - } - section.point1.add(0, mod); - section.point2.add(0, mod); - section.point3.add(0, mod) - } - } else { - section.delay -= 0.5 - } - var s = this._options.colorSaturation, - l = this._options.colorBrightness, - c = "hsla(" + section.color + ", " + s + ", " + l + ", " + section.alpha + " )"; - this._context.save(); - if (this._options.parallaxAmount !== 0) { - this._context.translate(0, this._scroll * this._options.parallaxAmount) - } - this._context.beginPath(); - this._context.moveTo(section.point1.x, section.point1.y); - this._context.lineTo(section.point2.x, section.point2.y); - this._context.lineTo(section.point3.x, section.point3.y); - this._context.fillStyle = c; - this._context.fill(); - if (this._options.strokeSize > 0) { - this._context.lineWidth = this._options.strokeSize; - this._context.strokeStyle = c; - this._context.lineCap = "round"; - this._context.stroke() - } - this._context.restore() - } - return false - }, - _onDraw: function () { - for (var i = 0, t = this._ribbons.length; i < t; ++i) { - if (!this._ribbons[i]) { - this._ribbons.splice(i, 1) - } - } - this._context.clearRect(0, 0, this._width, this._height); - for (var a = 0; a < this._ribbons.length; ++a) { - var ribbon = this._ribbons[a], - numSections = ribbon.length, - numDone = 0; - for (var b = 0; b < numSections; ++b) { - if (this._drawRibbonSection(ribbon[b])) { - numDone++ - } - } - if (numDone >= numSections) { - this._ribbons[a] = null - } - } - if (this._ribbons.length < this._options.ribbonCount) { - this.addRibbon() - } - requestAnimationFrame(this._onDraw) - }, - _onResize: function (e) { - var screen = screenInfo(e); - this._width = screen.width; - this._height = screen.height; - if (this._canvas) { - this._canvas.width = this._width; - this._canvas.height = this._height; - if (this._context) { - this._context.globalAlpha = this._options.colorAlpha - } - } - }, - _onScroll: function (e) { - var screen = screenInfo(e); - this._scroll = screen.scrolly - } - }; - return Factory - }); +(function (name, factory) { + if (typeof window === 'object') { + window[name] = factory() + } +})('Ribbons', function () { + var _w = window + var _b = document.body + var _d = document.documentElement + var random = function () { + if (arguments.length === 1) { + if (Array.isArray(arguments[0])) { + var index = Math.round(random(0, arguments[0].length - 1)) + return arguments[0][index] + } + return random(0, arguments[0]) + } else if (arguments.length === 2) { + return Math.random() * (arguments[1] - arguments[0]) + arguments[0] + } + return 0 + } + var screenInfo = function (e) { + var width = Math.max(0, _w.innerWidth || _d.clientWidth || _b.clientWidth || 0) + var height = Math.max(0, _w.innerHeight || _d.clientHeight || _b.clientHeight || 0) + var scrollx = Math.max(0, _w.pageXOffset || _d.scrollLeft || _b.scrollLeft || 0) - (_d.clientLeft || 0) + var scrolly = Math.max(0, _w.pageYOffset || _d.scrollTop || _b.scrollTop || 0) - (_d.clientTop || 0) + return { + width: width, + height: height, + ratio: width / height, + centerx: width / 2, + centery: height / 2, + scrollx: scrollx, + scrolly: scrolly + } + } + var mouseInfo = function (e) { + var screen = screenInfo(e) + var mousex = e ? Math.max(0, e.pageX || e.clientX || 0) : 0 + var mousey = e ? Math.max(0, e.pageY || e.clientY || 0) : 0 + return { + mousex: mousex, + mousey: mousey, + centerx: mousex - screen.width / 2, + centery: mousey - screen.height / 2 + } + } + var Point = function (x, y) { + this.x = 0 + this.y = 0 + this.set(x, y) + } + Point.prototype = { + constructor: Point, + set: function (x, y) { + this.x = x || 0 + this.y = y || 0 + }, + copy: function (point) { + this.x = point.x || 0 + this.y = point.y || 0 + return this + }, + multiply: function (x, y) { + this.x *= x || 1 + this.y *= y || 1 + return this + }, + divide: function (x, y) { + this.x /= x || 1 + this.y /= y || 1 + return this + }, + add: function (x, y) { + this.x += x || 0 + this.y += y || 0 + return this + }, + subtract: function (x, y) { + this.x -= x || 0 + this.y -= y || 0 + return this + }, + clampX: function (min, max) { + this.x = Math.max(min, Math.min(this.x, max)) + return this + }, + clampY: function (min, max) { + this.y = Math.max(min, Math.min(this.y, max)) + return this + }, + flipX: function () { + this.x *= -1 + return this + }, + flipY: function () { + this.y *= -1 + return this + } + } + var Factory = function (options) { + this._canvas = null + this._context = null + this._sto = null + this._width = 0 + this._height = 0 + this._scroll = 0 + this._ribbons = [] + this._options = { + colorSaturation: '80%', + colorBrightness: '60%', + colorAlpha: 0.65, + colorCycleSpeed: 6, + verticalPosition: 'center', + horizontalSpeed: 150, + ribbonCount: 5, + strokeSize: 5, + parallaxAmount: -0.5, + animateSections: true + } + this._onDraw = this._onDraw.bind(this) + this._onResize = this._onResize.bind(this) + this._onScroll = this._onScroll.bind(this) + this.setOptions(options) + this.init() + } + Factory.prototype = { + constructor: Factory, + setOptions: function (options) { + if (typeof options === 'object') { + for (var key in options) { + if (options.hasOwnProperty(key)) { + this._options[key] = options[key] + } + } + } + }, + init: function () { + try { + this._canvas = document.createElement('canvas') + this._canvas.style.display = 'block' + this._canvas.style.position = 'fixed' + this._canvas.style.margin = '0' + this._canvas.style.padding = '0' + this._canvas.style.border = '0' + this._canvas.style.outline = '0' + this._canvas.style.left = '0' + this._canvas.style.top = '0' + this._canvas.style.width = '100%' + this._canvas.style.height = '100%' + this._canvas.style['z-index'] = '-1' + this._onResize() + this._context = this._canvas.getContext('2d') + this._context.clearRect(0, 0, this._width, this._height) + this._context.globalAlpha = this._options.colorAlpha + window.addEventListener('resize', this._onResize) + window.addEventListener('scroll', this._onScroll) + document.body.appendChild(this._canvas) + } catch (e) { + console.warn('Canvas Context Error: ' + e.toString()) + return + } + this._onDraw() + }, + addRibbon: function () { + var dir = Math.round(random(1, 9)) > 5 ? 'right' : 'left' + var stop = 1000 + var hide = 200 + var min = 0 - hide + var max = this._width + hide + var movex = 0 + var movey = 0 + var startx = dir === 'right' ? min : max + var starty = Math.round(random(0, this._height)) + if (/^(top|min)$/i.test(this._options.verticalPosition)) { + starty = 0 + hide + } else if (/^(middle|center)$/i.test(this._options.verticalPosition)) { + starty = this._height / 2 + } else if (/^(bottom|max)$/i.test(this._options.verticalPosition)) { + starty = this._height - hide + } + var ribbon = [] + var point1 = new Point(startx, starty) + var point2 = new Point(startx, starty) + var point3 = null + var color = Math.round(random(0, 360)) + var delay = 0 + while (true) { + if (stop <= 0) break + stop-- + movex = Math.round((Math.random() * 1 - 0.2) * this._options.horizontalSpeed) + movey = Math.round((Math.random() * 1 - 0.5) * (this._height * 0.25)) + point3 = new Point() + point3.copy(point2) + if (dir === 'right') { + point3.add(movex, movey) + if (point2.x >= max) break + } else if (dir === 'left') { + point3.subtract(movex, movey) + if (point2.x <= min) break + } + ribbon.push({ + point1: new Point(point1.x, point1.y), + point2: new Point(point2.x, point2.y), + point3: point3, + color: color, + delay: delay, + dir: dir, + alpha: 0, + phase: 0 + }) + point1.copy(point2) + point2.copy(point3) + delay += 4 + color += this._options.colorCycleSpeed + } + this._ribbons.push(ribbon) + }, + _drawRibbonSection: function (section) { + if (section) { + if (section.phase >= 1 && section.alpha <= 0) { + return true + } + if (section.delay <= 0) { + section.phase += 0.02 + section.alpha = Math.sin(section.phase) * 1 + section.alpha = section.alpha <= 0 ? 0 : section.alpha + section.alpha = section.alpha >= 1 ? 1 : section.alpha + if (this._options.animateSections) { + var mod = Math.sin(1 + section.phase * Math.PI / 2) * 0.1 + if (section.dir === 'right') { + section.point1.add(mod, 0) + section.point2.add(mod, 0) + section.point3.add(mod, 0) + } else { + section.point1.subtract(mod, 0) + section.point2.subtract(mod, 0) + section.point3.subtract(mod, 0) + } + section.point1.add(0, mod) + section.point2.add(0, mod) + section.point3.add(0, mod) + } + } else { + section.delay -= 0.5 + } + var s = this._options.colorSaturation + var l = this._options.colorBrightness + var c = 'hsla(' + section.color + ', ' + s + ', ' + l + ', ' + section.alpha + ' )' + this._context.save() + if (this._options.parallaxAmount !== 0) { + this._context.translate(0, this._scroll * this._options.parallaxAmount) + } + this._context.beginPath() + this._context.moveTo(section.point1.x, section.point1.y) + this._context.lineTo(section.point2.x, section.point2.y) + this._context.lineTo(section.point3.x, section.point3.y) + this._context.fillStyle = c + this._context.fill() + if (this._options.strokeSize > 0) { + this._context.lineWidth = this._options.strokeSize + this._context.strokeStyle = c + this._context.lineCap = 'round' + this._context.stroke() + } + this._context.restore() + } + return false + }, + _onDraw: function () { + for (var i = 0, t = this._ribbons.length; i < t; ++i) { + if (!this._ribbons[i]) { + this._ribbons.splice(i, 1) + } + } + this._context.clearRect(0, 0, this._width, this._height) + for (var a = 0; a < this._ribbons.length; ++a) { + var ribbon = this._ribbons[a] + var numSections = ribbon.length + var numDone = 0 + for (var b = 0; b < numSections; ++b) { + if (this._drawRibbonSection(ribbon[b])) { + numDone++ + } + } + if (numDone >= numSections) { + this._ribbons[a] = null + } + } + if (this._ribbons.length < this._options.ribbonCount) { + this.addRibbon() + } + requestAnimationFrame(this._onDraw) + }, + _onResize: function (e) { + var screen = screenInfo(e) + this._width = screen.width + this._height = screen.height + if (this._canvas) { + this._canvas.width = this._width + this._canvas.height = this._height + if (this._context) { + this._context.globalAlpha = this._options.colorAlpha + } + } + }, + _onScroll: function (e) { + var screen = screenInfo(e) + this._scroll = screen.scrolly + } + } + return Factory +}) - var cn = document.getElementById('ribbon_piao'); - var mb = cn.getAttribute("mobile"); - - if ( mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) { +var cn = document.getElementById('ribbon_piao') +var mb = cn.getAttribute('mobile') - } else { - new Ribbons({ - colorSaturation: "60%", - colorBrightness: "50%", - colorAlpha: 0.5, - colorCycleSpeed: 5, - verticalPosition: "random", - horizontalSpeed: 200, - ribbonCount: 3, - strokeSize: 0, - parallaxAmount: -0.2, - animateSections: true - }); - } +if (mb == 'false' && (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent))) { +} else { + new Ribbons({ + colorSaturation: '60%', + colorBrightness: '50%', + colorAlpha: 0.5, + colorCycleSpeed: 5, + verticalPosition: 'random', + horizontalSpeed: 200, + ribbonCount: 3, + strokeSize: 0, + parallaxAmount: -0.2, + animateSections: true + }) +} diff --git a/source/js/tw_cn.js b/source/js/tw_cn.js index f285a4c..c1744ed 100644 --- a/source/js/tw_cn.js +++ b/source/js/tw_cn.js @@ -1,98 +1,98 @@ -var translate = GLOBAL_CONFIG.translate -var snackbarData = GLOBAL_CONFIG.Snackbar - -var defaultEncoding = translate.defaultEncoding // 網站默認語言，1: 繁體中文, 2: 簡體中文 -var translateDelay = translate.translateDelay // 延遲時間,若不在前, 要設定延遲翻譯時間, 如100表示100ms,默認為0 -var msgToTraditionalChinese = translate.msgToTraditionalChinese // 此處可以更改為你想要顯示的文字 -var msgToSimplifiedChinese = translate.msgToSimplifiedChinese // 同上，但兩處均不建議更改 -var translateButtonId = 'translateLink' // 默認互換id -var currentEncoding = defaultEncoding -var targetEncodingCookie = 'translate-chn-cht' -var targetEncoding = - Cookies.get(targetEncodingCookie) == undefined - ? defaultEncoding - : Cookies.get(targetEncodingCookie) -var translateButtonObject -var isSnackbar = GLOBAL_CONFIG.Snackbar !== undefined - -function translateText (txt) { - if (txt == '' || txt == null) return '' - if (currentEncoding == 1 && targetEncoding == 2) return Simplized(txt) - else if (currentEncoding == 2 && targetEncoding == 1) { return Traditionalized(txt) } else return txt -} -function translateBody (fobj) { - if (typeof fobj === 'object') var objs = fobj.childNodes - else var objs = document.body.childNodes - for (var i = 0; i < objs.length; i++) { - var obj = objs.item(i) - if ( - '||BR|HR|TEXTAREA|'.indexOf('|' + obj.tagName + '|') > 0 || - obj == translateButtonObject - ) { continue } - if (obj.title != '' && obj.title != null) { obj.title = translateText(obj.title) } - if (obj.alt != '' && obj.alt != null) obj.alt = translateText(obj.alt) - if ( - obj.tagName == 'INPUT' && - obj.value != '' && - obj.type != 'text' && - obj.type != 'hidden' - ) { obj.value = translateText(obj.value) } - if (obj.nodeType == 3) obj.data = translateText(obj.data) - else translateBody(obj) - } -} -function translatePage () { - if (targetEncoding == 1) { - currentEncoding = 1 - targetEncoding = 2 - translateButtonObject.innerHTML = msgToTraditionalChinese - Cookies.set(targetEncodingCookie, targetEncoding, 2) - translateBody() - if (isSnackbar) snackbarShow(snackbarData.cht_to_chs) - } else if (targetEncoding == 2) { - currentEncoding = 2 - targetEncoding = 1 - translateButtonObject.innerHTML = msgToSimplifiedChinese - Cookies.set(targetEncodingCookie, targetEncoding, 2) - translateBody() - if (isSnackbar) snackbarShow(snackbarData.chs_to_cht) - } -} -function JTPYStr () { - return '万与丑专业丛东丝丢两严丧个丬丰临为丽举么义乌乐乔习乡书买乱争于亏云亘亚产亩亲亵亸亿仅从仑仓仪们价众优伙会伛伞伟传伤伥伦伧伪伫体余佣佥侠侣侥侦侧侨侩侪侬俣俦俨俩俪俭债倾偬偻偾偿傥傧储傩儿兑兖党兰关兴兹养兽冁内冈册写军农冢冯冲决况冻净凄凉凌减凑凛几凤凫凭凯击凼凿刍划刘则刚创删别刬刭刽刿剀剂剐剑剥剧劝办务劢动励劲劳势勋勐勚匀匦匮区医华协单卖卢卤卧卫却卺厂厅历厉压厌厍厕厢厣厦厨厩厮县参叆叇双发变叙叠叶号叹叽吁后吓吕吗吣吨听启吴呒呓呕呖呗员呙呛呜咏咔咙咛咝咤咴咸哌响哑哒哓哔哕哗哙哜哝哟唛唝唠唡唢唣唤唿啧啬啭啮啰啴啸喷喽喾嗫呵嗳嘘嘤嘱噜噼嚣嚯团园囱围囵国图圆圣圹场坂坏块坚坛坜坝坞坟坠垄垅垆垒垦垧垩垫垭垯垱垲垴埘埙埚埝埯堑堕塆墙壮声壳壶壸处备复够头夸夹夺奁奂奋奖奥妆妇妈妩妪妫姗姜娄娅娆娇娈娱娲娴婳婴婵婶媪嫒嫔嫱嬷孙学孪宁宝实宠审宪宫宽宾寝对寻导寿将尔尘尧尴尸尽层屃屉届属屡屦屿岁岂岖岗岘岙岚岛岭岳岽岿峃峄峡峣峤峥峦崂崃崄崭嵘嵚嵛嵝嵴巅巩巯币帅师帏帐帘帜带帧帮帱帻帼幂幞干并广庄庆庐庑库应庙庞废庼廪开异弃张弥弪弯弹强归当录彟彦彻径徕御忆忏忧忾怀态怂怃怄怅怆怜总怼怿恋恳恶恸恹恺恻恼恽悦悫悬悭悯惊惧惨惩惫惬惭惮惯愍愠愤愦愿慑慭憷懑懒懔戆戋戏戗战戬户扎扑扦执扩扪扫扬扰抚抛抟抠抡抢护报担拟拢拣拥拦拧拨择挂挚挛挜挝挞挟挠挡挢挣挤挥挦捞损捡换捣据捻掳掴掷掸掺掼揸揽揿搀搁搂搅携摄摅摆摇摈摊撄撑撵撷撸撺擞攒敌敛数斋斓斗斩断无旧时旷旸昙昼昽显晋晒晓晔晕晖暂暧札术朴机杀杂权条来杨杩杰极构枞枢枣枥枧枨枪枫枭柜柠柽栀栅标栈栉栊栋栌栎栏树栖样栾桊桠桡桢档桤桥桦桧桨桩梦梼梾检棂椁椟椠椤椭楼榄榇榈榉槚槛槟槠横樯樱橥橱橹橼檐檩欢欤欧歼殁殇残殒殓殚殡殴毁毂毕毙毡毵氇气氢氩氲汇汉污汤汹沓沟没沣沤沥沦沧沨沩沪沵泞泪泶泷泸泺泻泼泽泾洁洒洼浃浅浆浇浈浉浊测浍济浏浐浑浒浓浔浕涂涌涛涝涞涟涠涡涢涣涤润涧涨涩淀渊渌渍渎渐渑渔渖渗温游湾湿溃溅溆溇滗滚滞滟滠满滢滤滥滦滨滩滪漤潆潇潋潍潜潴澜濑濒灏灭灯灵灾灿炀炉炖炜炝点炼炽烁烂烃烛烟烦烧烨烩烫烬热焕焖焘煅煳熘爱爷牍牦牵牺犊犟状犷犸犹狈狍狝狞独狭狮狯狰狱狲猃猎猕猡猪猫猬献獭玑玙玚玛玮环现玱玺珉珏珐珑珰珲琎琏琐琼瑶瑷璇璎瓒瓮瓯电画畅畲畴疖疗疟疠疡疬疮疯疱疴痈痉痒痖痨痪痫痴瘅瘆瘗瘘瘪瘫瘾瘿癞癣癫癯皑皱皲盏盐监盖盗盘眍眦眬着睁睐睑瞒瞩矫矶矾矿砀码砖砗砚砜砺砻砾础硁硅硕硖硗硙硚确硷碍碛碜碱碹磙礼祎祢祯祷祸禀禄禅离秃秆种积称秽秾稆税稣稳穑穷窃窍窑窜窝窥窦窭竖竞笃笋笔笕笺笼笾筑筚筛筜筝筹签简箓箦箧箨箩箪箫篑篓篮篱簖籁籴类籼粜粝粤粪粮糁糇紧絷纟纠纡红纣纤纥约级纨纩纪纫纬纭纮纯纰纱纲纳纴纵纶纷纸纹纺纻纼纽纾线绀绁绂练组绅细织终绉绊绋绌绍绎经绐绑绒结绔绕绖绗绘给绚绛络绝绞统绠绡绢绣绤绥绦继绨绩绪绫绬续绮绯绰绱绲绳维绵绶绷绸绹绺绻综绽绾绿缀缁缂缃缄缅缆缇缈缉缊缋缌缍缎缏缐缑缒缓缔缕编缗缘缙缚缛缜缝缞缟缠缡缢缣缤缥缦缧缨缩缪缫缬缭缮缯缰缱缲缳缴缵罂网罗罚罢罴羁羟羡翘翙翚耢耧耸耻聂聋职聍联聩聪肃肠肤肷肾肿胀胁胆胜胧胨胪胫胶脉脍脏脐脑脓脔脚脱脶脸腊腌腘腭腻腼腽腾膑臜舆舣舰舱舻艰艳艹艺节芈芗芜芦苁苇苈苋苌苍苎苏苘苹茎茏茑茔茕茧荆荐荙荚荛荜荞荟荠荡荣荤荥荦荧荨荩荪荫荬荭荮药莅莜莱莲莳莴莶获莸莹莺莼萚萝萤营萦萧萨葱蒇蒉蒋蒌蓝蓟蓠蓣蓥蓦蔷蔹蔺蔼蕲蕴薮藁藓虏虑虚虫虬虮虽虾虿蚀蚁蚂蚕蚝蚬蛊蛎蛏蛮蛰蛱蛲蛳蛴蜕蜗蜡蝇蝈蝉蝎蝼蝾螀螨蟏衅衔补衬衮袄袅袆袜袭袯装裆裈裢裣裤裥褛褴襁襕见观觃规觅视觇览觉觊觋觌觍觎觏觐觑觞触觯詟誉誊讠计订讣认讥讦讧讨让讪讫训议讯记讱讲讳讴讵讶讷许讹论讻讼讽设访诀证诂诃评诅识诇诈诉诊诋诌词诎诏诐译诒诓诔试诖诗诘诙诚诛诜话诞诟诠诡询诣诤该详诧诨诩诪诫诬语诮误诰诱诲诳说诵诶请诸诹诺读诼诽课诿谀谁谂调谄谅谆谇谈谊谋谌谍谎谏谐谑谒谓谔谕谖谗谘谙谚谛谜谝谞谟谠谡谢谣谤谥谦谧谨谩谪谫谬谭谮谯谰谱谲谳谴谵谶谷豮贝贞负贠贡财责贤败账货质贩贪贫贬购贮贯贰贱贲贳贴贵贶贷贸费贺贻贼贽贾贿赀赁赂赃资赅赆赇赈赉赊赋赌赍赎赏赐赑赒赓赔赕赖赗赘赙赚赛赜赝赞赟赠赡赢赣赪赵赶趋趱趸跃跄跖跞践跶跷跸跹跻踊踌踪踬踯蹑蹒蹰蹿躏躜躯车轧轨轩轪轫转轭轮软轰轱轲轳轴轵轶轷轸轹轺轻轼载轾轿辀辁辂较辄辅辆辇辈辉辊辋辌辍辎辏辐辑辒输辔辕辖辗辘辙辚辞辩辫边辽达迁过迈运还这进远违连迟迩迳迹适选逊递逦逻遗遥邓邝邬邮邹邺邻郁郄郏郐郑郓郦郧郸酝酦酱酽酾酿释里鉅鉴銮錾钆钇针钉钊钋钌钍钎钏钐钑钒钓钔钕钖钗钘钙钚钛钝钞钟钠钡钢钣钤钥钦钧钨钩钪钫钬钭钮钯钰钱钲钳钴钵钶钷钸钹钺钻钼钽钾钿铀铁铂铃铄铅铆铈铉铊铋铍铎铏铐铑铒铕铗铘铙铚铛铜铝铞铟铠铡铢铣铤铥铦铧铨铪铫铬铭铮铯铰铱铲铳铴铵银铷铸铹铺铻铼铽链铿销锁锂锃锄锅锆锇锈锉锊锋锌锍锎锏锐锑锒锓锔锕锖锗错锚锜锞锟锠锡锢锣锤锥锦锨锩锫锬锭键锯锰锱锲锳锴锵锶锷锸锹锺锻锼锽锾锿镀镁镂镃镆镇镈镉镊镌镍镎镏镐镑镒镕镖镗镙镚镛镜镝镞镟镠镡镢镣镤镥镦镧镨镩镪镫镬镭镮镯镰镱镲镳镴镶长门闩闪闫闬闭问闯闰闱闲闳间闵闶闷闸闹闺闻闼闽闾闿阀阁阂阃阄阅阆阇阈阉阊阋阌阍阎阏阐阑阒阓阔阕阖阗阘阙阚阛队阳阴阵阶际陆陇陈陉陕陧陨险随隐隶隽难雏雠雳雾霁霉霭靓静靥鞑鞒鞯鞴韦韧韨韩韪韫韬韵页顶顷顸项顺须顼顽顾顿颀颁颂颃预颅领颇颈颉颊颋颌颍颎颏颐频颒颓颔颕颖颗题颙颚颛颜额颞颟颠颡颢颣颤颥颦颧风飏飐飑飒飓飔飕飖飗飘飙飚飞飨餍饤饥饦饧饨饩饪饫饬饭饮饯饰饱饲饳饴饵饶饷饸饹饺饻饼饽饾饿馀馁馂馃馄馅馆馇馈馉馊馋馌馍馎馏馐馑馒馓馔馕马驭驮驯驰驱驲驳驴驵驶驷驸驹驺驻驼驽驾驿骀骁骂骃骄骅骆骇骈骉骊骋验骍骎骏骐骑骒骓骔骕骖骗骘骙骚骛骜骝骞骟骠骡骢骣骤骥骦骧髅髋髌鬓魇魉鱼鱽鱾鱿鲀鲁鲂鲄鲅鲆鲇鲈鲉鲊鲋鲌鲍鲎鲏鲐鲑鲒鲓鲔鲕鲖鲗鲘鲙鲚鲛鲜鲝鲞鲟鲠鲡鲢鲣鲤鲥鲦鲧鲨鲩鲪鲫鲬鲭鲮鲯鲰鲱鲲鲳鲴鲵鲶鲷鲸鲹鲺鲻鲼鲽鲾鲿鳀鳁鳂鳃鳄鳅鳆鳇鳈鳉鳊鳋鳌鳍鳎鳏鳐鳑鳒鳓鳔鳕鳖鳗鳘鳙鳛鳜鳝鳞鳟鳠鳡鳢鳣鸟鸠鸡鸢鸣鸤鸥鸦鸧鸨鸩鸪鸫鸬鸭鸮鸯鸰鸱鸲鸳鸴鸵鸶鸷鸸鸹鸺鸻鸼鸽鸾鸿鹀鹁鹂鹃鹄鹅鹆鹇鹈鹉鹊鹋鹌鹍鹎鹏鹐鹑鹒鹓鹔鹕鹖鹗鹘鹚鹛鹜鹝鹞鹟鹠鹡鹢鹣鹤鹥鹦鹧鹨鹩鹪鹫鹬鹭鹯鹰鹱鹲鹳鹴鹾麦麸黄黉黡黩黪黾' -} -function FTPYStr () { - return '萬與醜專業叢東絲丟兩嚴喪個爿豐臨為麗舉麼義烏樂喬習鄉書買亂爭於虧雲亙亞產畝親褻嚲億僅從侖倉儀們價眾優夥會傴傘偉傳傷倀倫傖偽佇體餘傭僉俠侶僥偵側僑儈儕儂俁儔儼倆儷儉債傾傯僂僨償儻儐儲儺兒兌兗黨蘭關興茲養獸囅內岡冊寫軍農塚馮衝決況凍淨淒涼淩減湊凜幾鳳鳧憑凱擊氹鑿芻劃劉則剛創刪別剗剄劊劌剴劑剮劍剝劇勸辦務勱動勵勁勞勢勳猛勩勻匭匱區醫華協單賣盧鹵臥衛卻巹廠廳曆厲壓厭厙廁廂厴廈廚廄廝縣參靉靆雙發變敘疊葉號歎嘰籲後嚇呂嗎唚噸聽啟吳嘸囈嘔嚦唄員咼嗆嗚詠哢嚨嚀噝吒噅鹹呱響啞噠嘵嗶噦嘩噲嚌噥喲嘜嗊嘮啢嗩唕喚呼嘖嗇囀齧囉嘽嘯噴嘍嚳囁嗬噯噓嚶囑嚕劈囂謔團園囪圍圇國圖圓聖壙場阪壞塊堅壇壢壩塢墳墜壟壟壚壘墾坰堊墊埡墶壋塏堖塒塤堝墊垵塹墮壪牆壯聲殼壺壼處備複夠頭誇夾奪奩奐奮獎奧妝婦媽嫵嫗媯姍薑婁婭嬈嬌孌娛媧嫻嫿嬰嬋嬸媼嬡嬪嬙嬤孫學孿寧寶實寵審憲宮寬賓寢對尋導壽將爾塵堯尷屍盡層屭屜屆屬屢屨嶼歲豈嶇崗峴嶴嵐島嶺嶽崠巋嶨嶧峽嶢嶠崢巒嶗崍嶮嶄嶸嶔崳嶁脊巔鞏巰幣帥師幃帳簾幟帶幀幫幬幘幗冪襆幹並廣莊慶廬廡庫應廟龐廢廎廩開異棄張彌弳彎彈強歸當錄彠彥徹徑徠禦憶懺憂愾懷態慫憮慪悵愴憐總懟懌戀懇惡慟懨愷惻惱惲悅愨懸慳憫驚懼慘懲憊愜慚憚慣湣慍憤憒願懾憖怵懣懶懍戇戔戲戧戰戩戶紮撲扡執擴捫掃揚擾撫拋摶摳掄搶護報擔擬攏揀擁攔擰撥擇掛摯攣掗撾撻挾撓擋撟掙擠揮撏撈損撿換搗據撚擄摑擲撣摻摜摣攬撳攙擱摟攪攜攝攄擺搖擯攤攖撐攆擷擼攛擻攢敵斂數齋斕鬥斬斷無舊時曠暘曇晝曨顯晉曬曉曄暈暉暫曖劄術樸機殺雜權條來楊榪傑極構樅樞棗櫪梘棖槍楓梟櫃檸檉梔柵標棧櫛櫳棟櫨櫟欄樹棲樣欒棬椏橈楨檔榿橋樺檜槳樁夢檮棶檢欞槨櫝槧欏橢樓欖櫬櫚櫸檟檻檳櫧橫檣櫻櫫櫥櫓櫞簷檁歡歟歐殲歿殤殘殞殮殫殯毆毀轂畢斃氈毿氌氣氫氬氳彙漢汙湯洶遝溝沒灃漚瀝淪滄渢溈滬濔濘淚澩瀧瀘濼瀉潑澤涇潔灑窪浹淺漿澆湞溮濁測澮濟瀏滻渾滸濃潯濜塗湧濤澇淶漣潿渦溳渙滌潤澗漲澀澱淵淥漬瀆漸澠漁瀋滲溫遊灣濕潰濺漵漊潷滾滯灩灄滿瀅濾濫灤濱灘澦濫瀠瀟瀲濰潛瀦瀾瀨瀕灝滅燈靈災燦煬爐燉煒熗點煉熾爍爛烴燭煙煩燒燁燴燙燼熱煥燜燾煆糊溜愛爺牘犛牽犧犢強狀獷獁猶狽麅獮獰獨狹獅獪猙獄猻獫獵獼玀豬貓蝟獻獺璣璵瑒瑪瑋環現瑲璽瑉玨琺瓏璫琿璡璉瑣瓊瑤璦璿瓔瓚甕甌電畫暢佘疇癤療瘧癘瘍鬁瘡瘋皰屙癰痙癢瘂癆瘓癇癡癉瘮瘞瘺癟癱癮癭癩癬癲臒皚皺皸盞鹽監蓋盜盤瞘眥矓著睜睞瞼瞞矚矯磯礬礦碭碼磚硨硯碸礪礱礫礎硜矽碩硤磽磑礄確鹼礙磧磣堿镟滾禮禕禰禎禱禍稟祿禪離禿稈種積稱穢穠穭稅穌穩穡窮竊竅窯竄窩窺竇窶豎競篤筍筆筧箋籠籩築篳篩簹箏籌簽簡籙簀篋籜籮簞簫簣簍籃籬籪籟糴類秈糶糲粵糞糧糝餱緊縶糸糾紆紅紂纖紇約級紈纊紀紉緯紜紘純紕紗綱納紝縱綸紛紙紋紡紵紖紐紓線紺絏紱練組紳細織終縐絆紼絀紹繹經紿綁絨結絝繞絰絎繪給絢絳絡絕絞統綆綃絹繡綌綏絛繼綈績緒綾緓續綺緋綽緔緄繩維綿綬繃綢綯綹綣綜綻綰綠綴緇緙緗緘緬纜緹緲緝縕繢緦綞緞緶線緱縋緩締縷編緡緣縉縛縟縝縫縗縞纏縭縊縑繽縹縵縲纓縮繆繅纈繚繕繒韁繾繰繯繳纘罌網羅罰罷羆羈羥羨翹翽翬耮耬聳恥聶聾職聹聯聵聰肅腸膚膁腎腫脹脅膽勝朧腖臚脛膠脈膾髒臍腦膿臠腳脫腡臉臘醃膕齶膩靦膃騰臏臢輿艤艦艙艫艱豔艸藝節羋薌蕪蘆蓯葦藶莧萇蒼苧蘇檾蘋莖蘢蔦塋煢繭荊薦薘莢蕘蓽蕎薈薺蕩榮葷滎犖熒蕁藎蓀蔭蕒葒葤藥蒞蓧萊蓮蒔萵薟獲蕕瑩鶯蓴蘀蘿螢營縈蕭薩蔥蕆蕢蔣蔞藍薊蘺蕷鎣驀薔蘞藺藹蘄蘊藪槁蘚虜慮虛蟲虯蟣雖蝦蠆蝕蟻螞蠶蠔蜆蠱蠣蟶蠻蟄蛺蟯螄蠐蛻蝸蠟蠅蟈蟬蠍螻蠑螿蟎蠨釁銜補襯袞襖嫋褘襪襲襏裝襠褌褳襝褲襇褸襤繈襴見觀覎規覓視覘覽覺覬覡覿覥覦覯覲覷觴觸觶讋譽謄訁計訂訃認譏訐訌討讓訕訖訓議訊記訒講諱謳詎訝訥許訛論訩訟諷設訪訣證詁訶評詛識詗詐訴診詆謅詞詘詔詖譯詒誆誄試詿詩詰詼誠誅詵話誕詬詮詭詢詣諍該詳詫諢詡譸誡誣語誚誤誥誘誨誑說誦誒請諸諏諾讀諑誹課諉諛誰諗調諂諒諄誶談誼謀諶諜謊諫諧謔謁謂諤諭諼讒諮諳諺諦謎諞諝謨讜謖謝謠謗諡謙謐謹謾謫譾謬譚譖譙讕譜譎讞譴譫讖穀豶貝貞負貟貢財責賢敗賬貨質販貪貧貶購貯貫貳賤賁貰貼貴貺貸貿費賀貽賊贄賈賄貲賃賂贓資賅贐賕賑賚賒賦賭齎贖賞賜贔賙賡賠賧賴賵贅賻賺賽賾贗讚贇贈贍贏贛赬趙趕趨趲躉躍蹌蹠躒踐躂蹺蹕躚躋踴躊蹤躓躑躡蹣躕躥躪躦軀車軋軌軒軑軔轉軛輪軟轟軲軻轤軸軹軼軤軫轢軺輕軾載輊轎輈輇輅較輒輔輛輦輩輝輥輞輬輟輜輳輻輯轀輸轡轅轄輾轆轍轔辭辯辮邊遼達遷過邁運還這進遠違連遲邇逕跡適選遜遞邐邏遺遙鄧鄺鄔郵鄒鄴鄰鬱郤郟鄶鄭鄆酈鄖鄲醞醱醬釅釃釀釋裏钜鑒鑾鏨釓釔針釘釗釙釕釷釺釧釤鈒釩釣鍆釹鍚釵鈃鈣鈈鈦鈍鈔鍾鈉鋇鋼鈑鈐鑰欽鈞鎢鉤鈧鈁鈥鈄鈕鈀鈺錢鉦鉗鈷缽鈳鉕鈽鈸鉞鑽鉬鉭鉀鈿鈾鐵鉑鈴鑠鉛鉚鈰鉉鉈鉍鈹鐸鉶銬銠鉺銪鋏鋣鐃銍鐺銅鋁銱銦鎧鍘銖銑鋌銩銛鏵銓鉿銚鉻銘錚銫鉸銥鏟銃鐋銨銀銣鑄鐒鋪鋙錸鋱鏈鏗銷鎖鋰鋥鋤鍋鋯鋨鏽銼鋝鋒鋅鋶鐦鐧銳銻鋃鋟鋦錒錆鍺錯錨錡錁錕錩錫錮鑼錘錐錦鍁錈錇錟錠鍵鋸錳錙鍥鍈鍇鏘鍶鍔鍤鍬鍾鍛鎪鍠鍰鎄鍍鎂鏤鎡鏌鎮鎛鎘鑷鐫鎳鎿鎦鎬鎊鎰鎔鏢鏜鏍鏰鏞鏡鏑鏃鏇鏐鐔钁鐐鏷鑥鐓鑭鐠鑹鏹鐙鑊鐳鐶鐲鐮鐿鑔鑣鑞鑲長門閂閃閆閈閉問闖閏闈閑閎間閔閌悶閘鬧閨聞闥閩閭闓閥閣閡閫鬮閱閬闍閾閹閶鬩閿閽閻閼闡闌闃闠闊闋闔闐闒闕闞闤隊陽陰陣階際陸隴陳陘陝隉隕險隨隱隸雋難雛讎靂霧霽黴靄靚靜靨韃鞽韉韝韋韌韍韓韙韞韜韻頁頂頃頇項順須頊頑顧頓頎頒頌頏預顱領頗頸頡頰頲頜潁熲頦頤頻頮頹頷頴穎顆題顒顎顓顏額顳顢顛顙顥纇顫顬顰顴風颺颭颮颯颶颸颼颻飀飄飆飆飛饗饜飣饑飥餳飩餼飪飫飭飯飲餞飾飽飼飿飴餌饒餉餄餎餃餏餅餑餖餓餘餒餕餜餛餡館餷饋餶餿饞饁饃餺餾饈饉饅饊饌饢馬馭馱馴馳驅馹駁驢駔駛駟駙駒騶駐駝駑駕驛駘驍罵駰驕驊駱駭駢驫驪騁驗騂駸駿騏騎騍騅騌驌驂騙騭騤騷騖驁騮騫騸驃騾驄驏驟驥驦驤髏髖髕鬢魘魎魚魛魢魷魨魯魴魺鮁鮃鯰鱸鮋鮓鮒鮊鮑鱟鮍鮐鮭鮚鮳鮪鮞鮦鰂鮜鱠鱭鮫鮮鮺鯗鱘鯁鱺鰱鰹鯉鰣鰷鯀鯊鯇鮶鯽鯒鯖鯪鯕鯫鯡鯤鯧鯝鯢鯰鯛鯨鯵鯴鯔鱝鰈鰏鱨鯷鰮鰃鰓鱷鰍鰒鰉鰁鱂鯿鰠鼇鰭鰨鰥鰩鰟鰜鰳鰾鱈鱉鰻鰵鱅鰼鱖鱔鱗鱒鱯鱤鱧鱣鳥鳩雞鳶鳴鳲鷗鴉鶬鴇鴆鴣鶇鸕鴨鴞鴦鴒鴟鴝鴛鴬鴕鷥鷙鴯鴰鵂鴴鵃鴿鸞鴻鵐鵓鸝鵑鵠鵝鵒鷳鵜鵡鵲鶓鵪鶤鵯鵬鵮鶉鶊鵷鷫鶘鶡鶚鶻鶿鶥鶩鷊鷂鶲鶹鶺鷁鶼鶴鷖鸚鷓鷚鷯鷦鷲鷸鷺鸇鷹鸌鸏鸛鸘鹺麥麩黃黌黶黷黲黽' -} -function Traditionalized (cc) { - var str = '' - var ss = JTPYStr() - var tt = FTPYStr() - for (var i = 0; i < cc.length; i++) { - if (cc.charCodeAt(i) > 10000 && ss.indexOf(cc.charAt(i)) != -1) { str += tt.charAt(ss.indexOf(cc.charAt(i))) } else str += cc.charAt(i) - } - return str -} -function Simplized (cc) { - var str = '' - var ss = JTPYStr() - var tt = FTPYStr() - for (var i = 0; i < cc.length; i++) { - if (cc.charCodeAt(i) > 10000 && tt.indexOf(cc.charAt(i)) != -1) { str += ss.charAt(tt.indexOf(cc.charAt(i))) } else str += cc.charAt(i) - } - return str -} -function translateInitilization () { - translateButtonObject = document.getElementById(translateButtonId) - if (translateButtonObject) { - if (currentEncoding != targetEncoding) { - setTimeout('translateBody()', translateDelay) - if (targetEncoding == 1) { translateButtonObject.innerHTML = msgToSimplifiedChinese } else translateButtonObject.innerHTML = msgToTraditionalChinese - } - translateButtonObject.addEventListener('click', translatePage, false) - } -} - (function () { - translateInitilization() + const translate = GLOBAL_CONFIG.translate + const snackbarData = GLOBAL_CONFIG.Snackbar + const defaultEncoding = translate.defaultEncoding // 網站默認語言，1: 繁體中文, 2: 簡體中文 + const translateDelay = translate.translateDelay // 延遲時間,若不在前, 要設定延遲翻譯時間, 如100表示100ms,默認為0 + const msgToTraditionalChinese = translate.msgToTraditionalChinese // 此處可以更改為你想要顯示的文字 + const msgToSimplifiedChinese = translate.msgToSimplifiedChinese // 同上，但兩處均不建議更改 + let currentEncoding = defaultEncoding + const targetEncodingCookie = 'translate-chn-cht' + let targetEncoding = + Cookies.get(targetEncodingCookie) === undefined + ? defaultEncoding + : Number(Cookies.get(targetEncodingCookie)) + let translateButtonObject + const isSnackbar = GLOBAL_CONFIG.Snackbar !== undefined + + function translateText (txt) { + if (txt === '' || txt == null) return '' + if (currentEncoding === 1 && targetEncoding === 2) return Simplized(txt) + else if (currentEncoding === 2 && targetEncoding === 1) { return Traditionalized(txt) } else return txt + } + function translateBody (fobj) { + let objs + if (typeof fobj === 'object') objs = fobj.childNodes + else objs = document.body.childNodes + for (let i = 0; i < objs.length; i++) { + const obj = objs.item(i) + if ( + '||BR|HR|'.indexOf('|' + obj.tagName + '|') > 0 || + obj === translateButtonObject + ) { continue } + if (obj.title !== '' && obj.title != null) { obj.title = translateText(obj.title) } + if (obj.alt !== '' && obj.alt != null) obj.alt = translateText(obj.alt) + if (obj.placeholder !== '' && obj.placeholder != null) obj.placeholder = translateText(obj.placeholder) + if ( + obj.tagName === 'INPUT' && + obj.value !== '' && + obj.type !== 'text' && + obj.type !== 'hidden' + ) { obj.value = translateText(obj.value) } + if (obj.nodeType === 3) obj.data = translateText(obj.data) + else translateBody(obj) + } + } + function translatePage () { + if (targetEncoding === 1) { + currentEncoding = 1 + targetEncoding = 2 + translateButtonObject.innerHTML = msgToTraditionalChinese + Cookies.set(targetEncodingCookie, targetEncoding, 2) + translateBody() + if (isSnackbar) snackbarShow(snackbarData.cht_to_chs) + } else if (targetEncoding === 2) { + currentEncoding = 2 + targetEncoding = 1 + translateButtonObject.innerHTML = msgToSimplifiedChinese + Cookies.set(targetEncodingCookie, targetEncoding, 2) + translateBody() + if (isSnackbar) snackbarShow(snackbarData.chs_to_cht) + } + } + function JTPYStr () { + return '万与丑专业丛东丝丢两严丧个丬丰临为丽举么义乌乐乔习乡书买乱争于亏云亘亚产亩亲亵亸亿仅从仑仓仪们价众优伙会伛伞伟传伤伥伦伧伪伫体余佣佥侠侣侥侦侧侨侩侪侬俣俦俨俩俪俭债倾偬偻偾偿傥傧储傩儿兑兖党兰关兴兹养兽冁内冈册写军农冢冯冲决况冻净凄凉凌减凑凛几凤凫凭凯击凼凿刍划刘则刚创删别刬刭刽刿剀剂剐剑剥剧劝办务劢动励劲劳势勋勐勚匀匦匮区医华协单卖卢卤卧卫却卺厂厅历厉压厌厍厕厢厣厦厨厩厮县参叆叇双发变叙叠叶号叹叽吁后吓吕吗吣吨听启吴呒呓呕呖呗员呙呛呜咏咔咙咛咝咤咴咸哌响哑哒哓哔哕哗哙哜哝哟唛唝唠唡唢唣唤唿啧啬啭啮啰啴啸喷喽喾嗫呵嗳嘘嘤嘱噜噼嚣嚯团园囱围囵国图圆圣圹场坂坏块坚坛坜坝坞坟坠垄垅垆垒垦垧垩垫垭垯垱垲垴埘埙埚埝埯堑堕塆墙壮声壳壶壸处备复够头夸夹夺奁奂奋奖奥妆妇妈妩妪妫姗姜娄娅娆娇娈娱娲娴婳婴婵婶媪嫒嫔嫱嬷孙学孪宁宝实宠审宪宫宽宾寝对寻导寿将尔尘尧尴尸尽层屃屉届属屡屦屿岁岂岖岗岘岙岚岛岭岳岽岿峃峄峡峣峤峥峦崂崃崄崭嵘嵚嵛嵝嵴巅巩巯币帅师帏帐帘帜带帧帮帱帻帼幂幞干并广庄庆庐庑库应庙庞废庼廪开异弃张弥弪弯弹强归当录彟彦彻径徕御忆忏忧忾怀态怂怃怄怅怆怜总怼怿恋恳恶恸恹恺恻恼恽悦悫悬悭悯惊惧惨惩惫惬惭惮惯愍愠愤愦愿慑慭憷懑懒懔戆戋戏戗战戬户扎扑扦执扩扪扫扬扰抚抛抟抠抡抢护报担拟拢拣拥拦拧拨择挂挚挛挜挝挞挟挠挡挢挣挤挥挦捞损捡换捣据捻掳掴掷掸掺掼揸揽揿搀搁搂搅携摄摅摆摇摈摊撄撑撵撷撸撺擞攒敌敛数斋斓斗斩断无旧时旷旸昙昼昽显晋晒晓晔晕晖暂暧札术朴机杀杂权条来杨杩杰极构枞枢枣枥枧枨枪枫枭柜柠柽栀栅标栈栉栊栋栌栎栏树栖样栾桊桠桡桢档桤桥桦桧桨桩梦梼梾检棂椁椟椠椤椭楼榄榇榈榉槚槛槟槠横樯樱橥橱橹橼檐檩欢欤欧歼殁殇残殒殓殚殡殴毁毂毕毙毡毵氇气氢氩氲汇汉污汤汹沓沟没沣沤沥沦沧沨沩沪沵泞泪泶泷泸泺泻泼泽泾洁洒洼浃浅浆浇浈浉浊测浍济浏浐浑浒浓浔浕涂涌涛涝涞涟涠涡涢涣涤润涧涨涩淀渊渌渍渎渐渑渔渖渗温游湾湿溃溅溆溇滗滚滞滟滠满滢滤滥滦滨滩滪漤潆潇潋潍潜潴澜濑濒灏灭灯灵灾灿炀炉炖炜炝点炼炽烁烂烃烛烟烦烧烨烩烫烬热焕焖焘煅煳熘爱爷牍牦牵牺犊犟状犷犸犹狈狍狝狞独狭狮狯狰狱狲猃猎猕猡猪猫猬献獭玑玙玚玛玮环现玱玺珉珏珐珑珰珲琎琏琐琼瑶瑷璇璎瓒瓮瓯电画畅畲畴疖疗疟疠疡疬疮疯疱疴痈痉痒痖痨痪痫痴瘅瘆瘗瘘瘪瘫瘾瘿癞癣癫癯皑皱皲盏盐监盖盗盘眍眦眬着睁睐睑瞒瞩矫矶矾矿砀码砖砗砚砜砺砻砾础硁硅硕硖硗硙硚确硷碍碛碜碱碹磙礼祎祢祯祷祸禀禄禅离秃秆种积称秽秾稆税稣稳穑穷窃窍窑窜窝窥窦窭竖竞笃笋笔笕笺笼笾筑筚筛筜筝筹签简箓箦箧箨箩箪箫篑篓篮篱簖籁籴类籼粜粝粤粪粮糁糇紧絷纟纠纡红纣纤纥约级纨纩纪纫纬纭纮纯纰纱纲纳纴纵纶纷纸纹纺纻纼纽纾线绀绁绂练组绅细织终绉绊绋绌绍绎经绐绑绒结绔绕绖绗绘给绚绛络绝绞统绠绡绢绣绤绥绦继绨绩绪绫绬续绮绯绰绱绲绳维绵绶绷绸绹绺绻综绽绾绿缀缁缂缃缄缅缆缇缈缉缊缋缌缍缎缏缐缑缒缓缔缕编缗缘缙缚缛缜缝缞缟缠缡缢缣缤缥缦缧缨缩缪缫缬缭缮缯缰缱缲缳缴缵罂网罗罚罢罴羁羟羡翘翙翚耢耧耸耻聂聋职聍联聩聪肃肠肤肷肾肿胀胁胆胜胧胨胪胫胶脉脍脏脐脑脓脔脚脱脶脸腊腌腘腭腻腼腽腾膑臜舆舣舰舱舻艰艳艹艺节芈芗芜芦苁苇苈苋苌苍苎苏苘苹茎茏茑茔茕茧荆荐荙荚荛荜荞荟荠荡荣荤荥荦荧荨荩荪荫荬荭荮药莅莜莱莲莳莴莶获莸莹莺莼萚萝萤营萦萧萨葱蒇蒉蒋蒌蓝蓟蓠蓣蓥蓦蔷蔹蔺蔼蕲蕴薮藁藓虏虑虚虫虬虮虽虾虿蚀蚁蚂蚕蚝蚬蛊蛎蛏蛮蛰蛱蛲蛳蛴蜕蜗蜡蝇蝈蝉蝎蝼蝾螀螨蟏衅衔补衬衮袄袅袆袜袭袯装裆裈裢裣裤裥褛褴襁襕见观觃规觅视觇览觉觊觋觌觍觎觏觐觑觞触觯詟誉誊讠计订讣认讥讦讧讨让讪讫训议讯记讱讲讳讴讵讶讷许讹论讻讼讽设访诀证诂诃评诅识诇诈诉诊诋诌词诎诏诐译诒诓诔试诖诗诘诙诚诛诜话诞诟诠诡询诣诤该详诧诨诩诪诫诬语诮误诰诱诲诳说诵诶请诸诹诺读诼诽课诿谀谁谂调谄谅谆谇谈谊谋谌谍谎谏谐谑谒谓谔谕谖谗谘谙谚谛谜谝谞谟谠谡谢谣谤谥谦谧谨谩谪谫谬谭谮谯谰谱谲谳谴谵谶谷豮贝贞负贠贡财责贤败账货质贩贪贫贬购贮贯贰贱贲贳贴贵贶贷贸费贺贻贼贽贾贿赀赁赂赃资赅赆赇赈赉赊赋赌赍赎赏赐赑赒赓赔赕赖赗赘赙赚赛赜赝赞赟赠赡赢赣赪赵赶趋趱趸跃跄跖跞践跶跷跸跹跻踊踌踪踬踯蹑蹒蹰蹿躏躜躯车轧轨轩轪轫转轭轮软轰轱轲轳轴轵轶轷轸轹轺轻轼载轾轿辀辁辂较辄辅辆辇辈辉辊辋辌辍辎辏辐辑辒输辔辕辖辗辘辙辚辞辩辫边辽达迁过迈运还这进远违连迟迩迳迹适选逊递逦逻遗遥邓邝邬邮邹邺邻郁郄郏郐郑郓郦郧郸酝酦酱酽酾酿释里鉅鉴銮錾钆钇针钉钊钋钌钍钎钏钐钑钒钓钔钕钖钗钘钙钚钛钝钞钟钠钡钢钣钤钥钦钧钨钩钪钫钬钭钮钯钰钱钲钳钴钵钶钷钸钹钺钻钼钽钾钿铀铁铂铃铄铅铆铈铉铊铋铍铎铏铐铑铒铕铗铘铙铚铛铜铝铞铟铠铡铢铣铤铥铦铧铨铪铫铬铭铮铯铰铱铲铳铴铵银铷铸铹铺铻铼铽链铿销锁锂锃锄锅锆锇锈锉锊锋锌锍锎锏锐锑锒锓锔锕锖锗错锚锜锞锟锠锡锢锣锤锥锦锨锩锫锬锭键锯锰锱锲锳锴锵锶锷锸锹锺锻锼锽锾锿镀镁镂镃镆镇镈镉镊镌镍镎镏镐镑镒镕镖镗镙镚镛镜镝镞镟镠镡镢镣镤镥镦镧镨镩镪镫镬镭镮镯镰镱镲镳镴镶长门闩闪闫闬闭问闯闰闱闲闳间闵闶闷闸闹闺闻闼闽闾闿阀阁阂阃阄阅阆阇阈阉阊阋阌阍阎阏阐阑阒阓阔阕阖阗阘阙阚阛队阳阴阵阶际陆陇陈陉陕陧陨险随隐隶隽难雏雠雳雾霁霉霭靓静靥鞑鞒鞯鞴韦韧韨韩韪韫韬韵页顶顷顸项顺须顼顽顾顿颀颁颂颃预颅领颇颈颉颊颋颌颍颎颏颐频颒颓颔颕颖颗题颙颚颛颜额颞颟颠颡颢颣颤颥颦颧风飏飐飑飒飓飔飕飖飗飘飙飚飞飨餍饤饥饦饧饨饩饪饫饬饭饮饯饰饱饲饳饴饵饶饷饸饹饺饻饼饽饾饿馀馁馂馃馄馅馆馇馈馉馊馋馌馍馎馏馐馑馒馓馔馕马驭驮驯驰驱驲驳驴驵驶驷驸驹驺驻驼驽驾驿骀骁骂骃骄骅骆骇骈骉骊骋验骍骎骏骐骑骒骓骔骕骖骗骘骙骚骛骜骝骞骟骠骡骢骣骤骥骦骧髅髋髌鬓魇魉鱼鱽鱾鱿鲀鲁鲂鲄鲅鲆鲇鲈鲉鲊鲋鲌鲍鲎鲏鲐鲑鲒鲓鲔鲕鲖鲗鲘鲙鲚鲛鲜鲝鲞鲟鲠鲡鲢鲣鲤鲥鲦鲧鲨鲩鲪鲫鲬鲭鲮鲯鲰鲱鲲鲳鲴鲵鲶鲷鲸鲹鲺鲻鲼鲽鲾鲿鳀鳁鳂鳃鳄鳅鳆鳇鳈鳉鳊鳋鳌鳍鳎鳏鳐鳑鳒鳓鳔鳕鳖鳗鳘鳙鳛鳜鳝鳞鳟鳠鳡鳢鳣鸟鸠鸡鸢鸣鸤鸥鸦鸧鸨鸩鸪鸫鸬鸭鸮鸯鸰鸱鸲鸳鸴鸵鸶鸷鸸鸹鸺鸻鸼鸽鸾鸿鹀鹁鹂鹃鹄鹅鹆鹇鹈鹉鹊鹋鹌鹍鹎鹏鹐鹑鹒鹓鹔鹕鹖鹗鹘鹚鹛鹜鹝鹞鹟鹠鹡鹢鹣鹤鹥鹦鹧鹨鹩鹪鹫鹬鹭鹯鹰鹱鹲鹳鹴鹾麦麸黄黉黡黩黪黾' + } + function FTPYStr () { + return '萬與醜專業叢東絲丟兩嚴喪個爿豐臨為麗舉麼義烏樂喬習鄉書買亂爭於虧雲亙亞產畝親褻嚲億僅從侖倉儀們價眾優夥會傴傘偉傳傷倀倫傖偽佇體餘傭僉俠侶僥偵側僑儈儕儂俁儔儼倆儷儉債傾傯僂僨償儻儐儲儺兒兌兗黨蘭關興茲養獸囅內岡冊寫軍農塚馮衝決況凍淨淒涼淩減湊凜幾鳳鳧憑凱擊氹鑿芻劃劉則剛創刪別剗剄劊劌剴劑剮劍剝劇勸辦務勱動勵勁勞勢勳猛勩勻匭匱區醫華協單賣盧鹵臥衛卻巹廠廳曆厲壓厭厙廁廂厴廈廚廄廝縣參靉靆雙發變敘疊葉號歎嘰籲後嚇呂嗎唚噸聽啟吳嘸囈嘔嚦唄員咼嗆嗚詠哢嚨嚀噝吒噅鹹呱響啞噠嘵嗶噦嘩噲嚌噥喲嘜嗊嘮啢嗩唕喚呼嘖嗇囀齧囉嘽嘯噴嘍嚳囁嗬噯噓嚶囑嚕劈囂謔團園囪圍圇國圖圓聖壙場阪壞塊堅壇壢壩塢墳墜壟壟壚壘墾坰堊墊埡墶壋塏堖塒塤堝墊垵塹墮壪牆壯聲殼壺壼處備複夠頭誇夾奪奩奐奮獎奧妝婦媽嫵嫗媯姍薑婁婭嬈嬌孌娛媧嫻嫿嬰嬋嬸媼嬡嬪嬙嬤孫學孿寧寶實寵審憲宮寬賓寢對尋導壽將爾塵堯尷屍盡層屭屜屆屬屢屨嶼歲豈嶇崗峴嶴嵐島嶺嶽崠巋嶨嶧峽嶢嶠崢巒嶗崍嶮嶄嶸嶔崳嶁脊巔鞏巰幣帥師幃帳簾幟帶幀幫幬幘幗冪襆幹並廣莊慶廬廡庫應廟龐廢廎廩開異棄張彌弳彎彈強歸當錄彠彥徹徑徠禦憶懺憂愾懷態慫憮慪悵愴憐總懟懌戀懇惡慟懨愷惻惱惲悅愨懸慳憫驚懼慘懲憊愜慚憚慣湣慍憤憒願懾憖怵懣懶懍戇戔戲戧戰戩戶紮撲扡執擴捫掃揚擾撫拋摶摳掄搶護報擔擬攏揀擁攔擰撥擇掛摯攣掗撾撻挾撓擋撟掙擠揮撏撈損撿換搗據撚擄摑擲撣摻摜摣攬撳攙擱摟攪攜攝攄擺搖擯攤攖撐攆擷擼攛擻攢敵斂數齋斕鬥斬斷無舊時曠暘曇晝曨顯晉曬曉曄暈暉暫曖劄術樸機殺雜權條來楊榪傑極構樅樞棗櫪梘棖槍楓梟櫃檸檉梔柵標棧櫛櫳棟櫨櫟欄樹棲樣欒棬椏橈楨檔榿橋樺檜槳樁夢檮棶檢欞槨櫝槧欏橢樓欖櫬櫚櫸檟檻檳櫧橫檣櫻櫫櫥櫓櫞簷檁歡歟歐殲歿殤殘殞殮殫殯毆毀轂畢斃氈毿氌氣氫氬氳彙漢汙湯洶遝溝沒灃漚瀝淪滄渢溈滬濔濘淚澩瀧瀘濼瀉潑澤涇潔灑窪浹淺漿澆湞溮濁測澮濟瀏滻渾滸濃潯濜塗湧濤澇淶漣潿渦溳渙滌潤澗漲澀澱淵淥漬瀆漸澠漁瀋滲溫遊灣濕潰濺漵漊潷滾滯灩灄滿瀅濾濫灤濱灘澦濫瀠瀟瀲濰潛瀦瀾瀨瀕灝滅燈靈災燦煬爐燉煒熗點煉熾爍爛烴燭煙煩燒燁燴燙燼熱煥燜燾煆糊溜愛爺牘犛牽犧犢強狀獷獁猶狽麅獮獰獨狹獅獪猙獄猻獫獵獼玀豬貓蝟獻獺璣璵瑒瑪瑋環現瑲璽瑉玨琺瓏璫琿璡璉瑣瓊瑤璦璿瓔瓚甕甌電畫暢佘疇癤療瘧癘瘍鬁瘡瘋皰屙癰痙癢瘂癆瘓癇癡癉瘮瘞瘺癟癱癮癭癩癬癲臒皚皺皸盞鹽監蓋盜盤瞘眥矓著睜睞瞼瞞矚矯磯礬礦碭碼磚硨硯碸礪礱礫礎硜矽碩硤磽磑礄確鹼礙磧磣堿镟滾禮禕禰禎禱禍稟祿禪離禿稈種積稱穢穠穭稅穌穩穡窮竊竅窯竄窩窺竇窶豎競篤筍筆筧箋籠籩築篳篩簹箏籌簽簡籙簀篋籜籮簞簫簣簍籃籬籪籟糴類秈糶糲粵糞糧糝餱緊縶糸糾紆紅紂纖紇約級紈纊紀紉緯紜紘純紕紗綱納紝縱綸紛紙紋紡紵紖紐紓線紺絏紱練組紳細織終縐絆紼絀紹繹經紿綁絨結絝繞絰絎繪給絢絳絡絕絞統綆綃絹繡綌綏絛繼綈績緒綾緓續綺緋綽緔緄繩維綿綬繃綢綯綹綣綜綻綰綠綴緇緙緗緘緬纜緹緲緝縕繢緦綞緞緶線緱縋緩締縷編緡緣縉縛縟縝縫縗縞纏縭縊縑繽縹縵縲纓縮繆繅纈繚繕繒韁繾繰繯繳纘罌網羅罰罷羆羈羥羨翹翽翬耮耬聳恥聶聾職聹聯聵聰肅腸膚膁腎腫脹脅膽勝朧腖臚脛膠脈膾髒臍腦膿臠腳脫腡臉臘醃膕齶膩靦膃騰臏臢輿艤艦艙艫艱豔艸藝節羋薌蕪蘆蓯葦藶莧萇蒼苧蘇檾蘋莖蘢蔦塋煢繭荊薦薘莢蕘蓽蕎薈薺蕩榮葷滎犖熒蕁藎蓀蔭蕒葒葤藥蒞蓧萊蓮蒔萵薟獲蕕瑩鶯蓴蘀蘿螢營縈蕭薩蔥蕆蕢蔣蔞藍薊蘺蕷鎣驀薔蘞藺藹蘄蘊藪槁蘚虜慮虛蟲虯蟣雖蝦蠆蝕蟻螞蠶蠔蜆蠱蠣蟶蠻蟄蛺蟯螄蠐蛻蝸蠟蠅蟈蟬蠍螻蠑螿蟎蠨釁銜補襯袞襖嫋褘襪襲襏裝襠褌褳襝褲襇褸襤繈襴見觀覎規覓視覘覽覺覬覡覿覥覦覯覲覷觴觸觶讋譽謄訁計訂訃認譏訐訌討讓訕訖訓議訊記訒講諱謳詎訝訥許訛論訩訟諷設訪訣證詁訶評詛識詗詐訴診詆謅詞詘詔詖譯詒誆誄試詿詩詰詼誠誅詵話誕詬詮詭詢詣諍該詳詫諢詡譸誡誣語誚誤誥誘誨誑說誦誒請諸諏諾讀諑誹課諉諛誰諗調諂諒諄誶談誼謀諶諜謊諫諧謔謁謂諤諭諼讒諮諳諺諦謎諞諝謨讜謖謝謠謗諡謙謐謹謾謫譾謬譚譖譙讕譜譎讞譴譫讖穀豶貝貞負貟貢財責賢敗賬貨質販貪貧貶購貯貫貳賤賁貰貼貴貺貸貿費賀貽賊贄賈賄貲賃賂贓資賅贐賕賑賚賒賦賭齎贖賞賜贔賙賡賠賧賴賵贅賻賺賽賾贗讚贇贈贍贏贛赬趙趕趨趲躉躍蹌蹠躒踐躂蹺蹕躚躋踴躊蹤躓躑躡蹣躕躥躪躦軀車軋軌軒軑軔轉軛輪軟轟軲軻轤軸軹軼軤軫轢軺輕軾載輊轎輈輇輅較輒輔輛輦輩輝輥輞輬輟輜輳輻輯轀輸轡轅轄輾轆轍轔辭辯辮邊遼達遷過邁運還這進遠違連遲邇逕跡適選遜遞邐邏遺遙鄧鄺鄔郵鄒鄴鄰鬱郤郟鄶鄭鄆酈鄖鄲醞醱醬釅釃釀釋裏钜鑒鑾鏨釓釔針釘釗釙釕釷釺釧釤鈒釩釣鍆釹鍚釵鈃鈣鈈鈦鈍鈔鍾鈉鋇鋼鈑鈐鑰欽鈞鎢鉤鈧鈁鈥鈄鈕鈀鈺錢鉦鉗鈷缽鈳鉕鈽鈸鉞鑽鉬鉭鉀鈿鈾鐵鉑鈴鑠鉛鉚鈰鉉鉈鉍鈹鐸鉶銬銠鉺銪鋏鋣鐃銍鐺銅鋁銱銦鎧鍘銖銑鋌銩銛鏵銓鉿銚鉻銘錚銫鉸銥鏟銃鐋銨銀銣鑄鐒鋪鋙錸鋱鏈鏗銷鎖鋰鋥鋤鍋鋯鋨鏽銼鋝鋒鋅鋶鐦鐧銳銻鋃鋟鋦錒錆鍺錯錨錡錁錕錩錫錮鑼錘錐錦鍁錈錇錟錠鍵鋸錳錙鍥鍈鍇鏘鍶鍔鍤鍬鍾鍛鎪鍠鍰鎄鍍鎂鏤鎡鏌鎮鎛鎘鑷鐫鎳鎿鎦鎬鎊鎰鎔鏢鏜鏍鏰鏞鏡鏑鏃鏇鏐鐔钁鐐鏷鑥鐓鑭鐠鑹鏹鐙鑊鐳鐶鐲鐮鐿鑔鑣鑞鑲長門閂閃閆閈閉問闖閏闈閑閎間閔閌悶閘鬧閨聞闥閩閭闓閥閣閡閫鬮閱閬闍閾閹閶鬩閿閽閻閼闡闌闃闠闊闋闔闐闒闕闞闤隊陽陰陣階際陸隴陳陘陝隉隕險隨隱隸雋難雛讎靂霧霽黴靄靚靜靨韃鞽韉韝韋韌韍韓韙韞韜韻頁頂頃頇項順須頊頑顧頓頎頒頌頏預顱領頗頸頡頰頲頜潁熲頦頤頻頮頹頷頴穎顆題顒顎顓顏額顳顢顛顙顥纇顫顬顰顴風颺颭颮颯颶颸颼颻飀飄飆飆飛饗饜飣饑飥餳飩餼飪飫飭飯飲餞飾飽飼飿飴餌饒餉餄餎餃餏餅餑餖餓餘餒餕餜餛餡館餷饋餶餿饞饁饃餺餾饈饉饅饊饌饢馬馭馱馴馳驅馹駁驢駔駛駟駙駒騶駐駝駑駕驛駘驍罵駰驕驊駱駭駢驫驪騁驗騂駸駿騏騎騍騅騌驌驂騙騭騤騷騖驁騮騫騸驃騾驄驏驟驥驦驤髏髖髕鬢魘魎魚魛魢魷魨魯魴魺鮁鮃鯰鱸鮋鮓鮒鮊鮑鱟鮍鮐鮭鮚鮳鮪鮞鮦鰂鮜鱠鱭鮫鮮鮺鯗鱘鯁鱺鰱鰹鯉鰣鰷鯀鯊鯇鮶鯽鯒鯖鯪鯕鯫鯡鯤鯧鯝鯢鯰鯛鯨鯵鯴鯔鱝鰈鰏鱨鯷鰮鰃鰓鱷鰍鰒鰉鰁鱂鯿鰠鼇鰭鰨鰥鰩鰟鰜鰳鰾鱈鱉鰻鰵鱅鰼鱖鱔鱗鱒鱯鱤鱧鱣鳥鳩雞鳶鳴鳲鷗鴉鶬鴇鴆鴣鶇鸕鴨鴞鴦鴒鴟鴝鴛鴬鴕鷥鷙鴯鴰鵂鴴鵃鴿鸞鴻鵐鵓鸝鵑鵠鵝鵒鷳鵜鵡鵲鶓鵪鶤鵯鵬鵮鶉鶊鵷鷫鶘鶡鶚鶻鶿鶥鶩鷊鷂鶲鶹鶺鷁鶼鶴鷖鸚鷓鷚鷯鷦鷲鷸鷺鸇鷹鸌鸏鸛鸘鹺麥麩黃黌黶黷黲黽' + } + function Traditionalized (cc) { + let str = '' + const ss = JTPYStr() + const tt = FTPYStr() + for (let i = 0; i < cc.length; i++) { + if (cc.charCodeAt(i) > 10000 && ss.indexOf(cc.charAt(i)) !== -1) { str += tt.charAt(ss.indexOf(cc.charAt(i))) } else str += cc.charAt(i) + } + return str + } + function Simplized (cc) { + let str = '' + const ss = JTPYStr() + const tt = FTPYStr() + for (let i = 0; i < cc.length; i++) { + if (cc.charCodeAt(i) > 10000 && tt.indexOf(cc.charAt(i)) !== -1) { str += ss.charAt(tt.indexOf(cc.charAt(i))) } else str += cc.charAt(i) + } + return str + } + function translateInitialization () { + translateButtonObject = document.getElementById('translateLink') + if (translateButtonObject) { + if (currentEncoding !== targetEncoding) { + setTimeout(function () { translateBody() }, translateDelay) + if (targetEncoding === 1) { translateButtonObject.innerHTML = msgToSimplifiedChinese } else translateButtonObject.innerHTML = msgToTraditionalChinese + } + translateButtonObject.addEventListener('click', translatePage, false) + } + } + translateInitialization() + document.addEventListener('pjax:complete', translateInitialization) })() diff --git a/source/js/utils.js b/source/js/utils.js index 0fb7a88..db5973b 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -1,13 +1,15 @@ +/* eslint-disable no-unused-vars */ + function debounce (func, wait, immediate) { - var timeout + let timeout return function () { - var context = this - var args = arguments - var later = function () { + const context = this + const args = arguments + const later = function () { timeout = null if (!immediate) func.apply(context, args) } - var callNow = immediate && !timeout + const callNow = immediate && !timeout clearTimeout(timeout) timeout = setTimeout(later, wait) if (callNow) func.apply(context, args) @@ -15,21 +17,21 @@ function debounce (func, wait, immediate) { }; function throttle (func, wait, options) { - var timeout, context, args - var previous = 0 + let timeout, context, args + let previous = 0 if (!options) options = {} - var later = function () { + const later = function () { previous = options.leading === false ? 0 : new Date().getTime() timeout = null func.apply(context, args) if (!timeout) context = args = null } - var throttled = function () { - var now = new Date().getTime() + const throttled = function () { + const now = new Date().getTime() if (!previous && options.leading === false) previous = now - var remaining = wait - (now - previous) + const remaining = wait - (now - previous) context = this args = arguments if (remaining <= 0 || remaining > wait) { @@ -49,70 +51,31 @@ function throttle (func, wait, options) { } function sidebarPaddingR () { - var innerWidth = window.innerWidth - var clientWidth = document.body.clientWidth - var paddingRight = innerWidth - clientWidth + const innerWidth = window.innerWidth + const clientWidth = document.body.clientWidth + const paddingRight = innerWidth - clientWidth if (innerWidth !== clientWidth) { $('body').css('padding-right', paddingRight) } } -// iPadOS -function isIpad () { - return navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 -} - -function isTMobile () { - var ua = navigator.userAgent - var pa = /iPad|iPhone|iPod|Android|Opera Mini|BlackBerry|webOS|UCWEB|Blazer|PSP|IEMobile|Symbian/g - return window.screen.width < 992 && pa.test(ua) -} - -function isMobile () { - return this.isIpad() || this.isTMobile() -} - -function isDesktop () { - return !this.isMobile() -} - function scrollToDest (name, offset = 0) { - var scrollOffset = $(name).offset() + const scrollOffset = $(name).offset() $('body,html').animate({ scrollTop: scrollOffset.top - offset }) }; -function loadScript (url, callback) { - var script = document.createElement('script') - script.type = 'text/javascript' - if (script.readyState) { // IE - script.onreadystatechange = function () { - if (script.readyState === 'loaded' || - script.readyState === 'complete') { - script.onreadystatechange = null - callback() - } - } - } else { // Others - script.onload = function () { - callback() - } - } - script.src = url - document.body.appendChild(script) -}; - function snackbarShow (text, showAction, duration) { - var a = (typeof showAction !== 'undefined') ? showAction : false - var d = (typeof duration !== 'undefined') ? duration : 2000 - var position = GLOBAL_CONFIG.Snackbar.position - var bg = document.documentElement.getAttribute('data-theme') === 'light' ? GLOBAL_CONFIG.Snackbar.bgLight : GLOBAL_CONFIG.Snackbar.bgDark + const sa = (typeof showAction !== 'undefined') ? showAction : false + const dur = (typeof duration !== 'undefined') ? duration : 2000 + const position = GLOBAL_CONFIG.Snackbar.position + const bg = document.documentElement.getAttribute('data-theme') === 'light' ? GLOBAL_CONFIG.Snackbar.bgLight : GLOBAL_CONFIG.Snackbar.bgDark Snackbar.show({ text: text, backgroundColor: bg, - showAction: a, - duration: d, + showAction: sa, + duration: dur, pos: position }) } @@ -124,9 +87,9 @@ const Cookies = { if (parts.length === 2) return parts.pop().split(';').shift() }, set: function (name, value, days) { - var expires = '' + let expires = '' if (days) { - var date = new Date() + const date = new Date() date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)) expires = '; expires=' + date.toUTCString() } @@ -134,12 +97,35 @@ const Cookies = { } } -/** - * lazyload - */ -if (GLOBAL_CONFIG.islazyload) { - window.lazyLoadOptions = { - elements_selector: 'img', - threshold: 0 +const initJustifiedGallery = function (selector) { + selector.each(function (i, o) { + if ($(this).is(':visible')) { + $(this).justifiedGallery({ + rowHeight: 220, + margins: 4 + }) + } + }) +} + +const diffDate = d => { + const dateNow = new Date() + const datePost = new Date(d.replace(/-/g, '/')) + const dateDiff = dateNow.getTime() - datePost.getTime() + const dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000)) + return dayDiff +} + +const loadComment = (dom, callback) => { + if ('IntersectionObserver' in window) { + const observerItem = new IntersectionObserver((entries) => { + if (entries[0].isIntersecting) { + callback() + observerItem.disconnect() + } + }, { threshold: [0] }) + observerItem.observe(dom) + } else { + callback() } }