Merge branch 'master' of https://github.com/easysoft/zentaopms

module/story/css/batchcreate.css

@@ -2,6 +2,6 @@
 #batchCreateForm .col-module,
 #batchCreateForm .col-plan {width: 180px;}
 #batchCreateForm .col-pri {width: 100px;}
-#batchCreateForm .col-review,
+#batchCreateForm .col-review {width:95px;}
 #batchCreateForm .col-estimate {width: 90px;}
 .body-modal .main-header > h2 {max-width: 80%;}

www/js/kindeditor/kindeditor.js

@@ -4906,12 +4906,14 @@
                 items.pop();
             }
             var prevItem = null;
+            var filterItems = [];
             _each(items, function(i) {
-                if(this.title == '-' && prevItem.title == '-') {
-                    delete items[i];
+                if (!prevItem || !(prevItem.title === '-' && this.title === '-')) {
+                    filterItems.push(this);
+                    prevItem = this;
                 }
-                prevItem = this;
             });
+            items = filterItems;
             if(items.length > 0) {
                 e.preventDefault();
                 var pos = K(self.edit.iframe).pos(),
@@ -10051,7 +10053,7 @@ KindEditor.EditorClass.prototype.setPlaceholder = function(placeholder, asHtml)
     var $doc = $(edit.doc);
     var $placeholder = $doc.find('.kindeditor-ph');
     if (!$placeholder.length) {
-        $placeholder = $('<div class="kindeditor-ph" style="width:100%; color:#888; padding: 8px; background:none; position:absolute;z-index:10;top:0;border:0;overflow:auto;resize:none; pointer-events:none; white-space: pre-wrap;"></div>');
+        $placeholder = $('<div class="kindeditor-ph" style="width:100%; color:#888; padding: 8px; background:none; position:absolute;z-index:10;top:0;border:0;overflow:auto;resize:none; pointer-events:none; white-space: pre-wrap; font-size: 13px"></div>');
         if (options.placeholderStyle) {
             $placeholder.css(options.placeholderStyle);
         }