Pr branch (#3)

* Update sakura-app.js 监听浏览器resize 需要加settimeout * Update README.md * Update issue templates * Update ---bug.md * update comment textarea style * clean up app.js * update to v3.2.0 * bug fix * 自动加载 * 自动加载update * Update to v3.2.1 * 除虫&实时搜索 * update style * Rest API for cache-search * Close issue mashirozx#103 * Close mashirozx#59 * 主题切换相关代码重构 * 简化代码 * Update to v3.2.4 * modify options description * update floating trick * Update header.php * Grammer * Update header.php * optimize * 首页特色图对齐方式可选 * fix * Aplayer歌曲列表滑动出现当Aplayer的侧边 ‘>’按钮被点击后，Aplayer整体滑出，然后歌曲列表缓慢滑出。比起直接出现，观感应该会好一些。 * 删除不小心添加的无用代码删除不小心添加的无用代码 * update to v3.2.5 * Close mashirozx#73 * 代码块单行代码也高亮 * fix mashirozx#79 * bug fix & optimize * fix mashirozx#89 * Update sakura-app.js * update to v3.2.6 * fix mashirozx#116 * new feature: github cards * 吸顶效果 * 展开/收缩效果 * 标题样式 * 二级菜单不换行 * lazyload options * Update README.md * fix toc of github-style * fix mashirozx#119 * 恢复意外删除的代码 * Change Gravatar server to official * fix mashirozx#120 * 评论回复邮件通知可选 * 管理员评论回复通知可选 * Multi language initial * 忘改名了-_- * Translation 1910302148 * Translation 201910311333 * Translation 201910311725 * Translation 201910312203 * Translation 201911010020 * fix github-style * Translation 1911011510 * Translation 201911012106 * update .mo * fix * update to v3.2.8 * update README * fix * Chinese first * fix search * 修改title和页面提示不对应 * bug fix * imgur upload support * more image upload api * update translate * curl notice * add nonce check for api * Update api.php * optimize * translate * support sidebar widget * translate * fix * fix style * fix style * 侧栏样式 * 后台登陆界面 * 评论Markdown解析 * Markdown Supported while </> Forbidden * update to v3.3.2 * fix * add author * translate * disable get_sidebar() * update post views * fix image gallery * change curl to wp_remote_post * fix SM.MS upload * remove curl notice * close mashirozx#143 * fix * rest api for random images * update api * fix comment @ * manifest.py * manifest.py * manifest.py * manifest.py * update api * GUI for manifest tool * update readme * update readme * update json * update cover images * fix auth * add upload to wp * qq info restfull api * rm * Update manifest.py * Update api.php * Update api.php * fix sql error * fix * Update README.md * translate * encrypt QQ avatar link * add key pairs * add choices * fix * change encrypt method * update * fix mashirozx#151 * Update Readme * update to v3.3.3 * fix sm.ms upload * fetch manifest.json at backend * fix BBCode image * update manifest * fix * minimize lib.js Co-authored-by: liang xiao <13938586+Laxse@users.noreply.github.com> Co-authored-by: Mashiro <moezhx@outlook.com> Co-authored-by: enjoyuruf <39794567+enjoyuruf@users.noreply.github.com> Co-authored-by: yuanhca <1161638319@qq.com>
spirit1431007 · Dec 25, 2019 · 11f0872 · 11f0872
1 parent 75d5464
commit 11f0872
Show file tree

Hide file tree

Showing 82 changed files with 7,999 additions and 1,038 deletions.
diff --git a/.github/ISSUE_TEMPLATE/---bug.md b/.github/ISSUE_TEMPLATE/---bug.md
@@ -0,0 +1,27 @@
+---
+name: 报告 bug
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+如果这是您第一次在GitHub上发 issue，请阅读【提问的智慧】：https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md 
+-->
+
+**描述问题**
+
+**bug 重现步骤**
+
+**截图（如有）**
+
+**系统信息**
+ - （前端）操作系统: [e.g. Windows 10, Android 9.0]
+ - 浏览器: [e.g. chrome, safari]
+ - PHP 版本
+ - WordPress 版本
+ - Sakura 主题版本
+
+**补充信息**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md 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/404.php b/404.php
@@ -14,7 +14,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title itemprop="name"><?php global $page, $paged;wp_title( '-', true, 'right' );
 bloginfo( 'name' );$site_description = get_bloginfo( 'description', 'display' );
-if ( $site_description && ( is_home() || is_front_page() ) ) echo " - $site_description";if ( $paged >= 2 || $page >= 2 ) echo ' - ' . sprintf( __( '第 %s 页'), max( $paged, $page ) );?>
+if ( $site_description && ( is_home() || is_front_page() ) ) echo " - $site_description";if ( $paged >= 2 || $page >= 2 ) echo ' - ' . sprintf( __( 'page %s'), max( $paged, $page ) );/*第 %s 页*/?>
 </title>
 <link type="text/css" media="all" href="https://cdn.jsdelivr.net/gh/moezx/cdn@3.2.2/css/lib.css" rel="stylesheet" />
 <?php wp_head(); ?>
@@ -43,12 +43,11 @@ function httpGet(theUrl) {
 <div class="anim-icon" id="404" style="height: 66%;"></div>
 </div>
 <div class="err-button back">
-<a id="golast" href=javascript:history.go(-1);>返回上一页</a>
-<a id="gohome" href="<?php bloginfo('url');?>">返回主页</a>  
+<a id="golast" href=javascript:history.go(-1);><?php _e('return to previous page','sakura');/*返回上一页*/?></a>
+<a id="gohome" href="<?php bloginfo('url');?>"><?php _e('return to home page','sakura');/*返回主页*/?></a>  
 </div>
 <div style="display:block; width:284px;margin: auto;">
-<p style="margin-bottom: 1em;margin-top: 1.5em;text-align: center;font-size: 15px;">别急，试试站内搜索？</p>
-<p style="margin-bottom: 1em;text-align: center;font-size: 15px;">Don't worry, search in site?</p>
+<p style="margin-bottom: 1em;margin-top: 1.5em;text-align: center;font-size: 15px;"><?php _e('Don\'t worry, search in site?','sakura');/*别急，试试站内搜索？*/?></p>
 <form class="s-search" method="get" action="/" role="search">
     <i class="iconfont icon-search" style="bottom: 8px;left: 12px;"></i>
     <input class="text-input" style="padding: 8px 20px 8px 46px;" type="search" name="s" placeholder="<?php _e('Search...', 'akina') ?>" required>	

diff --git a/README-en.md b/README-en.md
@@ -0,0 +1,47 @@
+Sakura🌸: A Wonderful WordPress Theme
+===
+
+[中文](README.md) | Engilsh
+
+![Sakura](https://view.moezx.cc/images/2018/05/26/sakura.png)
+
+![PHP version](https://img.shields.io/badge/PHP-7.1+-4F5B93.svg?style=flat-square)
+![WP version](https://img.shields.io/badge/WordPress-5.0+-0073aa.svg?style=flat-square)
+[![GitHub release](https://img.shields.io/github/release/mashirozx/Sakura.svg?style=flat-square)](https://github.com/mashirozx/Sakura/releases/latest)
+[![Github commits (since latest release)](https://img.shields.io/github/commits-since/mashirozx/Sakura/latest.svg?style=flat-square)](https://github.com/mashirozx/Sakura/commits/)
+[![](https://data.jsdelivr.com/v1/package/gh/moezx/cdn/badge)](https://www.jsdelivr.com/package/gh/moezx/cdn)
+
+Modified based on theme [Akina (by Fuzzz)](http://www.akina.pw/themeakina) and [Siren (by Louie)](https://github.com/louie-senpai/Siren).
+
+The rebuild version is on the way :)
+
+### Install
+
+#### By GIT
+```bash
+cd /wp-content/themes/
+git clone https://github.com/mashirozx/Sakura.git
+```
+
+#### By FTP
+**Rename the theme folder name as `Sakura`** if you download form the green [Clone or download] button on this page. Make sure the path to the theme root is /wp-content/themes/Sakura/`.
+
+### Configuration
+Config your theme at `Mune-Appearance-Sakura Options`. Please turn on `Use js and css file of the theme locally` under CDN tag if you want to modify local SCC an Javascript files.
+
+### Update
+```bash
+cd /wp-content/themes/Sakura
+git fetch
+git pull
+```
+
+[Learn more info about the theme (Chinese)](https://2heng.xin/theme-sakura/)
+
+Enjoy it!
+
+### Donate
+[WeChat Pay](https://view.moezx.cc/images/2018/05/28/WeChanQR.png) | [AliPay](https://view.moezx.cc/images/2018/05/28/AliPayQR.jpg) | [PayPal](https://paypal.me/mashirozx)
+
+### Need a server?
+[![](https://www.vultr.com/media/banners/banner_728x90.png)](https://www.vultr.com/?ref=7674346)
diff --git a/README.md b/README.md
@@ -1,28 +1,34 @@
-Sakura🌸: A Wonderful WordPress Theme
+Sakura🌸: 樱花庄的白猫博客主题
 ===
 
+中文 | [Engilsh](README-en.md)
+
 ![Sakura](https://view.moezx.cc/images/2018/05/26/sakura.png)
 
-![PHP version](https://img.shields.io/badge/PHP-7.1+-4F5B93.svg?style=flat-square)
-![WP version](https://img.shields.io/badge/WordPress-5.0+-0073aa.svg?style=flat-square)
-[![GitHub release](https://img.shields.io/github/release/mashirozx/Sakura.svg?style=flat-square)](https://github.com/mashirozx/Sakura/releases/latest)
-[![Github commits (since latest release)](https://img.shields.io/github/commits-since/mashirozx/Sakura/latest.svg?style=flat-square)](https://github.com/mashirozx/Sakura/commits/)
+![PHP version](https://shader.2heng.xin/badge/PHP-7.1+-4F5B93.svg?style=flat-square&logo=php)
+![WP version](https://shader.2heng.xin/badge/WordPress-5.3-0073aa.svg?style=flat-square&logo=wordpress)
+[![GitHub release](https://img.shields.io/github/v/release/mashirozx/Sakura.svg?style=flat-square&logo=github)](https://github.com/mashirozx/Sakura/releases/latest)
+[![Github commits (since latest release)](https://img.shields.io/github/commits-since/mashirozx/Sakura/latest.svg?style=flat-square&logo=git&color=important)](https://github.com/mashirozx/Sakura/commits/)
 [![](https://data.jsdelivr.com/v1/package/gh/moezx/cdn/badge)](https://www.jsdelivr.com/package/gh/moezx/cdn)
 
 在 Louie 基于 Fuzzz 的 [Akina](http://www.akina.pw/themeakina) 主题修改的主题 [Siren](https://github.com/louie-senpai/Siren) 基础上三次修改 =.=
 
 两位前辈做得已经很棒了，或许我所做的只是把他们的代码弄得凌乱不堪吧 :)
 
-注意：建议 `git clone` 下载（[简易 Git 使用指南](https://github.com/mashirozx/Sakura/wiki/Git-%E4%B8%8B%E8%BD%BD%E3%80%81%E6%9B%B4%E6%96%B0%E6%8C%87%E5%8D%97)）；如果选择下载压缩包，解压后记得把文件夹名改回 `Sakura`，也即保证主题路径为 `/wp-content/themes/Sakura/`；请留意主题说明里的其他注意事项。
+特别感谢 [@Spirit](https://github.com/spirit1431007) 对本项目的贡献！
+
+注意：建议 `git clone` 下载（[简易 Git 使用指南](https://github.com/mashirozx/Sakura/wiki/Git-%E4%B8%8B%E8%BD%BD%E3%80%81%E6%9B%B4%E6%96%B0%E6%8C%87%E5%8D%97)）；如果选择下载压缩包，**解压后记得把文件夹名改回 `Sakura`，也即保证主题路径为 `/wp-content/themes/Sakura/`**；主题设置在 `菜单-外观-Sakura 主题设置` 中；DIY 的时候建议采用[子主题](https://github.com/mashirozx/Sakura/tree/child) 并勾选 `Sakura 主题设置-CDN-本地调用主题 js、css 文件`；请留意主题说明里的其他注意事项。
 
 主题使用说明见：<https://2heng.xin/theme-sakura/>
 
 本仓库国内镜像：<https://gitee.com/mashirozx/Sakura>
 
+主题交流群：860262481
+
 希望你喜欢！
 
 ### 打赏支持~
 [微信支付](https://view.moezx.cc/images/2018/05/28/WeChanQR.png) | [支付宝](https://view.moezx.cc/images/2018/05/28/AliPayQR.jpg) | [PayPal](https://paypal.me/mashirozx)
 
 ### 需要服务器吗？
-<a href="https://www.vultr.com/?ref=7674346"><img src="https://www.vultr.com/media/banner_3.png" width="300" height="250"></a>
+[![](https://www.vultr.com/media/banners/banner_728x90.png)](https://www.vultr.com/?ref=7674346)
diff --git a/archive.php b/archive.php
@@ -52,7 +52,8 @@
 
 		</main><!-- #main -->
 		<?php if ( akina_option('pagenav_style') == 'ajax') { ?>
-		<div id="pagination" <?php if(akina_option('image_category') && is_category(explode(',',akina_option('image_category')))) echo 'class="pagination-archive"'; ?>><?php next_posts_link(__('Previous')); ?></div>
+		<div id="pagination" <?php if(akina_option('image_category') && is_category(explode(',',akina_option('image_category')))) echo 'class="pagination-archive"'; ?>><?php next_posts_link(' Previous'); ?></div>
+		<div id="add_post"><span id="add_post_time" style="visibility: hidden;" title="<?php echo akina_option('auto_load_post',''); ?>"  ></span></div>
 		<?php }else{ ?>
 		<nav class="navigator">
         <?php previous_posts_link('<i class="iconfont icon-back"></i>') ?><?php next_posts_link('<i class="iconfont icon-right"></i>') ?>
@@ -61,5 +62,4 @@
 	</div><!-- #primary -->
 
 <?php
-get_sidebar();
 get_footer();
diff --git a/author.php b/author.php
@@ -73,7 +73,8 @@
 
 		</main><!-- #main -->
 		<?php if ( akina_option('pagenav_style') == 'ajax') { ?>
-		<div id="pagination"><?php next_posts_link(__('Previous')); ?></div>
+		<div id="pagination"><?php next_posts_link(' Previous'); ?></div>
+		<div id="add_post"><span id="add_post_time" style="visibility: hidden;" title="<?php echo akina_option('auto_load_post',''); ?>"  ></span></div>
 		<?php }else{ ?>
 		<nav class="navigator">
         <?php previous_posts_link('<i class="iconfont icon-back"></i>') ?><?php next_posts_link('<i class="iconfont icon-right"></i>') ?>
@@ -82,5 +83,4 @@
 	</div><!-- #primary -->
 
 <?php
-get_sidebar();
 get_footer();
diff --git a/cdn/css/lib.css b/cdn/css/lib.css
diff --git a/cdn/js/lib.js b/cdn/js/lib.js
diff --git a/cdn/js/src/08.lazyload.min.js b/cdn/js/src/08.lazyload.min.js
diff --git a/cdn/js/src/10.materialize.min.js b/cdn/js/src/10.materialize.min.js
diff --git a/cdn/js/src/16.hls.js b/cdn/js/src/16.hls.js
diff --git a/cdn/theme/github.css b/cdn/theme/github.css
@@ -924,6 +924,6 @@
 }
 
 /*other fix*/
-.entry-content ol, ul {
+.entry-content ol,.entry-content ul {
     margin: auto !important;
-}
+}
diff --git a/cdn/theme/sakura.css b/cdn/theme/sakura.css
@@ -55,27 +55,34 @@
     position: relative
 }
 
+.entry-content h3, .entry-content h4, .entry-content h5 {
+    padding-left: 16px;
+}
+
 .entry-content h3 {
     padding-bottom: 8px;
     border-bottom: 1px dashed #ddd;
     color: #737373
 }
 
-.entry-content h3:before {
+.entry-content h3:after {
     content: "#";
-    margin-right: 5px;
+    position: absolute;
+    left: 0;
     color: #FF6D6D
 }
 
-.entry-content h4:before {
+.entry-content h4:after {
     content: ">";
-    margin-right: 5px;
+    position: absolute;
+    left: 0;
     color: #FF6D6D
 }
 
-.entry-content h5:before {
+.entry-content h5:after {
     content: "?";
-    margin-right: 5px;
+    position: absolute;
+    left: 0;
     color: #FF6D6D
 }