From b7b69dcbb0858ff2c676be63dbc70ca7b4e0db84 Mon Sep 17 00:00:00 2001
From: BigCoke233 <hi@guhub.cn>
Date: Thu, 16 Apr 2020 22:22:13 +0800
Subject: =?UTF-8?q?:fish:=20Perf:=20=E4=B8=80=E4=BA=9B=E4=B8=8D=E6=83=B3?=
 =?UTF-8?q?=E5=86=99=20message=20=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/main/nav.css    |  4 ++--
 assets/css/main/themes.css |  9 ++++-----
 assets/js/miracles.min.js  | 36 ++++++++++++++++++------------------
 includes/footer.php        |  4 ++--
 libs/Options.php           |  4 +++-
 libs/Utils.php             |  1 +
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/assets/css/main/nav.css b/assets/css/main/nav.css
index fa0af1d..fd84710 100644
--- a/assets/css/main/nav.css
+++ b/assets/css/main/nav.css
@@ -6,8 +6,8 @@
  */
 /* Top Nav */
 .nav {
-	background: rgba(255,255,255,0.86);
-	backdrop-filter: blur(6px);
+	background: rgba(255,255,255,0.5);
+	backdrop-filter: blur(5px);
 	-webkit-backdrop-filter: blur(6px);
 	width: 100%;
 	position: absolute;
diff --git a/assets/css/main/themes.css b/assets/css/main/themes.css
index d8dd60b..b39c581 100644
--- a/assets/css/main/themes.css
+++ b/assets/css/main/themes.css
@@ -87,7 +87,7 @@
 }
 /* Nav/Search/login */
 .body-dark .nav {
-	background:rgba(50,50,50,.86) !important;
+	background:rgba(50,50,50,.5) !important;
 	box-shadow:0 0 20px #000;
 	-webkit-box-shadow:0 0 20px #000;
 	-moz-box-shadow:0 0 30px #000
@@ -137,8 +137,6 @@
 	-moz-box-shadow:0 0 0 #fff;
 	-webkit-box-shadow:0 0 0 #fff
 }
-.body-dark .OwO .OwO-body .OwO-items .OwO-item:hover,
-.body-dark .OwO-body,.body-dark .OwO-open .OwO-logo,
 .body-dark .bubble.saying-body:hover,
 .body-dark .comment-pagenav a,
 .body-dark .dark-button,
@@ -224,7 +222,8 @@
 .body-dark .index-banner,
 .body-dark .login-enter-admin a,
 .body-dark .comment-submit,
