Add files via upload

9 files changed, 31 insertions, 23 deletions

diff --git a/file.php b/file.php
index 9553d22..c55962d 100644
--- a/file.php
+++ b/file.php
@@ -32,8 +32,8 @@
 		

 		<hr />

 		

-		<div class="archive-list">

-          <ul class="post-ul">

+		<div class="archive" style="font-size:16px;">

+          <ul class="mdui-list">

            <?php

             $stat = Typecho_Widget::widget('Widget_Stat');

             $this->widget('Widget_Contents_Post_Recent', 'pageSize='.$stat->publishedPostsNum)->to($archives);

@@ -45,7 +45,7 @@
               if ($year > $year_tmp || $mon > $mon_tmp) {

                 $output .= '</ul>';

               }

-              $output .= '<li><span>'. $year_tmp .' - '. $mon_tmp .' | </span><a href="'.$archives->permalink .'" data-pjax>'. $archives->title .'</a><br /></li>';

+              $output .= '<a href="'.$archives->permalink .'" data-pjax><li class="mdui-list-item mdui-ripple"><span style="color:gray">'. $year_tmp .' - '. $mon_tmp .'&nbsp;|&nbsp;</span>'. $archives->title .'<br /></li></a>';

             }

             $output .= '</ul>';

             echo $output;

diff --git a/includes/comments.php b/includes/comments.php
index 507ad2b..28bcede 100644
--- a/includes/comments.php
+++ b/includes/comments.php
@@ -60,8 +60,7 @@
     };

 })();

 </script>

-

-<!-- 评论开始 -->

+<!-- 表单开始 -->

 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>

 <div id="comments" class="responsesWrapper">

     <?php

@@ -75,8 +74,11 @@
     ?>

     <?php if($this->allow('comment')): ?>

     <div id="<?php $this->respondId(); ?>" class="respond item">

-	<br />

-    	<form method="post" action="<?php $this->commentUrl() ?>" id="comment-form" class="comment-form row" role="form">

+	<h3 style="margin-top:0">发射弹幕</h3>

+	<hr class="item-hr" />

+	    

+    	<form style="margin-top:20px;" id="comment_form" method="post" action="<?php $this->commentUrl() ?>"  class="comment-form row" role="form">

+		  <div class="comment-form-comment form-group">

     		<p class="comment-form-comment col-md-12">

                 <textarea rows="8" cols="50" name="text" id="owo-textarea" class="textarea" required ><?php $this->remember('text'); ?></textarea>

             </p>

@@ -98,28 +100,25 @@
 			<p class="form-submit col-md-12">

                 <button type="submit" class="submit btn btn-info " style="float:right;transition:all 0.5s;"><?php _e('提交评论'); ?></button>

             </p>

+		  </div>

     	</form>

     </div>

+	<br />

+	

     <?php else: ?>

     <div class="item"><h3 class="comment-title"><?php _e('评论已关闭'); ?></h3></div>

     <?php endif; ?>

 	

     <?php $this->comments()->to($comments); ?>

     <?php if ($comments->have()): ?>

-	<!-- 解析评论内容 -->

-	<?php

-	  

-	?>

-	

-	<br />

 

 	  <div class="item"><h3 style="margin-top:-4px;text-align:center;" class="comment-title"><?php $this->commentsNum('评论列表', '已有 1 条评论', '已有 <span class="num">%d</span> 条评论'); ?> (o゜▽゜)o☆</h3></div>

 	  <div class="comment-list-wrap">

       <?php $comments->listComments(); ?>

 	  </div>

 

-	<br />

     <?php $comments->pageNav('&laquo;', '&raquo;'); ?>

     

     <?php endif; ?>

+

 </div>
\ No newline at end of file
diff --git a/includes/footer.php b/includes/footer.php
index 272de6e..d133371 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -76,6 +76,13 @@
 

   <?php endif; ?>

   <script>

+  <?php if ($this->is('index')): ?>

+  //进展提示

+  mdui.snackbar({

+    message: '欢迎来到 <?php $this->options->title(); ?>！',

+    position: 'right-top'

+  });

