Merge pull request #386 from mirai-mamori/preview

燕「ツバメ」　Update　SP1
mirai-mamori · Nov 28, 2021 · e78e7d9 · e78e7d9
2 parents 4587d9d + 8b5825d
commit e78e7d9
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 21 deletions.
diff --git a/functions.php b/functions.php
@@ -2098,5 +2098,5 @@ function should_show_title():bool{
     $use_as_thumb = get_post_meta($id, 'use_as_thumb', true); //'true','only',(default)
     return !iro_opt('patternimg') 
     || !get_post_thumbnail_id($id) 
-    && $use_as_thumb == 'only' && !get_post_meta($id, 'video_cover', true);
+    && $use_as_thumb != 'true' && !get_post_meta($id, 'video_cover', true);
 }
diff --git a/header.php b/header.php
@@ -29,7 +29,7 @@
 
 <head>
 	<link rel="stylesheet" href="https://<?php echo iro_opt('gfonts_api','fonts.loli.net'); ?>/css?family=Noto+Serif|Merriweather|Merriweather+Sans|Source+Code+Pro|Ubuntu:400,700|Noto+Serif+SC<?php echo iro_opt('gfonts_add_name'); ?>" media="all">
-	<meta name="theme-color" content="<?php echo iro_opt('theme_skin_matching')?>" media="(prefers-color-scheme: light)">
+	<meta name="theme-color" content="" media="(prefers-color-scheme: light)">
 	<meta name="theme-color" content="<?php echo iro_opt('theme_skin_dark')?>" media="(prefers-color-scheme: dark)">
 
 	<meta charset="<?php bloginfo('charset'); ?>">

diff --git a/inc/categories-images.php b/inc/categories-images.php
@@ -207,7 +207,7 @@ function z_quick_edit_custom_box($column_name, $screen, $name) {
  */
 function z_taxonomy_columns( $columns ) {
 	$new_columns = array();
-	$new_columns['cb'] = $columns['cb'];
+	if(isset($columns['cb']))$new_columns['cb'] = $columns['cb'];
 	$new_columns['thumb'] = __('image', 'sakurairo')/*图像*/;
 
 	unset( $columns['cb'] );

diff --git a/inc/classes/Bilibili.php b/inc/classes/Bilibili.php
@@ -32,14 +32,20 @@ function fetch_api(int $type, int $page = 1)
             )
         );
         $response = wp_remote_get($url, $args);
-        return json_decode($response["body"], true);
+        if(is_array($response)){
+            return json_decode($response["body"], true);
+        }else{
+            return array('code'=>-1);
+        }
     }
 
     public function get_bgm_items($page = 1)
     {
         $resp = $this->fetch_api(1, $page);
         $code = $resp["code"];
         switch ($code) {
+            case -1://指示在网络请求阶段发生了错误
+                return '<div>后端发生了错误 QwQ</div>';
             case 0: {
                     $bgm = $resp['data'];
                     $totalpage = $bgm["total"] / 15;

diff --git a/inc/decorate.php b/inc/decorate.php
@@ -13,6 +13,7 @@ function customizer_css() { ?>
 if (iro_opt('theme_skin')) { ?>
 :root{
     --theme-skin: <?php echo iro_opt('theme_skin'); ?>;
+    --theme-skin-matching:<?php echo iro_opt('theme_skin_matching'); ?>
 }
 .author-profile i , .post-like a , .post-share .show-share , .sub-text , .we-info a , span.sitename { color: <?php echo iro_opt('theme_skin'); ?> }
 <?php if (iro_opt('theme_commemorate_mode')) {?>
@@ -508,7 +509,10 @@ function customizer_css() { ?>
 //$image_api = 'background-image: url("'.rest_url('sakura/v1/image/cover').'");';
 $bg_style = !iro_opt('cover_full_screen') ? 'background-position: center center;background-attachment: inherit;' : '';
 ?>
-.centerbg{<?php echo $bg_style ?>background-position: center center;background-attachment: inherit;}
+#centerbg{<?php 
+echo $bg_style;
+echo iro_opt('site_bg_as_cover',false)? 'background:#0000;':'';
+ ?>}
 .rotating {
     -webkit-animation: rotating 6s linear infinite;
     -moz-animation: rotating 6s linear infinite;

diff --git a/js/anf.js.LICENSE.txt b/js/anf.js.LICENSE.txt
@@ -1 +1 @@
-//! build be47151 2021/11/21
+//! build 627cc5b 2021/11/24
diff --git a/js/app.js b/js/app.js
diff --git a/js/app.js.LICENSE.txt b/js/app.js.LICENSE.txt
@@ -43,4 +43,4 @@
  * 
  */
 
-//! build be47151 2021/11/21
+//! build 627cc5b 2021/11/24
diff --git a/js/app.js.map b/js/app.js.map
diff --git a/js/page.js b/js/page.js
diff --git a/js/page.js.LICENSE.txt b/js/page.js.LICENSE.txt
@@ -5,4 +5,4 @@
  * @license  MIT
  */
 
-//! build be47151 2021/11/21
+//! build 627cc5b 2021/11/24
diff --git a/js/page.js.map b/js/page.js.map
diff --git a/style.css b/style.css
@@ -6,7 +6,7 @@ Theme URI: https://github.com/mirai-mamori/Sakurairo
 Author: Created by Fuukei
 Author URI: https://iro.tw/
 Description: A colorful, Easy-to-use, Perfect Experience, and Powerful Customizable WordPress Theme (Based on Theme Sakura)
-Version: 2.3.0
+Version: 2.3.1
 Tested up to: 5.8.2
 Requires at least: 5.5
 Requires PHP: 7.1
@@ -1618,7 +1618,7 @@ i.iconfont.hotpost {
     display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 4;
-    height: 85px;
+    height:6em;
     overflow: hidden
 }
 
@@ -7253,7 +7253,6 @@ li>ol {
     background-color: rgba(255, 255, 255, 0);
     transform: translateX(0);
     right: calc((100% - 1040px - 250px)/ 2);
-    position: absolute !important;
     top: 480px;
     position: absolute;
     padding-top: 10px;
@@ -8388,12 +8387,11 @@ td.hljs-ln-numbers {
     background: #ddd;
     color: black;
 }
-h1[id*=toc-head]::before,
-h2[id*=toc-head]::before,
-h3[id*=toc-head]::before,
-h4[id*=toc-head]::before,
-h5[id*=toc-head]::before,
-h6[id*=toc-head]::before {
+h1::before,
+h2::before,
+h3::before,
+h4::before,
+h5::before {
     display: block;
     content: " ";
     height: 80px;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		//! build be47151 2021/11/21
		//! build 627cc5b 2021/11/24
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,4 +43,4 @@ @@
      *
      */
-    //! build be47151 2021/11/21
+    //! build 627cc5b 2021/11/24