Merge branch 'master' of https://github.com/typecho/typecho

imgugu · Jan 19, 2015 · a867645 · a867645
2 parents bcbb02b + b54c3fb
commit a867645
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/usr/themes/default/style.css b/usr/themes/default/style.css
@@ -25,14 +25,13 @@ a:hover, a:active {
   color: #444;
 }
 pre, code { 
-  background: #F3F3F0;
+  background: #F3F3F3;
   font-family: Menlo, Monaco, Consolas, "Lucida Console", "Courier New", monospace;
   font-size: .92857em;
 }
 code { padding: 2px 4px; color: #B94A48; }
 pre {
-  padding: 0;
-  border: 1px solid #ccc;
+  padding: 8px;
   overflow: auto;
   max-height: 400px;
 }
@@ -42,9 +41,23 @@ pre code {
 }
 
 blockquote {
-  margin: 1em 1.5em;
+  margin: 1em 0;
   padding-left: 1.5em;
-  border-left: 4px solid #F3F3F0;
+  border-left: 4px solid #eee;
+  color: #666;
+}
+
+table {
+  border: 1px solid #ddd;
+  width: 100%;
+}
+table th,
+table td {
+  padding: 5px 10px;
+  border: 1px solid #eee;
+}
+table th {
+  background: #f3f3f3;
 }
 
 h1, h2, h3, h4, h5, h6 {

diff --git a/var/Widget/Options/Discussion.php b/var/Widget/Options/Discussion.php
@@ -48,7 +48,7 @@ public function form()
 
         $commentsShowOptions = array(
             'commentsShowCommentOnly'   =>  _t('仅显示评论, 不显示 Pingback 和 Trackback'),
-            'commentsMarkdown'      =>  _t('在评论中使用Markdown语法'),
+            'commentsMarkdown'      =>  _t('在评论中使用 Markdown 语法'),
             'commentsShowUrl'       =>  _t('评论者名称显示时自动加上其个人主页链接'),
             'commentsUrlNofollow'   =>  _t('对评论者个人主页链接使用 <a href="http://en.wikipedia.org/wiki/Nofollow">nofollow 属性</a>'),
             'commentsAvatar'        =>  _t('启用 <a href="http://gravatar.com">Gravatar</a> 头像服务, 最高显示评级为 %s 的头像',