tianyi
/
tianyi-wp-theme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #202 from mashirozx/dev 

update to v3.3.7
This commit is contained in:
Mashiro 2020-03-21 22:41:46 -05:00 committed by GitHub
parent ccb0b6f5da 5c415480fa
commit 31e08ee6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 259 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdn/js/lib.js
View File

File diff suppressed because one or more lines are too long

2
cdn/js/src/11.third-part-functions.js
View File

@ -8,7 +8,7 @@ function get_gravatar(email, size) {
var size = size || 80; var size = size || 80;
return 'https://gravatar.shino.cc/avatar/' + MD5(email) + '.jpg?s=' + size + '&d=mm'; return 'https://gravatar.2heng.xin/avatar/' + MD5(email) + '.jpg?s=' + size + '&d=mm';
} }
// sync css // sync css

2
comments.php
View File

@ -88,7 +88,7 @@
'comment_notes_after' => '', 'comment_notes_after' => '',
'comment_notes_before' => '', 'comment_notes_before' => '',
'fields' => apply_filters( 'comment_form_default_fields', array( 'fields' => apply_filters( 'comment_form_default_fields', array(
'avatar' => '<div class="cmt-info-container"><div class="comment-user-avatar"><img src="https://gravatar.shino.cc/avatar/f11f237b3de93c93b24045e71f7f65c6?s=80&d=mm&r=g"><div class="socila-check qq-check"><i class="fa fa-qq" aria-hidden="true"></i></div><div class="socila-check gravatar-check"><i class="fa fa-google" aria-hidden="true"></i></div></div>', 'avatar' => '<div class="cmt-info-container"><div class="comment-user-avatar"><img src="https://gravatar.2heng.xin/avatar/f11f237b3de93c93b24045e71f7f65c6?s=80&d=mm&r=g"><div class="socila-check qq-check"><i class="fa fa-qq" aria-hidden="true"></i></div><div class="socila-check gravatar-check"><i class="fa fa-google" aria-hidden="true"></i></div></div>',
'author' => 'author' =>
'<div class="popup cmt-popup cmt-author" onclick="cmt_showPopup(this)"><span class="popuptext" id="thePopup" style="margin-left: -115px;width: 230px;">' . __("Auto pull nickname and avatar with a QQ num. entered", "sakura")/*输入QQ号将自动拉取昵称和头像*/ . '</span><input type="text" placeholder="' . __("Nickname or QQ number", "sakura") /*昵称或QQ号*/. ' ' . ( $req ? '(' . __("Name* ", "sakura") . ')' : '') . '" name="author" id="author" value="' . esc_attr($comment_author) . '" size="22" autocomplete="off" tabindex="1" ' . ($req ? "aria-required='true'" : '' ). ' /></div>', '<div class="popup cmt-popup cmt-author" onclick="cmt_showPopup(this)"><span class="popuptext" id="thePopup" style="margin-left: -115px;width: 230px;">' . __("Auto pull nickname and avatar with a QQ num. entered", "sakura")/*输入QQ号将自动拉取昵称和头像*/ . '</span><input type="text" placeholder="' . __("Nickname or QQ number", "sakura") /*昵称或QQ号*/. ' ' . ( $req ? '(' . __("Name* ", "sakura") . ')' : '') . '" name="author" id="author" value="' . esc_attr($comment_author) . '" size="22" autocomplete="off" tabindex="1" ' . ($req ? "aria-required='true'" : '' ). ' /></div>',
'email' => 'email' =>

11
functions.php
View File

@ -199,9 +199,9 @@ function sakura_scripts()
$movies = akina_option('focus_amv') ? array('url' => akina_option('amv_url'), 'name' => akina_option('amv_title'), 'live' => $mv_live) : 'close'; $movies = akina_option('focus_amv') ? array('url' => akina_option('amv_url'), 'name' => akina_option('amv_title'), 'live' => $mv_live) : 'close';
$auto_height = akina_option('focus_height') ? 'fixed' : 'auto'; $auto_height = akina_option('focus_height') ? 'fixed' : 'auto';
$code_lamp = 'close'; $code_lamp = 'close';
if (wp_is_mobile()) { // if (wp_is_mobile()) {
$auto_height = 'fixed'; // $auto_height = 'fixed';
} // }
//拦截移动端 //拦截移动端
version_compare($GLOBALS['wp_version'], '5.1', '>=') ? $reply_link_version = 'new' : $reply_link_version = 'old'; version_compare($GLOBALS['wp_version'], '5.1', '>=') ? $reply_link_version = 'new' : $reply_link_version = 'old';
wp_localize_script('app', 'Poi', array( wp_localize_script('app', 'Poi', array(
@ -215,6 +215,7 @@ function sakura_scripts()
'reply_link_version' => $reply_link_version, 'reply_link_version' => $reply_link_version,
'api' => esc_url_raw(rest_url()), 'api' => esc_url_raw(rest_url()),
'nonce' => wp_create_nonce('wp_rest'), 'nonce' => wp_create_nonce('wp_rest'),
'google_analytics_id' => akina_option('google_analytics_id', '')
)); ));
} }
add_action('wp_enqueue_scripts', 'sakura_scripts'); add_action('wp_enqueue_scripts', 'sakura_scripts');
@ -609,7 +610,9 @@ function get_link_items()
function gravatar_cn($url) function gravatar_cn($url)
{ {
$gravatar_url = array('0.gravatar.com', '1.gravatar.com', '2.gravatar.com', 'secure.gravatar.com'); $gravatar_url = array('0.gravatar.com', '1.gravatar.com', '2.gravatar.com', 'secure.gravatar.com');
return str_replace($gravatar_url, 'cn.gravatar.com', $url); //return str_replace($gravatar_url, 'cn.gravatar.com', $url);
//官方服务器近期大陆访问 429，建议使用镜像
return str_replace( $gravatar_url, 'gravatar.2heng.xin', $url );
} }
add_filter('get_avatar_url', 'gravatar_cn', 4); add_filter('get_avatar_url', 'gravatar_cn', 4);

15
inc/api.php
View File

@ -268,21 +268,24 @@ function SMMS_API($image)
*/ */
function cache_search_json() function cache_search_json()
{ {
global $more;
$vowels = array("[", "{", "]", "}", "<", ">", "\r\n", "\r", "\n", "-", "'", '"', '`', " ", ":", ";", '\\', " ", "toc"); $vowels = array("[", "{", "]", "}", "<", ">", "\r\n", "\r", "\n", "-", "'", '"', '`', " ", ":", ";", '\\', " ", "toc");
$regex = <<<EOS $regex = <<<EOS
/<\/?[a-zA-Z]+("[^"]*"|'[^']*'|[^'">])*>|begin[\S\s]*\/begin|hermit[\S\s]*\/hermit|img[\S\s]*\/img|{{.*?}}|:.*?:/m /<\/?[a-zA-Z]+("[^"]*"|'[^']*'|[^'">])*>|begin[\S\s]*\/begin|hermit[\S\s]*\/hermit|img[\S\s]*\/img|{{.*?}}|:.*?:/m
EOS; EOS;
$more = 1;
$posts = new WP_Query('posts_per_page=-1&post_status=publish&post_type=post'); $posts = new WP_Query('posts_per_page=-1&post_status=publish&post_type=post');
while ($posts->have_posts()): $posts->the_post(); while ($posts->have_posts()): $posts->the_post();
$output .= '{"type":"post","link":"' . get_permalink() . '","title":' . json_encode(get_the_title()) . ',"comments":"' . get_comments_number('0', '1', '%') . '","text":' . json_encode(str_replace($vowels, " ", preg_replace($regex, ' ', get_the_content()))) . '},'; $output .= '{"type":"post","link":"' . get_permalink() . '","title":' . json_encode(get_the_title()) . ',"comments":"' . get_comments_number('0', '1', '%') . '","text":' . json_encode(str_replace($vowels, " ", preg_replace($regex, ' ', apply_filters( 'the_content', get_the_content())))) . '},';
endwhile; endwhile;
wp_reset_postdata(); wp_reset_postdata();
$pages = get_pages(); $pages = new WP_Query('posts_per_page=-1&post_status=publish&post_type=page');
foreach ($pages as $page) { while ($pages->have_posts()): $pages->the_post();
$output .= '{"type":"page","link":"' . get_page_link($page) . '","title":' . json_encode($page->post_title) . ',"comments":"' . $page->comment_count . '","text":' . json_encode(str_replace($vowels, " ", preg_replace($regex, ' ', $page->post_content))) . '},'; $output .= '{"type":"page","link":"' . get_permalink() . '","title":' . json_encode(get_the_title()) . ',"comments":"' . get_comments_number('0', '1', '%') . '","text":' . json_encode(str_replace($vowels, " ", preg_replace($regex, ' ', apply_filters( 'the_content', get_the_content())))) . '},';
} endwhile;
wp_reset_postdata();
$tags = get_tags(); $tags = get_tags();
foreach ($tags as $tag) { foreach ($tags as $tag) {
@ -402,7 +405,7 @@ function get_qq_avatar(){
$encrypted=$_GET["qq"]; $encrypted=$_GET["qq"];
if(isset($encrypted)){ if(isset($encrypted)){
$iv = str_repeat($sakura_privkey, 2); $iv = str_repeat($sakura_privkey, 2);
$encrypted = urldecode(base64_decode($encrypted)); $encrypted = base64_decode(urldecode($encrypted));
$qq_number = openssl_decrypt($encrypted, 'aes-128-cbc', $sakura_privkey, 0, $iv); $qq_number = openssl_decrypt($encrypted, 'aes-128-cbc', $sakura_privkey, 0, $iv);
preg_match('/^\d{3,}$/', $qq_number, $matches); preg_match('/^\d{3,}$/', $qq_number, $matches);
$imgurl='https://q2.qlogo.cn/headimg_dl?dst_uin='.$matches[0].'&spec=100'; $imgurl='https://q2.qlogo.cn/headimg_dl?dst_uin='.$matches[0].'&spec=100';

3
inc/decorate.php
View File

@ -61,6 +61,9 @@ if ( akina_option('theme_skin') ) { ?>
} }
<?php } ?> <?php } ?>
.post-list-thumb{opacity: 0}
.post-list-show {opacity: 1}
<?php } // theme-skin ?> <?php } // theme-skin ?>
<?php // Custom style <?php // Custom style
if ( akina_option('site_custom_style') ) { if ( akina_option('site_custom_style') ) {

1
inc/swicher.php
View File

@ -73,6 +73,7 @@ mashiro_option.float_player_on = true;
mashiro_option.cover_api = "<?php echo rest_url('sakura/v1/image/cover'); ?>"; mashiro_option.cover_api = "<?php echo rest_url('sakura/v1/image/cover'); ?>";
mashiro_option.windowheight = /Mobile|Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent) ? 'fixed' : 'auto';
/*End of Initial Variables*/ /*End of Initial Variables*/
</script> </script>
<?php } <?php }

