From 38353f67af44f1a2c0b29d9ff43f0c2a42958833 Mon Sep 17 00:00:00 2001
From: Eltrac <45323514+BigCoke233@users.noreply.github.com>
Date: Wed, 24 Jul 2019 20:10:46 +0800
Subject: =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E5=AD=97=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=83=A8=E5=88=86=E5=AD=97=E6=AF=8D=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=8A=E9=83=A8=E5=88=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E3=80=81=E5=86=85=E7=BD=AE=E4=B8=A4=E5=8F=AA=E5=8F=AF?=
 =?UTF-8?q?=E8=B0=83=E6=88=8F=E7=9A=84=E7=8C=AB=E5=92=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/footer.php |  7 +++++--
 includes/head.php   |  2 +-
 includes/header.php | 23 ++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'includes')

diff --git a/includes/footer.php b/includes/footer.php
index b790d5e..52ea3e4 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -22,6 +22,7 @@
 	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php themeVersion(); ?>/assets/js/OwO.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php themeVersion(); ?>/assets/js/prism.js"></script>
 	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php themeVersion(); ?>/assets/js/pangu.js"></script>
+	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php themeVersion(); ?>/assets/js/l2dwidget.min.js"></script>
 	<?php else: ?>
     <script src="<?php Utils::indexTheme('assets/js/jquery.js'); ?>"></script>
 	<script src="<?php Utils::indexTheme('assets/js/pjax.jquery.js'); ?>"></script>
@@ -31,16 +32,18 @@
 	<script src="<?php Utils::indexTheme('assets/js/OwO.min.js'); ?>"></script>
 	<script src="<?php Utils::indexTheme('assets/js/prism.js'); ?>"></script>
 	<script src="<?php Utils::indexTheme('assets/js/pangu.js'); ?>"></script>
+	<script src="<?php Utils::indexTheme('assets/js/l2dwidget.min.js'); ?>"></script>
 	<?php endif; ?>
 	<script>var siteurl = '<?php $this->options->SiteUrl() ;?>';
 	var owoJson = '<?php Utils::indexTheme('assets/OwO.json'); ?>';
+	var modelJson = '<?php if($this->options->cat && $this->options->cat==1){Utils::indexTheme('assets/model/hijiki/assets/hijiki.model.json');}elseif($this->options->cat && $this->options->cat==2){Utils::indexTheme('assets/model/tororo/assets/tororo.model.json');}?>';
 	<?php if($this->options->pjax && $this->options->pjax!=0) :?>
 	var loadPjax = true;
 	beforePjax = function() {NProgress.start();}
-	afterPjax = function() {owoLoad();<?php $this->options->pjax_complete(); ?>}
+	afterPjax = function() {<?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?><?php $this->options->pjax_complete(); ?>}
 	<?php endif; ?></script>
 	<script src="<?php Utils::indexTheme('assets/js/miracles.min.js'); ?>"></script>
-	<script>LazyLoad();PrismLoad();owoLoad();<?php $this->options->jsEcho(); ?></script>
+	<script>LazyLoad();PrismLoad();<?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?>panguLoad();<?php $this->options->jsEcho(); ?></script>
 	<?php $this->footer(); ?>
   </body>
 </html>
\ No newline at end of file
diff --git a/includes/head.php b/includes/head.php
index 34d2ece..988ba6f 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -67,7 +67,7 @@ if (isset($_POST['action'])) {
 	<link href="https://fonts.googleapis.com/css?family=Noto+Sans+SC:300|Noto+Serif+SC:300&display=swap" rel="stylesheet">
 	<style>.body-dark .pio-action .pio-home{background-image: url(<?php Utils::indexTheme('images/icons/home.png'); ?>);}.body-dark .pio-action .pio-close{background-image: url(<?php Utils::indexTheme('images/icons/remove.png'); ?>);}.body-dark .pio-action .pio-skin{background-image: url(<?php Utils::indexTheme('images/icons/skin.png'); ?>);}.body-dark .pio-action .pio-info{background-image: url(<?php Utils::indexTheme('images/icons/info.png'); ?>);}.body-dark .pio-action .pio-night{background-image: url(<?php Utils::indexTheme('images/icons/night.png'); ?>);}@media (min-width:992px) {.search{background-image:url(<?php Utils::indexTheme('images/search.png'); ?>);}.login{background-image:url(<?php Utils::indexTheme('images/login.png'); ?>)}}.search {background-position: bottom right;background-repeat: no-repeat}.login {background-position: bottom left;background-repeat:no-repeat}<?php $this->options->cssEcho(); ?></style>
   </head>
-  <body class="<?php if($this->options->bodyFonts && $this->options->bodyFonts=1): ?> body-serif<?php endif; ?><?php if($this->options->grayTheme && $this->options->grayTheme=1): ?> body-gray<?php endif; ?>">
+  <body class="<?php if($this->options->bodyFonts && $this->options->bodyFonts=1): ?> body-serif<?php endif; ?><?php if($this->options->grayTheme && $this->options->grayTheme=1): ?> body-gray<?php endif; ?> body-contentsize-normal">
   <!--[if lt IE 9]>
     <div class="message error browsehappy" role="dialog">当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>.</div>
   <![endif]-->
\ No newline at end of file
diff --git a/includes/header.php b/includes/header.php
index daf68df..117f9ae 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -43,6 +43,7 @@
 	  </div>
 	  <!-- 前台设置 -->
 	  <div class="options ready">
+	    <!-- 字体设置 -->
 	    <div class="options-content">
 	      <div class="options-family container-fluid">
 		    <div class="row">
@@ -56,6 +57,7 @@
 		  </div>
 	    </div>
 		<hr>
+		<!-- 滤镜/模式设置 -->
 		<div class="options-content">
 		  <div class="options-themes container-fluid">
 		    <div class="row">
@@ -65,7 +67,7 @@
 			  </div>
 			  <div class="col-4 options-theme-item">
 			    <button class="options-theme-button options-theme-sepia" onclick="Sepia()"></button>
-				<span class="options-theme-label">日落模式</span>
+				<span class="options-theme-label">日落滤镜</span>
 			  </div>
 		      <div class="col-4 options-theme-item">
 			    <button class="options-theme-button options-theme-normal" onclick="Gray()"></button>
@@ -74,6 +76,25 @@
 			</div>
 		  </div>
 		</div>
+		<hr>
+		<div class="options-content">
+		  <div class="options-contentsize container-fluid">
+		    <div class="row">
+			  <div class="col-3 options-contentsize-small">
+			    <button class="options-sizesmall options-contentsize-button" onclick="SizeSmall()">100%</button>
+			  </div>
+			  <div class="col-3 options-contentsize-normal">
+			    <button class="options-sizenormal options-contentsize-button options-button-active" onclick="SizeNormal()">125%</button>
+			  </div>
+			  <div class="col-3 options-contentsize-big">
+			    <button class="options-sizebig options-contentsize-button" onclick="SizeBig()">140%</button>
+			  </div>
+			  <div class="col-3 options-contentsize-large">
+			    <button class="options-sizelarge options-contentsize-button" onclick="SizeLarge()">180%</button>
+			  </div>
+			</div>
+		  </div>
+		</div>
 	  </div>
 	  <!-- 导航 -->
 	  <!-- -大屏幕导航 -->
-- 
cgit v1.2.3