Merge pull request #42 from outtimes/master

pull

32 files changed, 20 insertions, 15 deletions

diff --git a/README.md b/README.md
index 8f9b8fb..491bc47 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![](banner.jpg)
+![](banner.png)
 
 <p align="center">
 <img src="https://img.shields.io/badge/build-passing-brightgreen.svg?style=flat-square"> 
diff --git a/archive.php b/archive.php
index 770e1f1..df81393 100644
--- a/archive.php
+++ b/archive.php
@@ -30,7 +30,7 @@ $this->need('includes/header.php');
 				  }
 				  ?>
 				</p>
-				<p class="post-meta"><i class="iconfont icon-block"></i> <?php $this->category(','); ?>&emsp;<i class="iconfont icon-comments"></i> <?php $this->commentsNum('None', 'Only 1', '%d'); ?>&emsp;<i class="iconfont icon-clock"></i> <?php $this->date(); ?></p>
+				<p class="post-meta"><i class="iconfont icon-block"></i> <?php $this->category(','); ?>&emsp;<i class="iconfont icon-comments"></i> <?php $this->commentsNum('还没有评论', '仅一条评论', '%d'); ?>&emsp;<i class="iconfont icon-clock"></i> <?php $this->date(); ?></p>
 				<p class="post-button-box large-screen"><a href="<?php $this->permalink(); ?>" class="button post-button">Read More</a></p>
 			  </div>
 			</div></div>