3
inc/theme_plus.php
View File

@ -791,9 +791,6 @@ function siren_get_browsers($ua){
}elseif (preg_match('#Edge/([a-zA-Z0-9.]+)#i', $ua, $matches)){ }elseif (preg_match('#Edge/([a-zA-Z0-9.]+)#i', $ua, $matches)){
$title = 'Edge '. $matches[1]; $title = 'Edge '. $matches[1];
$icon = 'edge'; $icon = 'edge';
}elseif (preg_match('#Edg/([a-zA-Z0-9.]+)#i', $ua, $matches)){
$title = 'Edge Dev (Chromium) '. $matches[1];
$icon = 'edge';
}elseif (preg_match('#360([a-zA-Z0-9.]+)#i', $ua, $matches)) { }elseif (preg_match('#360([a-zA-Z0-9.]+)#i', $ua, $matches)) {
$title = '360 Browser '. $matches[1]; $title = '360 Browser '. $matches[1];
$icon = '360se'; $icon = '360se';

282
js/sakura-app.js
View File

@ -5,6 +5,7 @@
* @date 2019.8.3 * @date 2019.8.3
*/ */
mashiro_global.variables = new function () { mashiro_global.variables = new function () {
this.has_hls = false;
this.skinSecter = true; this.skinSecter = true;
} }
mashiro_global.ini = new function () { mashiro_global.ini = new function () {
@ -77,10 +78,12 @@ function post_list_show_animation() {
function callback(entries) { function callback(entries) {
entries.forEach((article) => { entries.forEach((article) => {
if (article.target.classList.contains("post-list-show")) { if (article.target.classList.contains("post-list-show")) {
article.target.style.willChange = 'auto';
io.unobserve(article.target) io.unobserve(article.target)
} else { } else {
if (article.isIntersecting) { if (article.isIntersecting) {
article.target.classList.add("post-list-show"); article.target.classList.add("post-list-show");
article.target.style.willChange = 'auto';
io.unobserve(article.target) io.unobserve(article.target)
} }
} }
@ -416,22 +419,15 @@ $(document).ready(function () {
preBG(); preBG();
}); });
}); });
if (document.body.clientWidth <= 860) {
window.onscroll = function () {
scrollFunction()
};
function scrollFunction() { function topFunction() {
if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) { if ('scrollBehavior' in document.documentElement.style) {
addComment.I("moblieGoTop").style.display = "block"; window.scrollTo({
} else { top: 0,
addComment.I("moblieGoTop").style.display = "none"; behavior: "smooth"
} })
} } else {
window.scrollSmoothTo(0)
function topFunction() {
document.body.scrollTop = 0;
document.documentElement.scrollTop = 0;
} }
} }
@ -476,10 +472,20 @@ function timeSeriesReload(flag) {
var al_expand_collapse_click = 0; var al_expand_collapse_click = 0;
$('#al_expand_collapse').click(function () { $('#al_expand_collapse').click(function () {
if (al_expand_collapse_click == 0) { if (al_expand_collapse_click == 0) {
$al_post_list.show(400); $al_post_list.each(function(index){
var $this = $(this),
s = setTimeout(function() {
$this.show(400);
}, 50 * index);
});
al_expand_collapse_click++; al_expand_collapse_click++;
} else if (al_expand_collapse_click == 1) { } else if (al_expand_collapse_click == 1) {
$al_post_list.hide(400); $al_post_list.each(function(index){
var $this = $(this),
h = setTimeout(function() {
$this.hide(400);
}, 50 * index);
});
al_expand_collapse_click--; al_expand_collapse_click--;
} }
}); });
@ -523,25 +529,34 @@ function killCoverVideo() {
} }
} }
function loadHls(){
var video = addComment.I('coverVideo');
var video_src = $('#coverVideo').attr('data-src');
if (Hls.isSupported()) {
var hls = new Hls();
hls.loadSource(video_src);
hls.attachMedia(video);
hls.on(Hls.Events.MANIFEST_PARSED, function () {
video.play();
});
} else if (video.canPlayType('application/vnd.apple.mpegurl')) {
video.src = video_src;
video.addEventListener('loadedmetadata', function () {
video.play();
});
}
}
function coverVideoIni() { function coverVideoIni() {
if ($('video').hasClass('hls')) { if ($('video').hasClass('hls')) {
$.getScript("https://cdn.jsdelivr.net/gh/mashirozx/Sakura@3.3.3/cdn/js/src/16.hls.js", function(){ if (mashiro_global.variables.has_hls){
var video = addComment.I('coverVideo'); loadHls();
var video_src = $('#coverVideo').attr('data-src'); }else{
if (Hls.isSupported()) { $.getScript("https://cdn.jsdelivr.net/gh/mashirozx/Sakura@3.3.3/cdn/js/src/16.hls.js", function(){
var hls = new Hls(); loadHls();
hls.loadSource(video_src); mashiro_global.variables.has_hls = true;
hls.attachMedia(video); });
hls.on(Hls.Events.MANIFEST_PARSED, function () { }
video.play();
});
} else if (video.canPlayType('application/vnd.apple.mpegurl')) {
video.src = video_src;
video.addEventListener('loadedmetadata', function () {
video.play();
});
}
});
//console.info('ini:coverVideoIni()'); //console.info('ini:coverVideoIni()');
} }
} }
@ -864,53 +879,56 @@ function getqqinfo() {
} }
var emailAddressFlag = cached.filter('#email').val(); var emailAddressFlag = cached.filter('#email').val();
cached.filter('#author').on('blur', function () { cached.filter('#author').on('blur', function () {
var qq = cached.filter('#author').val(); var qq = cached.filter('#author').val(),
$.ajax({ $reg = /^[1-9]\d{4,9}$/;
type: 'get', if ($reg.test(qq)) {
url: mashiro_option.qq_api_url + '?qq=' + qq + '&_wpnonce=' + Poi.nonce, $.ajax({
dataType: 'json', type: 'get',
success: function (data) { url: mashiro_option.qq_api_url + '?qq=' + qq + '&_wpnonce=' + Poi.nonce,
cached.filter('#author').val(data.name); dataType: 'json',
cached.filter('#email').val($.trim(qq) + '@qq.com'); success: function (data) {
if (mashiro_option.qzone_autocomplete) { cached.filter('#author').val(data.name);
cached.filter('#url').val('https://user.qzone.qq.com/' + $.trim(qq)); cached.filter('#email').val($.trim(qq) + '@qq.com');
} if (mashiro_option.qzone_autocomplete) {
$('div.comment-user-avatar img').attr('src', 'https://q2.qlogo.cn/headimg_dl?dst_uin=' + qq + '&spec=100'); cached.filter('#url').val('https://user.qzone.qq.com/' + $.trim(qq));
is_get_by_qq = true; }
cached.filter('#qq').val($.trim(qq)); $('div.comment-user-avatar img').attr('src', 'https://q2.qlogo.cn/headimg_dl?dst_uin=' + qq + '&spec=100');
if (cached.filter('#qq').val()) { is_get_by_qq = true;
$('.qq-check').css('display', 'block'); cached.filter('#qq').val($.trim(qq));
$('.gravatar-check').css('display', 'none'); if (cached.filter('#qq').val()) {
} $('.qq-check').css('display', 'block');
setCookie('user_author', data.name, 30); $('.gravatar-check').css('display', 'none');
setCookie('user_qq', qq, 30); }
setCookie('is_user_qq', 'yes', 30); setCookie('user_author', data.name, 30);
setCookie('user_qq_email', qq + '@qq.com', 30); setCookie('user_qq', qq, 30);
setCookie('user_email', qq + '@qq.com', 30); setCookie('is_user_qq', 'yes', 30);
emailAddressFlag = cached.filter('#email').val(); setCookie('user_qq_email', qq + '@qq.com', 30);
/***/ setCookie('user_email', qq + '@qq.com', 30);
$('div.comment-user-avatar img').attr('src', data.avatar); emailAddressFlag = cached.filter('#email').val();
setCookie('user_avatar', data.avatar, 30); /***/
}, $('div.comment-user-avatar img').attr('src', data.avatar);
error: function () { setCookie('user_avatar', data.avatar, 30);
cached.filter('#qq').val(''); },
$('.qq-check').css('display', 'none'); error: function () {
$('.gravatar-check').css('display', 'block'); cached.filter('#qq').val('');
$('div.comment-user-avatar img').attr('src', get_gravatar(cached.filter('#email').val(), 80));
setCookie('user_qq', '', 30);
setCookie('user_email', cached.filter('#email').val(), 30);
setCookie('user_avatar', get_gravatar(cached.filter('#email').val(), 80), 30);
/***/
cached.filter('#qq,#email,#url').val('');
if (!cached.filter('#qq').val()) {
$('.qq-check').css('display', 'none'); $('.qq-check').css('display', 'none');
$('.gravatar-check').css('display', 'block'); $('.gravatar-check').css('display', 'block');
setCookie('user_qq', '', 30);
$('div.comment-user-avatar img').attr('src', get_gravatar(cached.filter('#email').val(), 80)); $('div.comment-user-avatar img').attr('src', get_gravatar(cached.filter('#email').val(), 80));
setCookie('user_qq', '', 30);
setCookie('user_email', cached.filter('#email').val(), 30);
setCookie('user_avatar', get_gravatar(cached.filter('#email').val(), 80), 30); setCookie('user_avatar', get_gravatar(cached.filter('#email').val(), 80), 30);
/***/
cached.filter('#qq,#email,#url').val('');
if (!cached.filter('#qq').val()) {
$('.qq-check').css('display', 'none');
$('.gravatar-check').css('display', 'block');
setCookie('user_qq', '', 30);
$('div.comment-user-avatar img').attr('src', get_gravatar(cached.filter('#email').val(), 80));
setCookie('user_avatar', get_gravatar(cached.filter('#email').val(), 80), 30);
}
} }
} });
}); }
// $.ajax({ // $.ajax({
// type: 'get', // type: 'get',
// url: mashiro_option.qq_avatar_api_url + '?type=getqqavatar&qq=' + qq, // url: mashiro_option.qq_avatar_api_url + '?type=getqqavatar&qq=' + qq,
@ -1216,13 +1234,6 @@ var home = location.href,
Siren = { Siren = {
MN: function () { MN: function () {
$('.iconflat').on('click', function () { $('.iconflat').on('click', function () {
if ($("#main-container").hasClass("open")) {
$('.iconflat').css('width', '50px').css('height', '50px');
$('.openNav').css('height', '50px');
} else {
$('.iconflat').css('width', '100%').css('height', '100%');
$('.openNav').css('height', '100%');
}
$('body').toggleClass('navOpen'); $('body').toggleClass('navOpen');
$('#main-container,#mo-nav,.openNav').toggleClass('open'); $('#main-container,#mo-nav,.openNav').toggleClass('open');
}); });
@ -1321,25 +1332,15 @@ var home = location.href,
}); });
}, },
AH: function () { AH: function () {
if (Poi.windowheight == 'auto') { if (Poi.windowheight == 'auto' && mashiro_option.windowheight == 'auto') {
if ($('h1.main-title').length > 0) { if ($('h1.main-title').length > 0) {
var _height = $(window).height() + "px"; var _height = $(window).height() + "px";
$('#centerbg').css({ $('#centerbg').css({
'height': _height 'height': '100vh'
}); });
$('#bgvideo').css({ $('#bgvideo').css({
'min-height': _height 'min-height': '100vh'
}); });
window.resizeFlag = null;
$(window).resize(function () {
//直接resize性能爆炸，改成延时
if (resizeFlag = null) {
clearTimeout(resizeFlag);
}
resizeFlag = setTimeout(function () {
Siren.AH();
}, 1000);
})
} }
} else { } else {
$('.headertop').addClass('headertop-bar'); $('.headertop').addClass('headertop-bar');
@ -1534,17 +1535,19 @@ var home = location.href,
}); });
}, },
NH: function () { NH: function () {
var h1 = 0; if(document.body.clientWidth > 860){
$(window).scroll(function () { var h1 = 0;
var s = $(document).scrollTop(), $(window).scroll(function () {
cached = $('.site-header'); var s = $(document).scrollTop(),
if (s == h1) { cached = $('.site-header');
cached.removeClass('yya'); if (s == h1) {
} cached.removeClass('yya');
if (s > h1) { }
cached.addClass('yya'); if (s > h1) {
} cached.addClass('yya');
}
}); });
}
}, },
XLS: function () { XLS: function () {
$body = (window.opera) ? (document.compatMode == "CSS1Compat" ? $('html') : $('body')) : $('html,body'); $body = (window.opera) ? (document.compatMode == "CSS1Compat" ? $('html') : $('body')) : $('html,body');
@ -1719,6 +1722,7 @@ var home = location.href,
$body = (window.opera) ? (document.compatMode == "CSS1Compat" ? $('html') : $('body')) : $('html,body'); $body = (window.opera) ? (document.compatMode == "CSS1Compat" ? $('html') : $('body')) : $('html,body');
$('body').on('click', '#comments-navi a', function (e) { $('body').on('click', '#comments-navi a', function (e) {
e.preventDefault(); e.preventDefault();
var path = $(this)[0].pathname;
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: $(this).attr('href'), url: $(this).attr('href'),
@ -1738,6 +1742,11 @@ var home = location.href,
$('#loading-comments').after(result.fadeIn(500)); $('#loading-comments').after(result.fadeIn(500));
$('ul.commentwrap').after(nextlink); $('ul.commentwrap').after(nextlink);
lazyload(); lazyload();
if (window.gtag) {
gtag('config', Poi.google_analytics_id, {
'page_path': path
});
}
code_highlight_style(); code_highlight_style();
click_to_view_image(); click_to_view_image();
} }
@ -1750,36 +1759,43 @@ var home = location.href,
document.body.addEventListener('input', POWERMODE) document.body.addEventListener('input', POWERMODE)
}, },
GT: function () { GT: function () {
var offset = 100, var cwidth = document.body.clientWidth,
offset_opacity = 1200, cheight = window.innerHeight,
scroll_top_duration = 700, pc_to_top = document.querySelector(".cd-top"),
$back_to_top = $('.cd-top'); mb_to_top = document.querySelector("#moblieGoTop"),
$(window).scroll(function () { changeskin = document.querySelector(".changeSkin-gear");
if ($(this).scrollTop() > offset) {
$back_to_top.addClass('cd-is-visible'); $(window).scroll(function() {
$(".changeSkin-gear").css("bottom", "0"); if (cwidth <= 860) {
if ($(window).height() > 950) { if ($(this).scrollTop() > 20) {
$(".cd-top.cd-is-visible").css("top", "0"); mb_to_top.style.transform = "scale(1)";
} else { } else {
$(".cd-top.cd-is-visible").css("top", ($(window).height() - 950) + "px"); mb_to_top.style.transform = "scale(0)";
} }
} else { } else {
$(".changeSkin-gear").css("bottom", "-999px"); if ($(this).scrollTop() > 100) {
$(".cd-top.cd-is-visible").css("top", "-900px"); pc_to_top.classList.add("cd-is-visible");
$back_to_top.removeClass('cd-is-visible cd-fade-out'); changeskin.style.bottom = "0";
} if (cheight > 950) {
if ($(this).scrollTop() > offset_opacity) { pc_to_top.style.top = "0";
$back_to_top.addClass('cd-fade-out'); } else {
pc_to_top.style.top = cheight - 950 + "px";
}
} else {
changeskin.style.bottom = "-999px";
pc_to_top.style.top = "-999px";
pc_to_top.classList.remove("cd-fade-out", "cd-is-visible");
}
if ($(this).scrollTop() > 1200) {
pc_to_top.classList.add("cd-fade-out");
}
} }
}); });
//smooth scroll to top //smooth scroll to top
$back_to_top.on('click', function (event) { pc_to_top.onclick = function() {
event.preventDefault(); topFunction();
$('body,html').animate({ }
scrollTop: 0,
}, scroll_top_duration);
return false;
});
} }
} }
$(function () { $(function () {
@ -1825,6 +1841,12 @@ $(function () {
$.getScript("//static.duoshuo.com/embed.js"); $.getScript("//static.duoshuo.com/embed.js");
} }
} }
}).on('pjax:end', function() {
if (window.gtag){
gtag('config', Poi.google_analytics_id, {
'page_path': window.location.pathname
});
}
}).on('submit', '.search-form,.s-search', function (event) { }).on('submit', '.search-form,.s-search', function (event) {
event.preventDefault(); event.preventDefault();
$.pjax.submit(event, '#page', { $.pjax.submit(event, '#page', {

BIN
languages/en_US.mo
View File

Binary file not shown.

30
languages/en_US.po
View File

@ -1,15 +1,15 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Sakura\n" "Project-Id-Version: Sakura\n"
"POT-Creation-Date: 2020-01-07 17:27+0800\n" "POT-Creation-Date: 2020-02-13 23:59+0800\n"
"PO-Revision-Date: 2020-01-07 17:27+0800\n" "PO-Revision-Date: 2020-02-13 23:59+0800\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: en_US\n" "Language: en_US\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.4\n" "X-Generator: Poedit 2.3\n"
"X-Poedit-Basepath: ..\n" "X-Poedit-Basepath: ..\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n" "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
@ -181,35 +181,35 @@ msgstr ""
msgid "This guy is so lazy ╮(╯▽╰)╭" msgid "This guy is so lazy ╮(╯▽╰)╭"
msgstr "" msgstr ""
#: functions.php:1327 #: functions.php:1329
msgid "All expand/collapse" msgid "All expand/collapse"
msgstr "" msgstr ""
#: functions.php:1348 options.php:834 #: functions.php:1350 options.php:834
msgid " " msgid " "
msgstr "" msgstr ""
#: functions.php:1352 #: functions.php:1354
msgid " post(s)" msgid " post(s)"
msgstr "" msgstr ""
#: functions.php:1375 functions.php:1378 inc/theme_plus.php:478 #: functions.php:1377 functions.php:1380 inc/theme_plus.php:478
msgid "Dashboard" msgid "Dashboard"
msgstr "" msgstr ""
#: functions.php:1604 #: functions.php:1606
msgid "<b>ERROR</b>: This email domain (<b>@" msgid "<b>ERROR</b>: This email domain (<b>@"
msgstr "" msgstr ""
#: functions.php:1709 #: functions.php:1711
msgid "QQ" msgid "QQ"
msgstr "" msgstr ""
#: functions.php:1779 #: functions.php:1781
msgid "Sidebar" msgid "Sidebar"
msgstr "" msgstr ""
#: functions.php:1891 #: functions.php:1893
msgid "" msgid ""
"<b> For a better experience, please do not set <a href=\"/wp-admin/options-" "<b> For a better experience, please do not set <a href=\"/wp-admin/options-"
"permalink.php\"> permalink </a> as plain. To do this, you may need to " "permalink.php\"> permalink </a> as plain. To do this, you may need to "
@ -1710,17 +1710,17 @@ msgstr "Search result: %s"
msgid "NOTHING" msgid "NOTHING"
msgstr "" msgstr ""
#: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:53 #: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:56
#: tpl/content.php:34 #: tpl/content.php:34
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:53 #: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:56
#: tpl/content.php:34 #: tpl/content.php:34
msgid "Comments" msgid "Comments"
msgstr "" msgstr ""
#: tpl/content-image.php:38 tpl/content-status.php:34 tpl/content-thumb.php:52 #: tpl/content-image.php:38 tpl/content-status.php:34 tpl/content-thumb.php:55
#: tpl/content.php:37 #: tpl/content.php:37
msgid "Hit" msgid "Hit"
msgid_plural "Hits" msgid_plural "Hits"
@ -1728,7 +1728,7 @@ msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: tpl/content-none.php:14 #: tpl/content-none.php:14
msgid "There is noyhing here！" msgid "There is nothing here！"
msgstr "" msgstr ""
#: tpl/content-none.php:21 #: tpl/content-none.php:21

28
languages/sakura.pot
View File

@ -3,14 +3,14 @@ msgid ""
msgstr "" msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"Project-Id-Version: Sakura\n" "Project-Id-Version: Sakura\n"
"POT-Creation-Date: 2020-01-07 17:27+0800\n" "POT-Creation-Date: 2020-02-13 23:59+0800\n"
"PO-Revision-Date: 2019-11-01 14:27+0800\n" "PO-Revision-Date: 2019-11-01 14:27+0800\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.4\n" "X-Generator: Poedit 2.3\n"
"X-Poedit-Basepath: ..\n" "X-Poedit-Basepath: ..\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n" "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
"X-Poedit-WPHeader: style.css\n" "X-Poedit-WPHeader: style.css\n"
@ -180,35 +180,35 @@ msgstr ""
msgid "This guy is so lazy ╮(╯▽╰)╭" msgid "This guy is so lazy ╮(╯▽╰)╭"
msgstr "" msgstr ""
#: functions.php:1327 #: functions.php:1329
msgid "All expand/collapse" msgid "All expand/collapse"
msgstr "" msgstr ""
#: functions.php:1348 options.php:834 #: functions.php:1350 options.php:834
msgid " " msgid " "
msgstr "" msgstr ""
#: functions.php:1352 #: functions.php:1354
msgid " post(s)" msgid " post(s)"
msgstr "" msgstr ""
#: functions.php:1375 functions.php:1378 inc/theme_plus.php:478 #: functions.php:1377 functions.php:1380 inc/theme_plus.php:478
msgid "Dashboard" msgid "Dashboard"
msgstr "" msgstr ""
#: functions.php:1604 #: functions.php:1606
msgid "<b>ERROR</b>: This email domain (<b>@" msgid "<b>ERROR</b>: This email domain (<b>@"
msgstr "" msgstr ""
#: functions.php:1709 #: functions.php:1711
msgid "QQ" msgid "QQ"
msgstr "" msgstr ""
#: functions.php:1779 #: functions.php:1781
msgid "Sidebar" msgid "Sidebar"
msgstr "" msgstr ""
#: functions.php:1891 #: functions.php:1893
msgid "" msgid ""
"<b> For a better experience, please do not set <a href=\"/wp-admin/options-permalink.php\"> " "<b> For a better experience, please do not set <a href=\"/wp-admin/options-permalink.php\"> "
"permalink </a> as plain. To do this, you may need to configure <a href=\"https://www.wpdaxue." "permalink </a> as plain. To do this, you may need to configure <a href=\"https://www.wpdaxue."
@ -1675,22 +1675,22 @@ msgstr ""
msgid "NOTHING" msgid "NOTHING"
msgstr "" msgstr ""
#: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:53 tpl/content.php:34 #: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:56 tpl/content.php:34
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:53 tpl/content.php:34 #: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:56 tpl/content.php:34
msgid "Comments" msgid "Comments"
msgstr "" msgstr ""
#: tpl/content-image.php:38 tpl/content-status.php:34 tpl/content-thumb.php:52 tpl/content.php:37 #: tpl/content-image.php:38 tpl/content-status.php:34 tpl/content-thumb.php:55 tpl/content.php:37
msgid "Hit" msgid "Hit"
msgid_plural "Hits" msgid_plural "Hits"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: tpl/content-none.php:14 #: tpl/content-none.php:14
msgid "There is noyhing here！" msgid "There is nothing here！"
msgstr "" msgstr ""
#: tpl/content-none.php:21 #: tpl/content-none.php:21

BIN
languages/zh_CN.mo
View File

Binary file not shown.

30
languages/zh_CN.po
View File

@ -1,15 +1,15 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Sakura\n" "Project-Id-Version: Sakura\n"
"POT-Creation-Date: 2020-01-07 17:29+0800\n" "POT-Creation-Date: 2020-02-13 23:59+0800\n"
"PO-Revision-Date: 2020-01-07 17:32+0800\n" "PO-Revision-Date: 2020-02-13 23:59+0800\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: zh_CN\n" "Language: zh_CN\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.4\n" "X-Generator: Poedit 2.3\n"
"X-Poedit-Basepath: ..\n" "X-Poedit-Basepath: ..\n"
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n" "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
@ -183,35 +183,35 @@ msgstr ""
msgid "This guy is so lazy ╮(╯▽╰)╭" msgid "This guy is so lazy ╮(╯▽╰)╭"
msgstr "这家伙好懒╮(╯▽╰)╭" msgstr "这家伙好懒╮(╯▽╰)╭"
#: functions.php:1327 #: functions.php:1329
msgid "All expand/collapse" msgid "All expand/collapse"
msgstr "全部展开/收缩" msgstr "全部展开/收缩"
#: functions.php:1348 options.php:834 #: functions.php:1350 options.php:834
msgid " " msgid " "
msgstr "" msgstr ""
#: functions.php:1352 #: functions.php:1354
msgid " post(s)" msgid " post(s)"
msgstr " 篇文章" msgstr " 篇文章"
#: functions.php:1375 functions.php:1378 inc/theme_plus.php:478 #: functions.php:1377 functions.php:1380 inc/theme_plus.php:478
msgid "Dashboard" msgid "Dashboard"
msgstr "管理中心" msgstr "管理中心"
#: functions.php:1604 #: functions.php:1606
msgid "<b>ERROR</b>: This email domain (<b>@" msgid "<b>ERROR</b>: This email domain (<b>@"
msgstr "" msgstr ""
#: functions.php:1709 #: functions.php:1711
msgid "QQ" msgid "QQ"
msgstr "" msgstr ""
#: functions.php:1779 #: functions.php:1781
msgid "Sidebar" msgid "Sidebar"
msgstr "侧栏" msgstr "侧栏"
#: functions.php:1891 #: functions.php:1893
msgid "" msgid ""
"<b> For a better experience, please do not set <a href=\"/wp-admin/options-" "<b> For a better experience, please do not set <a href=\"/wp-admin/options-"
"permalink.php\"> permalink </a> as plain. To do this, you may need to " "permalink.php\"> permalink </a> as plain. To do this, you may need to "
@ -1764,24 +1764,24 @@ msgstr "关于 %s 的搜索结果："
msgid "NOTHING" msgid "NOTHING"
msgstr "啥也没有呀" msgstr "啥也没有呀"
#: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:53 #: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:56
#: tpl/content.php:34 #: tpl/content.php:34
msgid "Comment" msgid "Comment"
msgstr "条评论" msgstr "条评论"
#: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:53 #: tpl/content-image.php:35 tpl/content-status.php:31 tpl/content-thumb.php:56
#: tpl/content.php:34 #: tpl/content.php:34
msgid "Comments" msgid "Comments"
msgstr "条评论" msgstr "条评论"
#: tpl/content-image.php:38 tpl/content-status.php:34 tpl/content-thumb.php:52 #: tpl/content-image.php:38 tpl/content-status.php:34 tpl/content-thumb.php:55
#: tpl/content.php:37 #: tpl/content.php:37
msgid "Hit" msgid "Hit"
msgid_plural "Hits" msgid_plural "Hits"
msgstr[0] "热度" msgstr[0] "热度"
#: tpl/content-none.php:14 #: tpl/content-none.php:14
msgid "There is noyhing here！" msgid "There is nothing here！"
msgstr "没有找到任何东西！" msgstr "没有找到任何东西！"
#: tpl/content-none.php:21 #: tpl/content-none.php:21

44
style.css
View File

@ -5,7 +5,7 @@ Theme URI: https://github.com/mashirozx/Sakura/
Author: Mashiro, Spirit, Louie, Fuzzz Author: Mashiro, Spirit, Louie, Fuzzz
Author URI: http://2heng.xin Author URI: http://2heng.xin
Description: A wonderful branch of theme Akina Description: A wonderful branch of theme Akina
Version: 3.3.6 Version: 3.3.7
License: GNU General Public License v2 or later License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: sakura Text Domain: sakura
@ -1086,6 +1086,7 @@ a:hover {
display: block display: block
} }
.m-nav { .m-nav {
display: none display: none
} }
@ -1142,6 +1143,23 @@ a:hover {
max-width: 100% max-width: 100%
} }
@media(max-width:1200px) {
.site-top .lower nav{
right: calc(-150px - 100%);
position: absolute;
float: right;
animation: searchbox .2s;
min-width: 860px;
z-index: -1
}
.site-top .lower nav.navbar {
right: calc(-50px - 100%);
}
.site-top .lower nav.navbar ul {
background: #fff;
}
}
#show-nav { #show-nav {
position: relative; position: relative;
float: right; float: right;
@ -1443,6 +1461,7 @@ i.iconfont.hotpost {
} }
.post-list-thumb { .post-list-thumb {
will-change: transform;
float: left; float: left;
width: 100%; width: 100%;
height: 300px; height: 300px;
@ -1456,7 +1475,7 @@ i.iconfont.hotpost {
@media (max-width:860px) { @media (max-width:860px) {
.post-list-thumb { .post-list-thumb {
margin: 0; margin: 10px 0 10px;
height: auto height: auto
} }
} }
@ -1870,7 +1889,6 @@ h1.page-title.mb- {
} }
#moblieGoTop { #moblieGoTop {
display: none;
position: fixed; position: fixed;
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
@ -1884,9 +1902,9 @@ h1.page-title.mb- {
border-radius: 10px; border-radius: 10px;
border-radius: 12px; border-radius: 12px;
box-shadow: 0 0 2px 0 rgba(0, 0, 0, .12), 0 2px 2px 0 rgba(0, 0, 0, .24); box-shadow: 0 0 2px 0 rgba(0, 0, 0, .12), 0 2px 2px 0 rgba(0, 0, 0, .24);
transition: box-shadow .2s ease transform: scale(0);
transition:transform .3s
} }
#moblieGoTop:hover { #moblieGoTop:hover {
background-color: #fff; background-color: #fff;
opacity: .8 opacity: .8
@ -4260,7 +4278,7 @@ i.iconfont.js-toggle-search.iconsearch {
.s-search input { .s-search input {
font-size: 1rem; font-size: 1rem;
background: #none; background: none;
padding: 12px 24px 12px 64px; padding: 12px 24px 12px 64px;
width: 100%; width: 100%;
outline: 0; outline: 0;
@ -4711,6 +4729,11 @@ i.iconfont.js-toggle-search.iconsearch {
margin-top: 0; margin-top: 0;
padding: 0 padding: 0
} }
.wp-smiley {
height: 2em !important;
max-height: 2em !important;
vertical-align: bottom;
}
embed, embed,
iframe, iframe,
@ -6840,9 +6863,9 @@ input[type=radio]:checked:before {
margin-right: 22px margin-right: 22px
} }
@media (max-width:800px) { @media (max-width:860px) {
.changeSkin-gear { .changeSkin-gear {
visibility: hidden visibility: hidden !important
} }
.changeSkin-gear span::before { .changeSkin-gear span::before {
content: "" content: ""
@ -7567,6 +7590,11 @@ a.toc-link {
} }
@media (max-width:860px) { @media (max-width:860px) {
.wp-smiley {
height:20px !important;
max-height:20px !important;
vertical-align:middle
}
.bili-container, .bili-container,
.tieba-container { .tieba-container {
padding-left: 0 padding-left: 0

2
tpl/content-none.php
View File

@ -11,7 +11,7 @@
<section class="no-results not-found"> <section class="no-results not-found">
<header class="page-header"> <header class="page-header">
<h1 class="page-title"><?php _e( 'There is noyhing here！', 'sakura' ); /*没有找到任何东西*/?></h1> <h1 class="page-title"><?php _e( 'There is nothing here！', 'sakura' ); /*没有找到任何东西*/?></h1>
</header><!-- .page-header --> </header><!-- .page-header -->
<div class="page-content"> <div class="page-content">

3
tpl/content-thumb.php
View File

@ -24,6 +24,9 @@ switch (akina_option('feature_align')) {
default: default:
$class = ($i%2 == 0) ? 'post-list-thumb-left' : ''; $class = ($i%2 == 0) ? 'post-list-thumb-left' : '';
} }
if( $i == 1 ){
$class .= ' post-list-show';
}
if(has_post_thumbnail()){ if(has_post_thumbnail()){
$large_image_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'large'); $large_image_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'large');
$post_img = $large_image_url[0]; $post_img = $large_image_url[0];