-.body-dark .post-content kbd {
+.body-dark .post-content kbd,
+.body-dark .notice {
 	background-color:#6e6e6e!important
 }
 .body-dark .index-banner {
@@ -366,7 +365,7 @@
 	background: rgb(248,241,228)!important
 }
 .body-sepia .nav {
-	background: rgba(250,241,228,0.86);
+	background: rgba(250,241,228,0.5);
 }
 .body-sepia .post-body,
 .body-sepia .post-item,
diff --git a/assets/js/miracles.min.js b/assets/js/miracles.min.js
index 1db4b4c..e5e7362 100644
--- a/assets/js/miracles.min.js
+++ b/assets/js/miracles.min.js
@@ -330,24 +330,24 @@ eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
  *  Nav
  */
 //Slide
-var new_scroll_position = 0;
-var last_scroll_position;
-var header = $(".nav");
-
-window.addEventListener('scroll', function(e) {
-  last_scroll_position = window.scrollY;
-  if (new_scroll_position < last_scroll_position && last_scroll_position > 80) {
-	//向下滚动
-    header.removeClass("nav-slideDown");
-    header.addClass("nav-slideUp");
-  } else if (new_scroll_position > last_scroll_position) {
-	//向上滚动
-    header.removeClass("nav-slideUp");
-    header.addClass("nav-slideDown");
-  }
- 
-  new_scroll_position = last_scroll_position;
-}); 
+if(navSlide==true){
+    var new_scroll_position = 0;
+    var last_scroll_position;
+    var header = $(".nav");
+    window.addEventListener('scroll', function(e) {
+      last_scroll_position = window.scrollY;
+      if (new_scroll_position < last_scroll_position && last_scroll_position > 80) {
+    	//向下滚动
+        header.removeClass("nav-slideDown");
+        header.addClass("nav-slideUp");
+      } else if (new_scroll_position > last_scroll_position) {
+    	//向上滚动
+        header.removeClass("nav-slideUp");
+        header.addClass("nav-slideDown");
+      }
+      new_scroll_position = last_scroll_position;
+    }); 
+}
 
 //ScrollChange
 if(navBar.length>0){
diff --git a/includes/footer.php b/includes/footer.php
index c1f6589..e4c349c 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -26,8 +26,8 @@
 	if($this->options->customCDN): $custom=$this->options->customCDN; else: $custom=Helper::options()->themeUrl("","Miracles"); endif;
 	generate_require($js_files,"js",$this->options->CDN,$custom);
 	?>
-	<!-- Varribles and Functions -->
-	<script>
+	<!-- Options -->
+	<script>var navSlide = <?php if($this->options->navSlide==1):?>false<?php else:?>true<?php endif;?>;
 	var panguLoadAllow = <?php if($this->options->pangu==1):?>false<?php else:?>true<?php endif;?>;
 	var allowNavAero = <?php if($this->options->navAero==1):?>false<?php else:?>true<?php endif;?>;
 	var siteurl = '<?php $this->options->SiteUrl() ;?>';
diff --git a/libs/Options.php b/libs/Options.php
index 380a4be..27f5265 100755
--- a/libs/Options.php
+++ b/libs/Options.php
@@ -120,8 +120,10 @@ function themeConfig($form) {
     //nav
 	$navStyle = new Typecho_Widget_Helper_Form_Element_Select('navStyle',array('0'=>'顶部导航栏','1'=>'左侧抽屉栏'),'0','<h2>导航栏 Nav</h2>类型','选择导航栏的类型（若选择左侧抽屉蓝，则下一条设置失效）');
     $form->addInput($navStyle);
-	$navAero = new Typecho_Widget_Helper_Form_Element_Select('navAero',array('0'=>'是','1'=>'否'),'1','顶部透明','视口处于最顶部时，顶部导航栏是否变为透明');
+	$navAero = new Typecho_Widget_Helper_Form_Element_Select('navAero',array('0'=>'是','1'=>'否'),'1','顶部透明','视口处于最顶部时，顶部导航栏是否变为透明（BUG 比较多，不推荐）');
     $form->addInput($navAero);
+	$navSlide = new Typecho_Widget_Helper_Form_Element_Select('navSlide',array('0'=>'是','1'=>'否'),'0','Headroom','开启后，访客向下滚动页面时导航栏收起，向上滚动时导航栏展示');
+	$form->addInput($navSlide);
 	$customNav = new Typecho_Widget_Helper_Form_Element_Textarea('customNav', NULL, NULL, _t('自定义导航栏'), _t('按照格式书写，自定义导航栏内容，留空则读取所有的独立页面，书写的格式请查看 wiki<hr>'));
     $form->addInput($customNav);
 	
diff --git a/libs/Utils.php b/libs/Utils.php
index 097d129..ab3cb9a 100644
--- a/libs/Utils.php
+++ b/libs/Utils.php
@@ -81,6 +81,7 @@ class Utils
      * 编辑界面添加内容
      */
     public static function addButton(){
+		echo '<link rel="stylesheet" href="/usr/themes/Miracles/assets/css/setting.miracles.css" />';
 		echo '<link rel="stylesheet" href="/usr/themes/Miracles/assets/css/owo.min.css" />';
 		echo '<script src="/usr/themes/Miracles/assets/js/OwO.min.js"></script>';
 		echo '<script src="/usr/themes/Miracles/assets/js/editor.js"></script>';
-- 
cgit v1.2.3