update from master

2019-08-03 22:01:44 +08:00 · 2019-08-03 22:01:44 +08:00 · fa8d20eb9f
parent c5db5f6caf e8820e8d00
commit fa8d20eb9f
8 changed files with 99 additions and 91 deletions
--- 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 主题版本
+
+**补充信息**
--- 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.
--- a/README.md
+++ b/README.md
@ -19,6 +19,8 @@

 本仓库国内镜像：<https://gitee.com/mashirozx/Sakura>

+主题交流群：860262481
+
 希望你喜欢！

 ### 打赏支持~
--- a/comments.php
+++ b/comments.php
@ -59,7 +59,7 @@
 						'title_reply_to' => '<div class="graybar"><i class="fa fa-comments-o"></i>' . esc_html__('Leave a Reply to', 'akina') . ' %s' . '</div>',
 						'cancel_reply_link' => esc_html__('Cancel Reply', 'akina'),
 						'label_submit' => esc_html__('BiuBiuBiu~', 'akina'),
-						'comment_field' => '<p><i class="iconfont icon-markdown"></i> Markdown Supported while <i class="fa fa-code" aria-hidden="true"></i> Forbidden</p><textarea placeholder="' . esc_attr__('你是我一生只会遇见一次的惊喜', 'akina') . ' ..." name="comment" class="commentbody" id="comment" rows="5" tabindex="4"></textarea>
+						'comment_field' => '<p><i class="iconfont icon-markdown"></i> Markdown Supported while <i class="fa fa-code" aria-hidden="true"></i> Forbidden</p><div class="comment-textarea"><textarea placeholder="' . esc_attr__('你是我一生只会遇见一次的惊喜', 'akina') . ' ..." name="comment" class="commentbody" id="comment" rows="5" tabindex="4"></textarea><label class="input-label">你是我一生只会遇见一次的惊喜 ...</label></div>
                        <div id="upload-img-show"></div>
                        <!--插入表情面版-->
                        <p id="emotion-toggle" class="no-select">
--- a/functions.php
+++ b/functions.php
@ -7,8 +7,8 @@
 * @package Sakura
 */
 
-define( 'SAKURA_VERSION', '3.1.9' );
-define( 'BUILD_VERSION', '2' );
+define( 'SAKURA_VERSION', '3.2.0' );
+define( 'BUILD_VERSION', '3' );
 define( 'JSDELIVR_VERSION', '3.6.7' );

 //ini_set('display_errors', true);
