Skip to content

Commit

Permalink
Merge pull request #804 from mirai-mamori/preview
Browse files Browse the repository at this point in the history
アイドル(IDOL) Update(3.1)
  • Loading branch information
mirai-mamori authored Nov 1, 2023
2 parents 8ba2d76 + 3acc5d2 commit 25ff45d
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 36 deletions.
2 changes: 1 addition & 1 deletion comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
'comment_notes_after' => '',
'comment_notes_before' => '',
'fields' => apply_filters( 'comment_form_default_fields', array(
'avatar' => '<div class="cmt-info-container"><div class="comment-user-avatar"><img src="' . iro_opt('vision_resource_basepath', 'https://s.nmxc.ltd/sakurairo_vision/@2.6/') . 'basic/avatar.jpeg"><div class="socila-check qq-check"><i class="fa-brands fa-qq"></i></div><div class="socila-check gravatar-check"><i class="fa-solid fa-face-kiss-wink-heart"></i></div></div>',
'avatar' => '<div class="cmt-info-container"><div class="comment-user-avatar"><img alt="comment_user_avatar" src="' . iro_opt('vision_resource_basepath', 'https://s.nmxc.ltd/sakurairo_vision/@2.6/') . 'basic/avatar.jpeg"><div class="socila-check qq-check"><i class="fa-brands fa-qq"></i></div><div class="socila-check gravatar-check"><i class="fa-solid fa-face-kiss-wink-heart"></i></div></div>',
'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", "sakurairo")/*输入QQ号将自动拉取昵称和头像*/ . '</span><input type="text" placeholder="' . __("Nickname or QQ number", "sakurairo") /*昵称或QQ号*/. ' ' . ( $req ? '(' . __("Name* ", "sakurairo") . ')' : '') . '" name="author" id="author" value="' . esc_attr($comment_author) . '" size="22" autocomplete="off" tabindex="1" ' . ($req ? "aria-required='true'" : '' ). ' /></div>',
'email' =>
Expand Down
4 changes: 2 additions & 2 deletions footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="site-info" theme-info="Sakurairo v<?php echo IRO_VERSION; ?>">
<div class="footertext">
<div class="img-preload">
<img src="<?php echo iro_opt('load_nextpage_svg'); ?>"><!-- 加载下一部分圈圈 -->
<img alt="loading_svg" src="<?php echo iro_opt('load_nextpage_svg'); ?>"><!-- 加载下一部分圈圈 -->
</div>
<div class="sakura-icon" style="width:max-content;height:max-content;margin: auto;">
<svg width="30px" height="30px" t="1682340134496" class="sakura-svg" viewBox="0 0 1049 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5240"><path d="M525.58396628 573.34694353s268.83106938-2.62915481 309.36387092 193.24287089l-76.46458293 21.90962291 12.92667757 84.13295086a214.05701289 214.05701289 0 0 1-96.84053193-4.82011663A224.79272784 224.79272784 0 0 1 525.58396628 578.38615666z" fill="#EE9ca7" p-id="5241"></path><path d="M552.75189802 512.4381922s131.45773592-233.7756732 321.63325979-170.89505575L854.2283053 418.66500728l79.31283344 30.89256828a215.59068679 215.59068679 0 0 1-52.58309388 81.50379604 224.57363215 224.57363215 0 0 1-325.35789552-14.67944718z" fill="#EE9ca7" p-id="5242"></path><path d="M508.49446078 494.0341093S317.00435871 306.48774025 426.77156822 139.31731943l69.4535037 38.78003191L547.4935884 109.30113636a214.05701289 214.05701289 0 0 1 65.72886796 71.86356201 225.01182435 225.01182435 0 0 1-98.37420505 310.67844912z" fill="#EE9ca7" p-id="5243"></path><path d="M473.21996809 525.58396628S242.2925454 661.64272234 109.30113636 512.4381922l55.43134521-57.18411482-53.45947909-65.72886795a213.61882069 213.61882069 0 0 1 86.32391269-43.81924506 224.79272784 224.79272784 0 0 1 274.527572 175.27698099z" fill="#EE9ca7" p-id="5244"></path><path d="M481.76472043 566.55496s72.0826585 258.31445093-106.4807652 348.14390364l-40.31370582-68.13892627-78.21735252 34.17901099a212.30424328 212.30424328 0 0 1-20.15685331-94.64956933 224.57363215 224.57363215 0 0 1 241.00584894-219.09622602z" fill="#EE9ca7" p-id="5245"></path></svg>
Expand Down Expand Up @@ -56,7 +56,7 @@
$personal_avatar = iro_opt('personal_avatar');
$iro_logo = iro_opt('iro_logo');
$ava = iro_opt('personal_avatar') ? $personal_avatar: ($iro_logo ?: iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'series/avatar.webp'); ?>
<img src="<?php echo $ava ?>">
<img alt="m-avatar" src="<?php echo $ava ?>">
</div>
<div class="m-search">
<form class="m-search-form" method="get" action="<?php echo home_url(); ?>" role="search">
Expand Down
18 changes: 9 additions & 9 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


define('IRO_VERSION', wp_get_theme()->get('Version'));
define('INT_VERSION', '18.3.0');
define('INT_VERSION', '18.3.1');
define('BUILD_VERSION', '2');

function check_php_version($preset_version) {
Expand Down Expand Up @@ -445,7 +445,7 @@ function get_author_class($comment_author_email, $user_id)
}

// $Lv = $author_count < 5 ? 0 : ($author_count < 10 ? 1 : ($author_count < 20 ? 2 : ($author_count < 40 ? 3 : ($author_count < 80 ? 4 : ($author_count < 160 ? 5 : 6)))));
echo "<span class=\"showGrade{$Lv}\" title=\"Lv{$Lv}\"><img src=\"".iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/')."comment_level/level_{$Lv}.svg\" style=\"height: 1.5em; max-height: 1.5em; display: inline-block;\"></span>";
echo "<span class=\"showGrade{$Lv}\" title=\"Lv{$Lv}\"><img alt=\"level_img\" src=\"".iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/')."comment_level/level_{$Lv}.svg\" style=\"height: 1.5em; max-height: 1.5em; display: inline-block;\"></span>";
}

/**
Expand Down Expand Up @@ -534,7 +534,7 @@ function get_the_link_items($id = null)
$bookmark->link_image = 'https://s.nmxc.ltd/sakurairo_vision/@2.6/basic/friendlink.jpg';
}

$output .= '<li class="link-item"><a class="link-item-inner effect-apollo" href="' . $bookmark->link_url . '" title="' . $bookmark->link_description . '" target="_blank" rel="friend"><img class="lazyload" onerror="imgError(this,1)" data-src="' . $bookmark->link_image . '" src="' . iro_opt('load_in_svg') . '"></br><span class="sitename" style="'. $bookmark->link_notes .'">' . $bookmark->link_name . '</span><div class="linkdes">' . $bookmark->link_description . '</div></a></li>';
$output .= '<li class="link-item"><a class="link-item-inner effect-apollo" href="' . $bookmark->link_url . '" title="' . $bookmark->link_description . '" target="_blank" rel="friend"><img alt="friend_avator" class="lazyload" onerror="imgError(this,1)" data-src="' . $bookmark->link_image . '" src="' . iro_opt('load_in_svg') . '"></br><span class="sitename" style="'. $bookmark->link_notes .'">' . $bookmark->link_name . '</span><div class="linkdes">' . $bookmark->link_description . '</div></a></li>';
}
$output .= '</ul>';
}
Expand Down Expand Up @@ -1178,8 +1178,8 @@ function push_custom_smilies() {
} else {
$smiley_url = $smiley['file_url'];
}
$custom_smilies_panel = $custom_smilies_panel . '<span title="' . $smiley['base_name'] . '" onclick="grin(' . "'" . $smiley['base_name'] . "'" . ',type = \'Math\')"><img loading="lazy" style="height: 60px;" src="' . $smiley_url . '" /></span>';
$custom_smiliestrans['{{' . $smiley['base_name'] . '}}'] = '<span title="' . $smiley['base_name'] . '" ><img loading="lazy" style="height: 60px;" src="' . $smiley_url . '" /></span>';
$custom_smilies_panel = $custom_smilies_panel . '<span title="' . $smiley['base_name'] . '" onclick="grin(' . "'" . $smiley['base_name'] . "'" . ',type = \'Math\')"><img alt="custom_smilies" loading="lazy" style="height: 60px;" src="' . $smiley_url . '" /></span>';
$custom_smiliestrans['{{' . $smiley['base_name'] . '}}'] = '<span title="' . $smiley['base_name'] . '" ><img alt="custom_smilies" loading="lazy" style="height: 60px;" src="' . $smiley_url . '" /></span>';
}

return $custom_smilies_panel;
Expand Down Expand Up @@ -1213,9 +1213,9 @@ function push_tieba_smilies()
$smiliesgs = '.' . $type;
foreach ($tiebaname as $tieba_Name) {
// 选择面版
$return_smiles = $return_smiles . '<span title="' . $tieba_Name . '" onclick="grin(' . "'" . $tieba_Name . "'" . ',type = \'tieba\')"><img loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $tiebaimgdir . 'icon_' . $tieba_Name . $smiliesgs . '" /></span>';
$return_smiles = $return_smiles . '<span title="' . $tieba_Name . '" onclick="grin(' . "'" . $tieba_Name . "'" . ',type = \'tieba\')"><img alt="tieba_smilie" loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $tiebaimgdir . 'icon_' . $tieba_Name . $smiliesgs . '" /></span>';
// 正文转换
$wpsmiliestrans['::' . $tieba_Name . '::'] = '<span title="' . $tieba_Name . '" onclick="grin(' . "'" . $tieba_Name . "'" . ',type = \'tieba\')"><img loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $tiebaimgdir . 'icon_' . $tieba_Name . $smiliesgs . '" /></span>';
$wpsmiliestrans['::' . $tieba_Name . '::'] = '<span title="' . $tieba_Name . '" onclick="grin(' . "'" . $tieba_Name . "'" . ',type = \'tieba\')"><img alt="tieba_smilie" loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $tiebaimgdir . 'icon_' . $tieba_Name . $smiliesgs . '" /></span>';
}
return $return_smiles;
}
Expand Down Expand Up @@ -1250,9 +1250,9 @@ function push_bili_smilies()
$smiliesgs = '.' . $type;
foreach ($name as $smilies_Name) {
// 选择面版
$return_smiles = $return_smiles . '<span title="' . $smilies_Name . '" onclick="grin(' . "'" . $smilies_Name . "'" . ',type = \'Math\')"><img loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $biliimgdir . 'emoji_' . $smilies_Name . $smiliesgs . '" /></span>';
$return_smiles = $return_smiles . '<span title="' . $smilies_Name . '" onclick="grin(' . "'" . $smilies_Name . "'" . ',type = \'Math\')"><img alt="bili_smilies" loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $biliimgdir . 'emoji_' . $smilies_Name . $smiliesgs . '" /></span>';
// 正文转换
$bilismiliestrans['{{' . $smilies_Name . '}}'] = '<span title="' . $smilies_Name . '" onclick="grin(' . "'" . $smilies_Name . "'" . ',type = \'Math\')"><img loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $biliimgdir . 'emoji_' . $smilies_Name . $smiliesgs . '" /></span>';
$bilismiliestrans['{{' . $smilies_Name . '}}'] = '<span title="' . $smilies_Name . '" onclick="grin(' . "'" . $smilies_Name . "'" . ',type = \'Math\')"><img alt="bili_smilies" loading="lazy" src="'.iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'smilies/' . $biliimgdir . 'emoji_' . $smilies_Name . $smiliesgs . '" /></span>';
}
return $return_smiles;
}
Expand Down
8 changes: 4 additions & 4 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ function gtag() {dataLayer.push(arguments)}
<span class="logolink moe-mashiro">
<a href="<?php bloginfo('url'); ?>">
<ruby>
<span class="sakuraso"><?php echo $mashiro_logo['text_a']; ?></span>
<span class="no"><?php echo $mashiro_logo['text_b']; ?></span>
<span class="shironeko"><?php echo $mashiro_logo['text_c']; ?></span>
<span class="sakuraso"><?= $mashiro_logo['text_a'] ?? ""; ?></span>
<span class="no"><?= $mashiro_logo['text_b'] ?? ""; ?></span>
<span class="shironeko"><?= $mashiro_logo['text_c'] ?? ""; ?></span>
<rp></rp>
<rt class="chinese-font"><?php echo $mashiro_logo['text_secondary']; ?></rt>
<rt class="chinese-font"><?= $mashiro_logo['text_secondary'] ?? ""; ?></rt>
<rp></rp>
</ruby>
</a>
Expand Down
13 changes: 6 additions & 7 deletions inc/theme_plus.php
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ function header_user_menu()
$ava = iro_opt('personal_avatar') ? iro_opt('personal_avatar') : get_avatar_url($current_user->user_email);
?>
<div class="header-user-avatar">
<img src="<?php echo get_avatar_url($current_user->ID, 64);/*$ava;*/ ?>" width="30" height="30">
<img alt="header_user_avatar" src="<?php echo get_avatar_url($current_user->ID, 64);/*$ava;*/ ?>" width="30" height="30">
<div class="header-user-menu">
<div class="header-user-name">
<?php _e("Signed in as", "sakurairo") ?>
Expand All @@ -442,7 +442,7 @@ function header_user_menu()
?>
<div class="header-user-avatar">
<a href="<?= $login_url ?>">
<img src="<?= $ava ?>" width="30" height="30">
<img alt="header_user_avatar" src="<?= $ava ?>" width="30" height="30">
</a>
<div class="header-user-menu">
<div class="header-user-name no-logged">
Expand Down Expand Up @@ -815,8 +815,7 @@ function siren_get_useragent(string $ua):string{
$imgurl = iro_opt('vision_resource_basepath').'ua/';
$browser = siren_get_browsers($ua);
$os = siren_get_os($ua);
return '&nbsp;&nbsp;<span class="useragent-info">( <img src="'. $imgurl.$browser['icon'] .'.svg">&nbsp;'. $browser['title'] .'&nbsp;&nbsp;<img src="'. $imgurl.$os['icon'] .'.svg">&nbsp;'. $os['title'] .' )</span>';
}
return '&nbsp;&nbsp;<span class="useragent-info">( <img alt="browser_icon" src="'. $imgurl.$browser['icon'] .'.svg">&nbsp;'. $browser['title'] .'&nbsp;&nbsp;<img alt="os_icon" src="'. $imgurl.$os['icon'] .'.svg">&nbsp;'. $os['title'] .' )</span>'; }
return '';
}

