From 0b71b73f502022b6be3c7cf0116c5827dec85da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=94=E8=90=BD?=
 <45323514+BigCoke233@users.noreply.github.com>
Date: Sun, 31 Mar 2019 13:47:33 +0800
Subject: Bug fix

---
 includes/footer.php       |  3 ++-
 includes/head.php         |  3 +++
 includes/header.php       |  7 +++----
 includes/post-content.php | 14 ++++++++------
 includes/post-item.php    | 12 +++++++-----
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/includes/footer.php b/includes/footer.php
index 34e8cb4..9c58b2e 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -129,6 +129,7 @@ $(document).ready(function(){
         document.getElementById("htmer_time").innerHTML = currentTimeHtml;
     }    setInterval(setTime, 1000);
 	</script>
-
+	
+    <?php $this->footer(); ?>
   </body>
 </html>
\ No newline at end of file
diff --git a/includes/head.php b/includes/head.php
index 2d1e4ac..9e5fce7 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -58,6 +58,9 @@
 	  .mobile-block{
 		  display:block!important;
 	  }
+	  .mobile-center{
+		  text-align:Center;
+	  }
 	  #nav{
 		  padding:0!important;
 	  }
diff --git a/includes/header.php b/includes/header.php
index f5c530c..03837f3 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,7 +1,7 @@
 <header>
   <div id="top"></div>
   <!-- 导航栏 -->
-  <nav class="navbar navbar-default navbar-fixed-top" id="nav">
+  <nav class="navbar navbar-default navbar-fixed-top" id="nav" <?php if($this->options->lgimg_url && $this->options->lgimg_url!='') :?>style="opacity:0.8"<?php endif; ?>>
     <Div class="container-fluid">
       <div class="nav-logo">
 	    <span class="nav-logo-icon">
@@ -28,18 +28,17 @@
   
   <!-- 首页大图 -->
   <?php if($this->options->lgimg_url && $this->options->lgimg_url!='') :?>
-  <div class="jumbotron" style="background:url('<?php $this->options->lgimg_url(); ?>');background-size:cover;background-repeat:no-repeat;">
+  <div class="jumbotron" style="margin-bottom:-80px;background:url('<?php $this->options->lgimg_url(); ?>');background-size:cover;background-repeat:no-repeat;">
     <h1><?php $this->options->IndexName(); ?></h1>
 	<p><?php $this->options->IndexDecoration(); ?></p>
   </div>
   <?php endif; ?>
   
-  <?php if($this->options->lgimg_url && $this->options->lgimg_url='') :?>
+
   <br />
   <br />
   <br />
   <br />
-  <?php endif; ?>
   <br />
   
   <!-- 能偷懒不写样式为什么不用br? -->
diff --git a/includes/post-content.php b/includes/post-content.php
index 5aa7653..21a45ce 100644
--- a/includes/post-content.php
+++ b/includes/post-content.php
@@ -1,8 +1,11 @@
 <?php 
-    $content = preg_replace('/<table(.*?)>/s','<table class="table table-striped table-hover">',$this->content);
-	$content = preg_replace('/<pre><code>/s','<pre><code class="language-html">',$this->content);
-	$content = preg_replace('/<img(.*?)src="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${3}></a>',$this->content); 
 
+	$content = $this->content;
+	
+    $content = preg_replace('/<table(.*?)>/s','<table class="table table-striped table-hover">',$content);
+	$content = preg_replace('/<pre><code>/s','<pre><code class="language-html">',$content);
+	$content = preg_replace('/<img(.*?)src="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${3}></a>',$content); 
+	
 	//短代码（无参数）
 	$reg = '/\[scode\](.*?)\[\/scode\]/s';
     $rp = '<div class="tip">${1}</div>';
@@ -43,7 +46,6 @@
 	$reg = '/\[stext\](.*?)\[\/stext\]/s';
     $rp = '<div class="post-stext">${1}</div>';
     $content = preg_replace($reg,$rp,$content);
-	
-	
-	echo $content 
+
+  echo $content;
 ?>
\ No newline at end of file
diff --git a/includes/post-item.php b/includes/post-item.php
index f43e58c..7a4f02c 100644
--- a/includes/post-item.php
+++ b/includes/post-item.php
@@ -31,10 +31,11 @@
 		<div class="cold-md-9 col-xs-9" style="margin-top:-20px;">
 		  <h3><?php $this->sticky(); $this->title() ?></h3>
 		  <p class="excerpt">
-	       <?php $this->excerpt(66); ?>
+	       <?php $this->excerpt(50); ?>
+		   <br />
 	      </p>
-		  <hr />
-		  <div class="post-info"><span class="glyphicon glyphicon-th-large"></span> <?php $this->category(',', true, '木有分类'); ?> &nbsp;| &nbsp;<span class="glyphicon glyphicon-calendar"></span> <?php $this->date('F j, Y'); ?> &nbsp;| &nbsp;<Span class="glyphicon glyphicon-comment"></span> <?php $this->commentsNum('%d Comments'); ?></div>
+		  <hr class="mobile-none" />
+		  <div class="post-info"><span class="glyphicon glyphicon-th-large"></span> <?php $this->category(',', true, '木有分类'); ?> &nbsp;| &nbsp;<span class="glyphicon glyphicon-calendar"></span> <?php $this->date('F j, Y'); ?><span class="mobile-none"> &nbsp;| &nbsp;<Span class="glyphicon glyphicon-comment"></span> <?php $this->commentsNum('%d Comments'); ?></span></div>
 
 		</div>
 	  </div>
@@ -56,11 +57,12 @@
 
       <h2 class="index-post-header"><?php $this->sticky(); $this->title() ?></h4>
       <p class="excerpt">
-	       <?php $this->excerpt(100); ?>
+		<?php echo $this->excerpt(100); ?>
 	  </p>
 
 	  <hr />
-	
+	  
+
 	  <div class="post-info"><span class="glyphicon glyphicon-th-large"></span> <?php $this->category(',', true, '木有分类'); ?> &nbsp;| &nbsp;<span class="glyphicon glyphicon-calendar"></span> <?php $this->date('F j, Y'); ?> &nbsp;| &nbsp;<Span class="glyphicon glyphicon-comment"></span> <?php $this->commentsNum('%d Comments'); ?></div>
 	  <br />
 	</div>
-- 
cgit v1.2.3