Merge branch 'szzh' into guange_dev

10 years ago · e21dfe28fd
parent 12193a0d5d f7dd4924c1
commit e21dfe28fd
3 changed files with 5966 additions and 5958 deletions
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
--- a/public/assets/kindeditor/lang/zh_CN.js
+++ b/public/assets/kindeditor/lang/zh_CN.js
@ -8,6 +8,7 @@
 *******************************************************************************/
 KindEditor.lang({
    imagedirectupload:'本地图片',
 	source : 'HTML代码',
 	preview : '预览',
 	undo : '后退(Ctrl+Z)',
--- a/public/assets/kindeditor/themes/default/default.css
+++ b/public/assets/kindeditor/themes/default/default.css
@ -413,6 +413,13 @@
 	width: 16px;
 	height: 16px;
 }
 .ke-icon-imagedirectupload
 {
    background-position: 0px -1232px;
    width: 16px;
    height: 16px;
 }
 /* container */
 .ke-container {
 	display: block;