Merge branch 'szzh' into guange_dev

This commit is contained in:
sw 2015-04-23 17:45:22 +08:00
commit e21dfe28fd
3 changed files with 5966 additions and 5958 deletions

File diff suppressed because it is too large Load Diff

View File

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

View File

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