--- a/inc/decorate.php
+++ b/inc/decorate.php
@ -15,10 +15,14 @@ if ( akina_option('theme_skin') ) { ?>

 #aplayer-float .aplayer-lrc-current { color: <?php echo akina_option('theme_skin'); ?> !important}

-.is-active-link::before {
+.is-active-link::before, .commentbody:not(:placeholder-shown)~.input-label, .commentbody:focus~.input-label {
    background-color: <?php echo akina_option('theme_skin'); ?> !important
 }

+.commentbody:focus {
+    border-color: <?php echo akina_option('theme_skin'); ?> !important
+}
+
 .insert-image-tips:hover, .insert-image-tips-hover{ 
    color: <?php echo akina_option('theme_skin'); ?>;
    border: 1px solid <?php echo akina_option('theme_skin'); ?>
--- a/js/sakura-app.js
+++ b/js/sakura-app.js
@ -1,8 +1,8 @@
 /*！
- * Sakura application bundle
+ * Sakura application bundle theme ver 3.2.0
 * @author Mashiro
 * @url https://2heng.xin
- * @date 2018.12.28
+ * @date 2019.8.3
 */
 mashiro_global.variables = new function () {
    this.has_bot_ui = false;
@ -287,7 +287,6 @@ function scrollBar() {
    }
 }
 scrollBar();
-'主题切换代码好恶心，有空一定要重构';

 function checkBgImgCookie() {
    var bgurl = getCookie("bgImgSetting");
@ -444,18 +443,6 @@ if (document.body.clientWidth <= 860) {
    }
 }

-function reload_show_date_time() {
-    BirthDay = new Date("06/02/2017 18:00:00");
-    today = new Date();
-    timeold = (today.getTime() - BirthDay.getTime());
-    sectimeold = timeold / 1000
-    secondsold = Math.floor(sectimeold);
-    msPerDay = 24 * 60 * 60 * 1000
-    e_daysold = timeold / msPerDay
-    daysold = Math.floor(e_daysold);
-    monitorday.innerHTML = daysold;
-}
-
 function timeSeriesReload(flag) {
    if (flag == true) {
        $('#archives span.al_mon').click(function () {
@ -630,12 +617,6 @@ var pjaxInit = function () {
            reloadHermit();
        } catch (e) {};
    }
-    if ($("div").hasClass("popcontainer")) {
-        loadBotui();
-    }
-    try {
-        reload_show_date_time();
-    } catch (e) {}
    if (mashiro_global.variables.skinSecter === true) {
        $(".pattern-center").removeClass('pattern-center').addClass('pattern-center-sakura');
        $(".headertop-bar").removeClass('headertop-bar').addClass('headertop-bar-sakura');
@ -687,20 +668,6 @@ $.fn.commentPrivate = function () {
    }
 };

-function show_date_time() {
-    BirthDay = new Date("06/02/2017 18:00:00");
-    today = new Date();
-    timeold = (today.getTime() - BirthDay.getTime());
-    sectimeold = timeold / 1000
-    secondsold = Math.floor(sectimeold);
-    msPerDay = 24 * 60 * 60 * 1000
-    e_daysold = timeold / msPerDay
-    daysold = Math.floor(e_daysold);
-    monitorday.innerHTML = daysold;
-}
-try {
-    show_date_time();
-} catch (e) {}
 POWERMODE.colorful = true;
 POWERMODE.shake = false;
 document.body.addEventListener('input', POWERMODE);
@ -767,12 +734,6 @@ function grin(tag, type, before, after) {
        myField.focus();
    }
 }
-if ($("div").hasClass("popcontainer")) {
-    loadBotui();
-}
-$("bot-ui").click(function () {
-    loadBotui();
-});

 function add_copyright() {
    document.body.addEventListener("copy", function (e) {
@ -1022,51 +983,11 @@ function getqqinfo() {
    });
 }

-function loadBotui() {
-    if ($('div').hasClass('popcontainer')) {
-        if (mashiro_global.variables.has_bot_ui) {
-            bot_ui_ini();
-        } else {
-            $.getScript('https://pages.shino.cc/cdn/js/botui/botui.js', function () {
-                bot_ui_ini();
-                mashiro_global.variables.has_bot_ui = true;
-            });
-        }
-    }
-}
-
 function mail_me() {
    var mail = "mailto:" + mashiro_option.email_name + "@" + mashiro_option.email_domain;
    window.open(mail);
 }

-/*
-var currentFontIsUbuntu = true;
-
-function changeFont() {
-    if (currentFontIsUbuntu) {
-        loadCSS("https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.8/css/cn.css");
-        currentFontIsUbuntu = false;
-    } else {
-        loadCSS("https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.8/css/or.css");
-        currentFontIsUbuntu = true;
-    }
-}
-
-function convertChinese(zh) {
-    if (zh == 'cn') {
-        $("#zh_cn").css("display", "none");
-        $("#zh_tw").css("display", "inline-block");
-        loadCSS("https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.8/css/tw.css");
-    }
-    if (zh == 'tw') {
-        $("#zh_tw").css("display", "none");
-        $("#zh_cn").css("display", "inline-block");
-        loadCSS("https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.8/css/cn.css");
-    }
-}
-*/
-
 mashiro_global.ini.normalize();
 loadCSS(mashiro_option.jsdelivr_css_src);
 loadCSS(mashiro_option.entry_content_theme_src);
@ -1407,9 +1328,14 @@ var home = location.href,
                    $('#bgvideo').css({
                        'min-height': _height
                    });
+                    window.resizeFlag= null;
                    $(window).resize(function () {
-                        Siren.AH();
-                    });
+                        //直接resize性能爆炸，改成延时
+                        if(resizeFlag!=null){
+                            clearTimeout(resizeFlag);
+                        }
+                        resizeFlag = setTimeout(function(){ Siren.AH();resizeFlag=null }, 1000);
+                    })
                }
            } else {
                $('.headertop').addClass('headertop-bar');
@ -1811,4 +1737,4 @@ if ((isWebkit || isOpera || isIe) && document.getElementById && window.addEventL
            element.focus();
        }
    }, false);
-}
+}
--- a/style.css
+++ b/style.css
@ -5,7 +5,7 @@ Theme URI: https://2heng.xin/theme-sakura/
 Author: Mashiro, Louie, Fuzzz
 Author URI: http://2heng.xin
 Description: Akina主题分支（原版地址 http://www.akina.pw/themeakina）
-Version: 3.1.7
+Version: 3.2.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: akina
@ -3446,7 +3446,7 @@ a.page-numbers {
    margin-bottom: 10px;
    color: #535a63;
    border: 1px solid #ddd;
-    background-color: rgba(255, 255, 255, 0)
+    background-color: transparent
 }

 .comment-respond textarea {
@ -3454,10 +3454,39 @@ a.page-numbers {
    background-size: contain;
    background-repeat: no-repeat;
    background-position: right;
-    background-color: rgba(255, 255, 255, 0);
    resize: vertical
 }

+.comment-textarea {
+	position: relative
+}
+
+.commentbody:placeholder-shown::placeholder {
+	color: transparent
+}
+
+.commentbody:focus {
+	border-color: orange;
+	transition: border-color .25s
+}
+
+.input-label {
+	position: absolute;
+	left: 16px;
+	top: 20px;
+	padding: 0 6px;
+	transform-origin: 0 0;
+	pointer-events: none;
+	transition: all .25s
+}
+
+.commentbody:not(:placeholder-shown)~.input-label, .commentbody:focus~.input-label {
+	color: #fff;
+	background-color: orange;
+	transform: scale(.75) translate(-2px, -37px);
+	border-radius: 3px
+}
+
 .comment-respond .form-submit {
    clear: both;
    display: block;