Merge pull request #59 from mirai-mamori/beta

1.14.0（ハルジオン　Update）

README.md

@@ -1,11 +1,10 @@
 ![image](https://cdn.jsdelivr.net/gh/mirai-mamori/web-img/img/ADTheme.jpg)
 
-<p align="center">
-<img src="https://cdn.jsdelivr.net/gh/mirai-mamori/web-img/img/mashiro-logo-s.png" alt="Sakurairo" width="350">
-</p>
-<h1 align="center">Sakurairo 🌸「桜いろ」</h1>
+![image](https://cdn.jsdelivr.net/gh/mirai-mamori/web-img/img/truelogo.png)
 
->基于主题 [Sakura](https://github.com/mashirozx/Sakura) 的基础上修改的Sakurairo主题
+<h1 align="left"> 「桜いろ」✿ Sakurairo </h1>
+
+> 一个多彩，实用，易于上手，具有强大自定义功能的 WordPress 主题（基于 [Sakura](https://github.com/mashirozx/Sakura) 主题）
 
 [![GitHub release](https://img.shields.io/github/v/release/mirai-mamori/Sakurairo.svg?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases/latest)[![GitHub Release Date](https://img.shields.io/github/release-date/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases)![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)[![jsDelivr hits (GitHub)](https://img.shields.io/jsdelivr/gh/hm/mirai-mamori/sakurairo?color=red&logo=jsdelivr&logoColor=red&style=for-the-badge)](https://www.jsdelivr.com/package/gh/mirai-mamori/sakurairo)
 
@@ -19,19 +18,15 @@
 
 ![image](https://cdn.jsdelivr.net/gh/mirai-mamori/web-img/img/helpgive.jpg)
 
-- 【 WordPress 主题 】Sakurairo 「桜いろ」🌸使用手册：https://asuhe.jp/daily/sakurairo-user-manual
-
-## 已知Bug：
-
-**暂无**
+- 【 WordPress 主题 】「桜いろ」✿ Sakurairo  使用手册：https://asuhe.jp/daily/sakurairo-user-manual
 
 ## 贡献者：
 
 <a href="https://github.com/mirai-mamori"><img src="https://avatars3.githubusercontent.com/u/61381142?s=400" alt="mirai-mamori" width="100"></a>  <a href="https://github.com/Ukenn2112"><img src="https://avatars3.githubusercontent.com/u/60847880?s=400" alt="Ukenn" width="100"></a>  <a href="https://github.com/spirit1431007"><img src="https://avatars1.githubusercontent.com/u/29689177?s=400" alt="Spirit" width="100"></a>  <a href="https://github.com/bymoye"><img src="https://avatars2.githubusercontent.com/u/27877470?s=400" alt="bymoye" width="100"></a>  <a href="https://github.com/givenhyh"><img src="https://avatars3.githubusercontent.com/u/37971883?s=400" alt="givenhyh" width="100"></a>  <a href="https://github.com/Sakurakouji-Runa"><img src="https://avatars2.githubusercontent.com/u/46081776?s=400" alt="Sakurakouji-Runa" width="100"></a>  
 
 ## 版权说明：
 
-- Sakurairo 主题 使用 [GPL V2.0](https://github.com/mirai-mamori/Sakurairo/blob/master/LICENSE) 协议开源。
+- 「桜いろ」✿ Sakurairo  主题 使用 [GPL V2.0](https://github.com/mirai-mamori/Sakurairo/blob/master/LICENSE) 协议开源。
 
 - 樱花飘落特效、波浪特效、说说模版等均来自互联网，如有版权问题，烦请发邮件（me#okaeri.org）给我，我会及时下线功能。
 

footer.php

@@ -112,18 +112,18 @@
 			<?php endif; ?>
 			<?php if (akina_option('extra-bg2', '1')): ?>
             <li id="diy2-bg">
-                <i class="fa fa-lemon-o" aria-hidden="true"></i>
+                <i class="fa fa-star-o" aria-hidden="true"></i>
 			</li><!--Diy2-->
 			<?php endif; ?>
 			<?php if (akina_option('extra-bg3', '1')): ?>
-            <li id="glass-bg">
+            <li id="diy3-bg">
 			    <i class="fa fa-delicious" aria-hidden="true"></i>
-			</li><!--Glass-->
+			</li><!--Diy3-->
 			<?php endif; ?>
-			<?php if (akina_option('shooting-star', '1')): ?>
-            <li id="dynamic-bg">
-			    <i class="fa fa-star-o" aria-hidden="true"></i>
-			</li><!--Dynamic-->
+			<?php if (akina_option('extra-bg4', '1')): ?>
+            <li id="diy4-bg">
+			    <i class="fa fa-lemon-o" aria-hidden="true"></i>
+			</li><!--Diy4-->
 			<?php endif; ?>
             <li id="dark-bg">
                 <i class="fa fa-moon-o" aria-hidden="true"></i>
@@ -140,7 +140,6 @@
 	</div>
 	<?php endif; ?>
 </div>
-<canvas id="night-mode-cover"></canvas>
 <?php if (akina_option('sakura_widget')) : ?>
 	<aside id="secondary" class="widget-area" role="complementary" style="left: -400px;">
     <div class="heading"><?php _e('Widgets') /*小工具*/ ?></div>
@@ -174,7 +173,7 @@ class="aplayer"
 
 <!-- Live2D看板娘 -->
 <?php if (akina_option('live2djs', '1')): ?>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/mirai-mamori/live2d-widget@0.8.2/autoload.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/<?php echo akina_option('live2d-custom'); ?>/live2d-widget@<?php echo akina_option('live2d-custom-ver'); ?>/autoload.js"></script>
 <?php endif; ?>
 
 <!-- logo字体部分 -->

functions.php

@@ -1579,7 +1579,7 @@ function set_default_admin_color($user_id)
 // WordPress Custom Font @ Admin
 function custom_admin_open_sans_font()
 {
-    echo '<link href="https://fonts.loli.net/css?family=Merriweather+Sans&display=swap" rel="stylesheet">' . PHP_EOL;
+    echo '<link href="https://fonts.googleapis.com/css?family=Merriweather+Sans&display=swap" rel="stylesheet">' . PHP_EOL;
     echo '<style>body, #wpadminbar *:not([class="ab-icon"]), .wp-core-ui, .media-menu, .media-frame *, .media-modal *{font-family:"Noto Serif SC","Source Han Serif SC","Source Han Serif","source-han-serif-sc","PT Serif","SongTi SC","MicroSoft Yahei",Georgia,serif !important;}</style>' . PHP_EOL;
 }
 add_action('admin_head', 'custom_admin_open_sans_font');
@@ -1588,7 +1588,7 @@ function custom_admin_open_sans_font()
 function custom_admin_open_sans_font_frontend_toolbar()
 {
     if (current_user_can('administrator')) {
-        echo '<link href="https://fonts.loli.net/css?family=Merriweather+Sans&display=swap" rel="stylesheet">' . PHP_EOL;
+        echo '<link href="https://fonts.googleapis.com/css?family=Merriweather+Sans&display=swap" rel="stylesheet">' . PHP_EOL;
         echo '<style>#wpadminbar *:not([class="ab-icon"]){font-family:"Noto Serif SC","Source Han Serif SC","Source Han Serif","source-han-serif-sc","PT Serif","SongTi SC","MicroSoft Yahei",Georgia,serif !important;}</style>' . PHP_EOL;
     }
 }
@@ -1598,7 +1598,7 @@ function custom_admin_open_sans_font_frontend_toolbar()
 function custom_admin_open_sans_font_login_page()
 {
     if (stripos($_SERVER["SCRIPT_NAME"], strrchr(wp_login_url(), '/')) !== false) {
-        echo '<link href="https://fonts.loli.net/css?family=Noto+Serif+SC&display=swap" rel="stylesheet">' . PHP_EOL;
+        echo '<link href="https://fonts.googleapis.com/css?family=Noto+Serif+SC&display=swap" rel="stylesheet">' . PHP_EOL;
         echo '<style>body{font-family:"Noto Serif SC","Source Han Serif SC","Source Han Serif","source-han-serif-sc","PT Serif","SongTi SC","MicroSoft Yahei",Georgia,serif !important;}</style>' . PHP_EOL;
     }
 }

header.php

@@ -23,7 +23,7 @@
 -->
 <html <?php language_attributes(); ?>>
 <head>
-<link rel="stylesheet" href="https://fonts.loli.net/css?family=Noto+SerifMerriweather|Merriweather+Sans|Source+Code+Pro|Ubuntu:400,700|Noto+Serif+SC<?php echo akina_option('addfonts'); ?>" media="all">
+<link rel="stylesheet" href="https://<?php echo akina_option('gfontsapi'); ?>/css?family=Noto+SerifMerriweather|Merriweather+Sans|Source+Code+Pro|Ubuntu:400,700|Noto+Serif+SC<?php echo akina_option('addfonts'); ?>" media="all">
 <meta name="theme-color" content="<?php echo akina_option('theme_skin'); ?>">
 <meta charset="<?php bloginfo( 'charset' ); ?>">
 <!--<meta name="viewport" content="width=device-width, initial-scale=1">-->
@@ -86,7 +86,7 @@
 	<div class="scrollbar" id="bar"></div>
 	<section id="main-container">
 		<?php 
-		if(!akina_option('head_focus')){ 
+		if(!akina_option('main-switch')){ 
 		$filter = akina_option('focus_img_filter');
 		?>
 		<div class="headertop <?php echo $filter; ?>">

inc/classes/Images.php

@@ -170,7 +170,8 @@ public static function mobile_cover_gallery() {
             $imgurl = trim($img_array[$img]);
             $imgurl = str_replace(get_template_directory(), get_template_directory_uri(), $imgurl);
         } elseif (akina_option('cover_cdn_options') == "type_3") {
-           $imgurl = akina_option('cover_cdn');
+          //$imgurl = akina_option('cover_cdn');
+           $imgurl = akina_option('cover_cdn_mobile');
         } else {
             global $sakura_mobile_image_array;
             $img_array = json_decode($sakura_mobile_image_array, true);