diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 5503af1fe..0354ed467 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -815,7 +815,8 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) { startNewline = endNewline = ''; } } - if (attr !== '') { + //blockquote 单独加上style 之后再改成接口 给别的加上默认的 + if (attr !== '' || (tagName === 'blockquote')) { var attrMap = _getAttrList(full); if (tagName === 'font') { var fontStyleMap = {}, fontStyle = ''; @@ -877,6 +878,9 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) { } }); attr = ''; + if (tagName === 'blockquote') { + attrMap['style'] = "margin: 0 0 0 40px; border: none; padding: 0px;background: none;background-color: ;"; + } _each(attrMap, function(key, val) { if (key === 'style' && val === '') { return; diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index f9f7c4b78..0db8eb45b 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -46,7 +46,7 @@ .ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;} -.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;} +.ke-content blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;} span.at {color:#269ac9;} span.at a{color:#269ac9;text-decoration: none;} diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index 74b14b118..3f3cbb27c 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -284,7 +284,7 @@ KindEditor.plugin('table', function(K) { for (var i = 0; i < rows; i++) { html += '