diff --git a/assets/css/main/comment.css b/assets/css/main/comment.css
index 57e5bbb..3eadc49 100644
--- a/assets/css/main/comment.css
+++ b/assets/css/main/comment.css
@@ -188,7 +188,7 @@
 }

 .comment-textarea {

 	width: 100%;

-	border: none;

+	border: 1px dashed #ddd;

 	max-width: 100%;

 }

 .comment-input input {

@@ -204,9 +204,12 @@
 .comment-input input:hover {

 	border-bottom: 1px dashed #000;

 }

+.comment-textarea:hover{

+	border: 1px dashed #000;

+}

 .comment-input input,

 .comment-textarea {

-	background: #00000003;

+	background: none;

 	outline: none;

 }

 

diff --git a/assets/css/main/component.css b/assets/css/main/component.css
index 64073e8..eac7ab1 100644
--- a/assets/css/main/component.css
+++ b/assets/css/main/component.css
@@ -34,7 +34,8 @@ button {
 /* Alert */

 .alert {

 	bottom: 0;

-    left: 15px;

+	left: 50%;

+    transform: translate(-50%, 0px);

     z-index: 10;

     padding: 1em;

     position: fixed;

diff --git a/assets/js/miracles.min.js b/assets/js/miracles.min.js
index e30d233..0b45f62 100644
--- a/assets/js/miracles.min.js
+++ b/assets/js/miracles.min.js
@@ -446,8 +446,15 @@ linkTarget();
  * 文章二维码

  */

 function togglePostQrcode() {

+    $("#post-qr").html("");

+    let post_qr = new QRCode($("#post-qr")[0], {

+        width: 230,

+        height: 230,

+        colorLight : "#f1f1f1",

+        correctLevel : QRCode.CorrectLevel.L

+    });

+    $('.post-qr').toggleClass("post-qr-open");

     post_qr.makeCode(window.location.href);

-	$('.post-qr').toggleClass("post-qr-open");

 }

 $('#post-qrcode-btn').on("click", togglePostQrcode);

 

diff --git a/banner.jpg b/banner.jpg
deleted file mode 100644
index 439efa5..0000000
--- a/banner.jpg
+++ /dev/null
diff --git a/banner.png b/banner.png
new file mode 100755
index 0000000..7177f04
--- /dev/null
+++ b/banner.png
diff --git a/images/postbg/1.jpg b/images/postbg/1.jpg
index 19c0878..1aac9c4 100644..100755
--- a/images/postbg/1.jpg
+++ b/images/postbg/1.jpg
diff --git a/images/postbg/10.jpg b/images/postbg/10.jpg
index 7b12f73..1eadb5a 100644..100755
--- a/images/postbg/10.jpg
+++ b/images/postbg/10.jpg
diff --git a/images/postbg/11.jpg b/images/postbg/11.jpg
index 2a9b74d..d8d030e 100644..100755
--- a/images/postbg/11.jpg
+++ b/images/postbg/11.jpg
diff --git a/images/postbg/12.jpg b/images/postbg/12.jpg
index b49fcb4..70ced1a 100644..100755
--- a/images/postbg/12.jpg
+++ b/images/postbg/12.jpg
diff --git a/images/postbg/13.jpg b/images/postbg/13.jpg
index ddd7374..d24b77e 100644..100755
--- a/images/postbg/13.jpg
+++ b/images/postbg/13.jpg
diff --git a/images/postbg/14.jpg b/images/postbg/14.jpg
index a130083..89ea502 100644..100755
--- a/images/postbg/14.jpg
+++ b/images/postbg/14.jpg
diff --git a/images/postbg/15.jpg b/images/postbg/15.jpg
index 43b5639..0d7a4e2 100644..100755
--- a/images/postbg/15.jpg
+++ b/images/postbg/15.jpg
diff --git a/images/postbg/16.jpg b/images/postbg/16.jpg
deleted file mode 100644
index 1a5db5e..0000000
--- a/images/postbg/16.jpg
+++ /dev/null
diff --git a/images/postbg/17.jpg b/images/postbg/17.jpg
deleted file mode 100644
index 8ad2122..0000000
--- a/images/postbg/17.jpg
+++ /dev/null
diff --git a/images/postbg/18.jpg b/images/postbg/18.jpg
deleted file mode 100644
index 74b113b..0000000
--- a/images/postbg/18.jpg
+++ /dev/null
diff --git a/images/postbg/19.jpg b/images/postbg/19.jpg
deleted file mode 100644
index a62ea72..0000000
--- a/images/postbg/19.jpg
+++ /dev/null
diff --git a/images/postbg/2.jpg b/images/postbg/2.jpg
index 3b84d70..2d88780 100644..100755
--- a/images/postbg/2.jpg
+++ b/images/postbg/2.jpg
diff --git a/images/postbg/20.jpg b/images/postbg/20.jpg
deleted file mode 100644
index d7b0d85..0000000
--- a/images/postbg/20.jpg
+++ /dev/null
diff --git a/images/postbg/3.jpg b/images/postbg/3.jpg
index 75d9071..7231934 100644..100755
--- a/images/postbg/3.jpg
+++ b/images/postbg/3.jpg
diff --git a/images/postbg/4.jpg b/images/postbg/4.jpg
index ef8c105..36d2749 100644..100755
--- a/images/postbg/4.jpg
+++ b/images/postbg/4.jpg
diff --git a/images/postbg/5.jpg b/images/postbg/5.jpg
index 0e40f97..6d2b907 100644..100755
--- a/images/postbg/5.jpg
+++ b/images/postbg/5.jpg
diff --git a/images/postbg/6.jpg b/images/postbg/6.jpg
index 98ebb07..5f3664f 100644..100755
--- a/images/postbg/6.jpg
+++ b/images/postbg/6.jpg
diff --git a/images/postbg/7.jpg b/images/postbg/7.jpg
index c62f767..defafac 100644..100755
--- a/images/postbg/7.jpg
+++ b/images/postbg/7.jpg
diff --git a/images/postbg/8.jpg b/images/postbg/8.jpg
index 18e7fc9..2d10935 100644..100755
--- a/images/postbg/8.jpg
+++ b/images/postbg/8.jpg
diff --git a/images/postbg/9.jpg b/images/postbg/9.jpg
index 2b5c325..183f4b9 100644..100755
--- a/images/postbg/9.jpg
+++ b/images/postbg/9.jpg
diff --git a/includes/footer.php b/includes/footer.php
index cf8d32e..6c82d26 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -39,12 +39,6 @@
 	<!-- JavaScript -->
 	<script>
 	<?php if($this->options->build_time)echo "startTime(\"".$this->options->build_time."\");" ?>
-	var post_qr = new QRCode(document.getElementById("post-qr"), {
-                width: 230,
-				height: 230,
-				colorLight : "#f1f1f1",
-				correctLevel : QRCode.CorrectLevel.L
-    });
 	</script>
 	<!-- Send News and Loaders -->
 	<script><?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?><?php $this->options->jsEcho(); ?></script>
diff --git a/includes/head.php b/includes/head.php
index a7e1221..d03a473 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -39,7 +39,7 @@
 		else:
 			$this->options->bannerUrl();
 	endif;}?>" />
-	<link rel="icon" type="image/png" href="<?php Utils::indexTheme('favicon.ico'); ?>" />
+	<link rel="icon" id="icon" type="image/png" href="<?php Utils::indexTheme('favicon.ico'); ?>" />
     <?php $this->header('description=&commentReply='); ?>
 	<?php $this->options->headerEcho(); ?>
 	<!-- css -->
diff --git a/includes/header.php b/includes/header.php
index f212a72..2da58a8 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -143,7 +143,7 @@
 				  <?php if($this->fields->meta==''): ?>
 				  <div class="header-meta-line-one">
 				    <?php if($this->is('post')): ?><i class="iconfont icon-block" title="文章分类"></i> <?php $this->category(','); ?>&emsp;<?php endif; ?>
-				    <i class="iconfont icon-comments" title="共 <?php $this->commentsNum('0', '1', '%d'); ?> 条评论"></i> <?php $this->commentsNum('None', 'Only 1', '%d'); ?>&emsp;
+				    <i class="iconfont icon-comments" title="共 <?php $this->commentsNum('0', '1', '%d'); ?> 条评论"></i> <?php $this->commentsNum('还没有评论', '仅一条评论', '%d'); ?>&emsp;
                   </div>
 				  <div class="header-meta-line-two">
 				    <i class="iconfont icon-clock" title="该文章发布于 <?php $this->date(); ?>"></i> <?php $this->date(); ?>&emsp;
diff --git a/index.php b/index.php
index 016d6f2..1dbb533 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ $this->need('includes/header.php');
 					  echo $this->fields->banner(); 
 					else: 
 					  if($this->options->randomBanner==''){
-						echo Utils::indexTheme('images/postbg/'); echo mt_rand(1,mt_rand(1,20)); echo '.jpg';
+						echo Utils::indexTheme('images/postbg/'); srand(mb_strlen($this->title));echo rand(1,15).'.jpg';
 					  }
 					  else{
 						$banner_url = explode(',',$this->options->randomBanner);
diff --git a/screenshot.png b/screenshot.png
index ceebf55..f61ba5f 100644..100755
--- a/screenshot.png
+++ b/screenshot.png