From f149c2c44ec533d840beaacde6d02a405433048b Mon Sep 17 00:00:00 2001
From: Eltrac Koalar <hi@guhub.cn>
Date: Fri, 20 Mar 2020 10:04:00 +0800
Subject: =?UTF-8?q?=F0=9F=A7=B7=20Fix:=20=E6=8A=BD=E5=B1=89=E6=A0=8F?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/header.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'includes')

diff --git a/includes/header.php b/includes/header.php
index 4c31b4a..1021383 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,5 +1,5 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-      <div class="mask" id="full-mask"></div>
+      <?php if($this->options->navStyle==1): ?><div class="mask" id="full-mask"></div><?php endif; ?>
       <!-- 搜索 -->
       <div class="search ready">
 	    <button class="search-close ready" id="search-close-button"><i class="iconfont icon-x"></i></button>
@@ -30,6 +30,9 @@
         </form>
 		<?php endif; ?>
 	  </div>
+	  
+	  <!-- Nav Starts -->
+	  <?php if($this->options->navStyle==0): ?>
       <!-- 移动端导航面板 -->
 	  <div class="mobile-menu ready">
 	    <button class="mobile-menu-close ready" id="toggle-mobile-menu-close"><i class="iconfont icon-x"></i></button>
@@ -53,8 +56,10 @@
 		  <a id="toggle-mobile-menu-button" style="float:right">MENU <i class="iconfont icon-list"></i></a>
 		</div>
 	  </nav>
+	  <?php endif; ?>
 	  
 	  <!-- 导航 -->
+	  <?php if($this->options->navStyle==0): ?>
 	  <!-- -大屏幕导航 -->
       <nav class="large-screen nav nav-fixed" id="navBar"<?php if($this->options->navStyle==1): ?> style="display:none"<?php endif; ?>>
 	    <div class="container">
@@ -70,10 +75,11 @@
 		  <button class="nav-icon-button setting-button" id="toggle-dark-button"><i class="iconfont icon-moon"></i></button>
 		</div>
 	  </nav>
+	  <?php elseif($this->options->navStyle==1): ?>
 	  <!-- 抽屉栏 -->
-	  <nav class="drawer"<?php if($this->options->navStyle==0): ?> style="display:none"<?php endif; ?>><div class="drawer-relative">
+	  <nav class="drawer"><div class="drawer-relative">
 	    <div class="drawer-main">
-	      <button class="drawer-button" onclick="toggleDrawer();$('.options').addClass('ready');"><i class="iconfont icon-list"></i></button>
+	      <button class="drawer-button" id="drawer-button"><i class="iconfont icon-list"></i></button>
           <div class="drawer-header">
 	        <div class="drawer-avatar">
 		      <?php if($this->options->avatar==''): echo $this->author->gravatar(500);
@@ -87,12 +93,16 @@
 		  </div>
 		</div>
 		<div class="drawer-footer">
-		  <button class="drawer-icon" id="search-open-button" onclick="toggleDrawer"><i class="iconfont icon-chaxun"></i></button>
-		  <button class="drawer-icon" id="login-open" onclick="toggleDrawer()"><i class="iconfont icon-user"></i></button>
+		  <button class="drawer-icon" id="search-open-button"><i class="iconfont icon-chaxun"></i></button>
+		  <button class="drawer-icon" id="login-open"><i class="iconfont icon-user"></i></button>
           <button class="drawer-icon" id="toggle-dark-button"><i class="iconfont icon-moon"></i></button>
 		</div>
 	  </div></nav>
-	  <div id="pjax-container"><!-- 开始 pjax-container -->
+	  <?php endif;?>
+	  <!-- /Nac Ends -->
+	  
+	  <!-- pjax-container Starts -->
+	  <div id="pjax-container">
 	  <header>
 	    <!-- Banner -->
 	    <?php if($this->is('post') || $this->is('page')): ?>
-- 
cgit v1.2.3