jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into guange_dev

This commit is contained in:
sw 2015-04-23 17:45:22 +08:00
parent 12193a0d5d f7dd4924c1
commit e21dfe28fd
3 changed files with 5966 additions and 5958 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/assets/kindeditor/kindeditor.js
View File

@ -257,10 +257,10 @@ K.options = {
minHeight : 100, minHeight : 100,
minChangeSize : 50, minChangeSize : 50,
zIndex : 811213, zIndex : 811213,
items : ['emoticons', items : ['emoticons','imagedirectupload',
'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', 'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', 'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
'italic', 'underline', 'removeformat', '|', 'image', 'table', 'link', '|', 'fullscreen' 'italic', 'underline', 'removeformat', '|','table', 'link', '|', 'fullscreen'
], ],
noDisableItems : ['source', 'fullscreen'], noDisableItems : ['source', 'fullscreen'],
colorTable : [ colorTable : [

1
public/assets/kindeditor/lang/zh_CN.js
View File

@ -8,6 +8,7 @@
*******************************************************************************/ *******************************************************************************/
KindEditor.lang({ KindEditor.lang({
imagedirectupload:'本地图片',
source : 'HTML代码', source : 'HTML代码',
preview : '预览', preview : '预览',
undo : '后退(Ctrl+Z)', undo : '后退(Ctrl+Z)',

7
public/assets/kindeditor/themes/default/default.css
View File

@ -413,6 +413,13 @@
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
.ke-icon-imagedirectupload
{
background-position: 0px -1232px;
width: 16px;
height: 16px;
}
/* container */ /* container */
.ke-container { .ke-container {
display: block; display: block;