Merge pull request b3log#12206 from b3log/1.7.0-dev

88250 · web-flow · commit 80b05fb7bd09 · 2016-11-10T01:21:53.000+08:00
1.7.0 dev
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ JDK 环境准备好之后[下载](http://pan.baidu.com/share/link?shareid=541735
 * 统一规范的编码风格
 * 完善的 javadoc 注释
 * 严格的分支、缺陷追踪管理
-* 不断完善的单元测试用例，目前覆盖率已达 **47%**
+* 不断完善的单元测试用例
 
 ## 文档
 
diff --git a/src/main/resources/lang_zh_CN.properties b/src/main/resources/lang_zh_CN.properties
@@ -16,7 +16,7 @@
 
 #
 # Description: Solo default language configurations(zh_CN).
-# Version: 2.7.4.19, Nov 8, 2016
+# Version: 2.7.4.20, Nov 9, 2016
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -390,7 +390,7 @@ helloWorld.content=\u6b22\u8fce\u4f7f\u7528 [Solo](https://github.com/b3log/solo
 \n\
 ----\n\
 \n\
-Solo \u535a\u5ba2\u7cfb\u7edf\u662f\u4e00\u4e2a\u5f00\u6e90\u9879\u76ee\uff0c\u5982\u679c\u4f60\u89c9\u5f97\u5b83\u4e0d\u9519\uff0c\u8bf7\u5230[\u9879\u76ee\u9996\u9875](https://github.com/b3log/solo)\u7ed9\u9897\u661f\uff0c\u8c22\u8c22 :heart:
+Solo \u535a\u5ba2\u7cfb\u7edf\u662f\u4e00\u4e2a\u5f00\u6e90\u9879\u76ee\uff0c\u5982\u679c\u4f60\u89c9\u5f97\u5b83\u5f88\u8d5e\uff0c\u8bf7\u5230[\u9879\u76ee\u9996\u9875](https://github.com/b3log/solo)\u7ed9\u9897\u661f\u9f13\u52b1\u4e00\u4e0b :heart:
 helloWorld.comment.content=\u5199\u535a\u5ba2\u9700\u8981\u575a\u6301\uff0c\u76f8\u4fe1\u79ef\u7d2f\u540e\u5fc5\u7136\u4f1a\u6709\u6536\u83b7\uff0c\u6211\u4eec\u4e00\u8d77\u52aa\u529b\u52a0\u6cb9 :smile:  
 articleContentPwd=\u8be5\u6587\u7ae0\u5df2\u7ecf\u52a0\u5bc6\u3002
 ok=\u786e\u5b9a
diff --git a/src/main/webapp/css/default-admin.css b/src/main/webapp/css/default-admin.css
@@ -740,6 +740,10 @@ button#submitArticle:hover,
 .comment-content .CodeMirror {
     height: 170px;
 }
+
+#pagePagePanel {
+    margin-top: 0;
+}
 /* end article */
 
 /* start preference */
diff --git a/src/main/webapp/css/default-admin.min.css b/src/main/webapp/css/default-admin.min.css
diff --git a/src/main/webapp/js/admin/latkeAdmin.js b/src/main/webapp/js/admin/latkeAdmin.js
@@ -930,7 +930,7 @@ $.extend(TablePaginate.prototype, {
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.3.4.5, Nov 8, 2016
+ * @version 1.3.5.5, Nov 9, 2016
  */
 admin.article = {
     currentEditorType: '',
@@ -1327,7 +1327,7 @@ admin.article = {
                     height: 160,
                     buttonText: Label.selectLabel,
                     data: tags
-                });
+                }).width($("#tag").parent().width() - 68);
 
                 $("#loadMsg").text("");
             }
diff --git a/src/main/webapp/js/admin/latkeAdmin.min.js b/src/main/webapp/js/admin/latkeAdmin.min.js