Expand All @@ -826,7 +825,7 @@ function mobile_get_useragent_icon(string $ua):string{
$imgurl = iro_opt('vision_resource_basepath').'ua/';
$browser = siren_get_browsers($ua);
$os = siren_get_os($ua);
return '<span class="useragent-info-m">( <img src="'. $imgurl.$browser['icon'] .'.svg">&nbsp;&nbsp;<img src="'. $imgurl.$os['icon'] .'.svg"> )</span>';
return '<span class="useragent-info-m">( <img alt="browser_icon" src="'. $imgurl.$browser['icon'] .'.svg">&nbsp;&nbsp;<img alt="os_icon" src="'. $imgurl.$os['icon'] .'.svg"> )</span>';
}
return '';
}
Expand All @@ -838,8 +837,8 @@ function the_reward(){
$alipay = iro_opt('alipay_code');
$wechat = iro_opt('wechat_code');
if($alipay || $wechat){
$alipay = $alipay ? '<li class="alipay-code"><img src="'.$alipay.'"></li>' : '';
$wechat = $wechat ? '<li class="wechat-code"><img src="'.$wechat.'"></li>' : '';
$alipay = $alipay ? '<li class="alipay-code"><img alt="alipay_img" src="'.$alipay.'"></li>' : '';
$wechat = $wechat ? '<li class="wechat-code"><img alt="wechat_img" src="'.$wechat.'"></li>' : '';
?>
<div class="reward-open"> <i class="fa-solid fa-piggy-bank fa-sm"></i>
<div class="reward-main">
Expand Down
1 change: 0 additions & 1 deletion js/4050.js.map

This file was deleted.

6 changes: 3 additions & 3 deletions js/4050.js → js/5054.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions js/5054.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! iro 024f2c5 2023/10/10*/
/*! iro d7bd401 2023/11/1*/

/*! loadCSS. [c]2020 Filament Group, Inc. MIT License */

Expand Down
2 changes: 1 addition & 1 deletion js/app.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/page.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/page.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion layouts/imgbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<h1 class="center-text glitch is-glitching Ubuntu-font" data-text="<?=$text_logo['text']; ?>">
<?php echo $text_logo['text']; ?></h1>
<?php else : ?>
<div class="header-tou"><a href="<?php bloginfo('url'); ?>"><img loading="lazy" src="<?=iro_opt('personal_avatar', '') ?: iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'series/avatar.webp'?>"></a>
<div class="header-tou"><a href="<?php bloginfo('url'); ?>"><img alt="avatar" loading="lazy" src="<?=iro_opt('personal_avatar', '') ?: iro_opt('vision_resource_basepath','https://s.nmxc.ltd/sakurairo_vision/@2.6/').'series/avatar.webp'?>"></a>
</div>
<?php endif; ?>
<div class="header-container">
Expand Down
4 changes: 2 additions & 2 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Theme URI: https://github.com/mirai-mamori/Sakurairo
Author: Created by Fuukei
Author URI: https://fuukei.org/
Description: A colorful, Easy-to-use, Perfect Experience, and Powerful Customizable WordPress Theme (Based on Theme Sakura)
Version: 2.6.3
Version: 2.6.3.1
Tested up to: 6.2
Requires at least: 5.8
Requires PHP: 7.2
Expand Down Expand Up @@ -5096,7 +5096,7 @@ input#wp-comment-cookies-consent {
}

.cbp_tmtimeline>li .cbp_tmlabel p{
line-height: 10px !important;
line-height: 25px !important;
}

.cbp_tmlabel:hover {
Expand Down
2 changes: 1 addition & 1 deletion tpl/content-thumb.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
} else {
$post_img = DEFAULT_FEATURE_IMAGE('th');
}
$cover_html = '<img class="lazyload" src="' . iro_opt('load_out_svg') . '#lazyload-blur" data-src="' . $post_img . '"/>';
$cover_html = '<img alt="post_img" class="lazyload" src="' . iro_opt('load_out_svg') . '#lazyload-blur" data-src="' . $post_img . '"/>';
break;
}

Expand Down

0 comments on commit 25ff45d

Please sign in to comment.