Merge pull request #314 from mirai-mamori/preview

Live Alive「God Bless」　Special　Update
mirai-mamori · Aug 26, 2021 · 76c8fab · 76c8fab
2 parents 586ac0d + c1a3e5b
commit 76c8fab
Show file tree

Hide file tree

Showing 27 changed files with 2,149 additions and 1,947 deletions.
diff --git a/comments.php b/comments.php
@@ -16,13 +16,11 @@
 	<?php if(comments_open()): ?>
 
 	<section id="comments" class="comments">
-<?php if (iro_opt('comment_area') == 'fold'):?>
-		<div class="commentwrap comments-hidden">
+		<div class="commentwrap comments-hidden<?php echo iro_opt('comment_area')=='fold'?' comments-fold':'' ?>">
 			<div class="notification"><i class="iconfont icon-mark"></i><?php _e('view comments', 'sakurairo'); /*查看评论*/?> -
 			<span class="noticom"><?php comments_number('NOTHING', '1'.__(" comment","sakurairo"), '%'.__(" comments","sakurairo")); ?> </span>
 			</div>
 		</div>
-<?php endif;?>
 		<div class="comments-main">
 		 <h3 id="comments-list-title">Comments | <span class="noticom"><?php comments_number('NOTHING', '1'.__(" comment","sakurairo"), '%'.__(" comments","sakurairo")); ?> </span></h3> 
 		<div id="loading-comments"><span></span></div>
@@ -32,7 +30,7 @@
 						array(
 							"type" => "comment",
 							"callback" => "akina_comment_format",
-							"reverse_top_level" => iro_opt('comment_order') == 'n2o' ? true : null
+							"reverse_top_level" => get_option('comment_order') == 'asc' ? null : true
 						)
 					);
 					?>

diff --git a/footer.php b/footer.php
@@ -150,9 +150,9 @@ class="aplayer"
     </div>
 <?php endif; ?>
 
-<!-- 飘落动效 -->
-<?php if (iro_opt('falling_effects') != 'off'): ?>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/Fuukei/Public_Repository@latest/static/js/<?php echo iro_opt('falling_effects'); ?>.js"></script>
+<!-- 樱花飘落动效 -->
+<?php if (iro_opt('sakura_falling_effects') != 'off'): ?>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/Fuukei/Public_Repository@latest/static/js/<?php echo iro_opt('sakura_falling_effects'); ?>.js"></script>
 <?php endif; ?>
 
 <!-- 首页波浪特效 -->
@@ -171,4 +171,35 @@ class="aplayer"
 echo iro_opt('footer_addition','');
 ?>
 </body>
+<!-- Particles动效 -->
+<?php if (iro_opt('particles_effects', 'true')): ?>
+
+<style type="text/css">
+  #particles-js {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  z-index: -1;
+}
+</style>
+
+<div id="particles-js"></div>
+
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/particles.js@2.0.0/particles.min.js"></script>
+
+<script type="text/javascript">
+particlesJS('particles-js',
+
+<?php 
+echo iro_opt('particles_json','');
+?>
+
+);
+</script>
+
+<?php endif; ?>
 </html>
diff --git a/inc/admin_addcss.php b/inc/admin_addcss.php
@@ -27,7 +27,7 @@
 .csf-submessage-info {
     border-radius: 10px;
 }
-.csf-form-warning,
+.csf-form-warning,.csf-form-success,
 .csf-field-code_editor .cm-s-default,
 .csf-image-preview img{
     border-radius: 5px;
@@ -131,4 +131,5 @@
     transition: max-height .6s;
 	display: block !important;
 }
+
 </style>
diff --git a/inc/classes/Bilibili.php b/inc/classes/Bilibili.php
@@ -65,7 +65,7 @@ public function get_bgm_items($page = 1)
 
     public function get_bfv_items($page = 1)
     {
-        $resp = $this->fetch_api(1, $page);
+        $resp = $this->fetch_api(2, $page);
         $code = $resp["code"];
         switch ($code) {
             case 0: {
@@ -89,7 +89,7 @@ public function get_bfv_items($page = 1)
     }
     private static function anchor_pagination_next(string $href)
     {
-        return '<a class="bangumi-next no-pjax" href="' . $href . '"><i class="fa fa-bolt" aria-hidden="true"></i> NEXT </a>';
+        return '<a class="bangumi-next" data-href="' . $href . '"><i class="fa fa-bolt" aria-hidden="true"></i> NEXT </a>';
     }
     private static function bangumi_item(array $item, $percent)
     {

diff --git a/inc/decorate.php b/inc/decorate.php
@@ -689,7 +689,7 @@ function customizer_css() { ?>
 body.dark .lower li ul,
 body.dark .header-user-menu,
 body.dark .headertop-bar::after 
-{background:rgba(51,51,51,<?php echo iro_opt('theme_darkmode_background_transparency',1)?>) !important;}
+{background:rgba(51,51,51,<?php echo iro_opt('theme_darkmode_background_transparency')?>) !important;}
 
 body.dark .toc,
 body.dark .search-form input
@@ -1154,9 +1154,16 @@ function customizer_css() { ?>
 background-image: url(<?php echo iro_opt('search_area_background'); ?>);
 }
 
-.wrapper,
 .site-footer {
 background-color: rgba(255, 255, 255,<?php echo iro_opt('reception_background_transparency'); ?>);
+backdrop-filter: blur(10px);
+-webkit-backdrop-filter: blur(10px);
+}
+
+.wrapper {
+background-color: rgba(255, 255, 255,<?php echo iro_opt('reception_background_transparency'); ?>);
+backdrop-filter: blur(10px);
+-webkit-backdrop-filter: blur(10px);
 }
 
 /*首页圆角设置*/

diff --git a/js/app.js b/js/app.js
diff --git a/js/app.js.LICENSE.txt b/js/app.js.LICENSE.txt
@@ -40,4 +40,4 @@
  * 
  */
 
-//! build fdcf57e 2021/8/24
+//! build 5d7f85b 2021/8/26
diff --git a/js/app.js.br b/js/app.js.br
diff --git a/js/app.js.gz b/js/app.js.gz
diff --git a/js/app.js.map b/js/app.js.map
diff --git a/js/login.js.LICENSE.txt b/js/login.js.LICENSE.txt
@@ -1 +1 @@
-//! build fdcf57e 2021/8/24
+//! build 5d7f85b 2021/8/26
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 fdcf57e 2021/8/24
+//! build 5d7f85b 2021/8/26
diff --git a/js/page.js.br b/js/page.js.br
diff --git a/js/page.js.gz b/js/page.js.gz
diff --git a/js/page.js.map b/js/page.js.map
diff --git a/opt/languages/ja_JP.mo b/opt/languages/ja_JP.mo
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,4 +40,4 @@ @@
      *
      */
-    //! build fdcf57e 2021/8/24
+    //! build 5d7f85b 2021/8/26
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		//! build fdcf57e 2021/8/24
		//! build 5d7f85b 2021/8/26