+  <?php endif; ?>

   //prism highlight-code load

 $(document).ready(function(){

     var doc_pre = $(".post-content pre");

diff --git a/includes/head.php b/includes/head.php
index b091887..c80fdb0 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -45,10 +45,12 @@
 	<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/prism.css'); ?>" />

 	<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/owo.min.css'); ?>" />

     <link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/nprogress.css'); ?>" />

-  

+	<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/mdui.min.css'); ?>" />

+    <link href="https://fonts.googleapis.com/css?family=Noto+Serif+SC" rel="stylesheet">

+	

     <!-- 部分js -->

 	<script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/jquery.min.js'); ?>"></script>

-	<script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/bootstrap.min.js'); ?>"></script>

+	<script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/mdui.min.js'); ?>"></script>

   

     <!-- 部分css -->

 	<style>

diff --git a/includes/header.php b/includes/header.php
index f8fdedc..e733de6 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -18,8 +18,8 @@
 		  <?php $this->options->custom_nav() ?>

 		  <?php else: ?>

 		    <?php $this->widget('Widget_Contents_Page_List')

-            ->parse('<li><a href="{permalink}" data-pjax><i class="fa fa-paper-plane" aria-hidden="true"></i> {title}</a></li>'); ?>

-		  <li><a data-pjax href="<?php $this->options->SiteUrl(); ?>"><i class="fa fa-home" aria-hidden="true"></i> 首页</a></li>

+            ->parse('<li><a class="mdui-ripple" href="{permalink}" data-pjax><i class="fa fa-paper-plane" aria-hidden="true"></i> {title}</a></li>'); ?>

+		  <li><a class="mdui-ripple" data-pjax href="<?php $this->options->SiteUrl(); ?>"><i class="fa fa-home" aria-hidden="true"></i> 首页</a></li>

 		  <?php endif; ?>

 		</ul>

 	  </div>

diff --git a/includes/sidebar.php b/includes/sidebar.php
index c9dfa2f..674dfb9 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -89,7 +89,7 @@
       <?php $this->widget('Widget_Metas_Tag_Cloud', 'sort=mid&ignoreZeroCount=1&desc=0&limit=30')->to($tags); ?>

       <?php if($tags->have()): ?>

       <?php while ($tags->next()): ?>

-      <a href="<?php $tags->permalink(); ?>" title="该标签下有 <?php $tags->count(); ?> 篇文章" data-pjax><?php $tags->name(); ?></a>

+      <a class="mdui-ripple" href="<?php $tags->permalink(); ?>" title="该标签下有 <?php $tags->count(); ?> 篇文章" data-pjax><?php $tags->name(); ?></a>

       <?php endwhile; ?>

       <?php else: ?>

       还没有任何标签哦~

diff --git a/plugins/Links/Plugin.php b/plugins/Links/Plugin.php
index ed6d7b4..a67cfe8 100644
--- a/plugins/Links/Plugin.php
+++ b/plugins/Links/Plugin.php
@@ -267,7 +267,7 @@ class Links_Plugin implements Typecho_Plugin_Interface
 		} else if ($pattern == "SHOW_MIX") {

 			$pattern = "

 			<a href=\"{url}\" target=\"_blank\" title=\"{title}\" class=\"links-link\">

-			<div class=\"col-md-3 col-xs-6 col-sm-4\">

+			<div class=\"col-md-3 col-xs-4\">

 			  <div class=\"links-item\">

 			    <div class=\"links-img\" style=\"background:url('{image}');width: 100%;padding-top: 100%;background-repeat: no-repeat;background-size: cover;\"></div>

 				<div class=\"links-title\">

diff --git a/post/post-content.php b/post/post-content.php
index 56d160d..068f6a1 100644
--- a/post/post-content.php
+++ b/post/post-content.php
@@ -4,8 +4,8 @@
 	$content = preg_replace('/<a(.*?)>/s','<a ${1} data-pjax>',$content);

     $content = preg_replace('/<table(.*?)>/s','<table class="table table-striped table-hover table-bordered">',$content);

 	$content = preg_replace('/<pre><code>/s','<pre><code class="language-html">',$content);

-	$content = preg_replace('/<img(.*?)src="(.*?)"(.*?)alt="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}" class="gallery-link"><img${1}src="${2}"${3}></a><span class="post-img-alt">${4}</span>',$content); 

-	

+	$content = preg_replace('/<img(.*?)src="(.*?)"(.*?)alt="(.*?)"(.*?)>/s','<center><a data-fancybox="gallery" href="${2}" class="gallery-link"><img${1}src="${2}"${3}></a><span class="post-img-alt">${4}</span></center>',$content); 

+

 	//短代码（无参数）

 	$reg = '/\[scode\](.*?)\[\/scode\]/s';

     $rp = '<div class="tip">${1}</div>';

diff --git a/post/post-item.php b/post/post-item.php
index fe81b5d..e7307a7 100644
--- a/post/post-item.php
+++ b/post/post-item.php
@@ -15,7 +15,7 @@
 			  <h4 class="saying-title"><a href="<?php $this->permalink() ?>" data-pjax><?php $this->title(); ?></a></h4>

 	          <div class="saying-info"><?php $this->date('F j, Y'); ?></div>

 			  

-			  <a href="<?php $this->permalink() ?>" class="read-more pull-right btn btn-default" data-pjax>前往吐槽</a>

+			  <a href="<?php $this->permalink() ?>" style="margin-top:-40px;" class="read-more pull-right mdui-btn mdui-ripple" data-pjax>前往吐槽</a>

 			</div>

 		  </div>

 	  </div>