fix style error of colorpicker, ul and ol

ifanrx · Oct 10, 2017 · c49ec75 · c49ec75
1 parent a4399e0
commit c49ec75
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/lib/ReactUeditor.js b/lib/ReactUeditor.js
@@ -139,6 +139,7 @@ var ReactUeditor = function (_React$Component) {
       if (props.uploadImage) {
         props.uploadImage(e);
       }
+      tempfileInput.value = '';
     }
   }, {
     key: 'initEditor',

diff --git a/src/ReactUeditor.js b/src/ReactUeditor.js
@@ -96,6 +96,7 @@ class ReactUeditor extends React.Component {
     if (props.uploadImage) {
       props.uploadImage(e)
     }
+    tempfileInput.value = ''
   }
 
   static insertImage(imageUrl) {

diff --git a/ueditor/_src/plugins/list.js b/ueditor/_src/plugins/list.js
@@ -116,7 +116,7 @@ UE.plugins['list'] = function () {
         customCss.push('.list-paddingleft-2{padding-left:'+me.options.listDefaultPaddingLeft+'px}');
         customCss.push('.list-paddingleft-3{padding-left:'+me.options.listDefaultPaddingLeft*2+'px}');
         //如果不给宽度会在自定应样式里出现滚动条
-        utils.cssRule('list', 'ol,ul{margin:0;pading:0;'+(browser.ie ? '' : 'width:95%')+'}li{clear:both;}'+customCss.join('\n'), me.document);
+        utils.cssRule('list', 'ol,ul{box-sizing:border-box;margin:0;pading:0;'+(browser.ie ? '' : 'width:95%')+'}li{clear:both;}'+customCss.join('\n'), me.document);
     });
     //单独处理剪切的问题
     me.ready(function(){

diff --git a/ueditor/themes/default/_css/colorpicker.css b/ueditor/themes/default/_css/colorpicker.css
@@ -11,6 +11,7 @@
     margin-left: 1px;
     width: 128px;
     float: left;
+    box-sizing: content-box;
 }
 
 .edui-default .edui-colorpicker-nocolor {
@@ -22,6 +23,7 @@
     border: 1px solid #333;
     padding: 3px 5px;
     cursor: pointer;
+    box-sizing: content-box;
 }
 
 .edui-default .edui-colorpicker-tablefirstrow {

diff --git a/vendor/ueditor/themes/default/css/ueditor.css b/vendor/ueditor/themes/default/css/ueditor.css
@@ -1558,6 +1558,7 @@ div.edui-box {
     margin-left: 1px;
     width: 128px;
     float: left;
+    box-sizing: content-box;
 }
 
 .edui-default .edui-colorpicker-nocolor {
@@ -1569,6 +1570,7 @@ div.edui-box {
     border: 1px solid #333;
     padding: 3px 5px;
     cursor: pointer;
+    box-sizing: content-box;
 }
 
 .edui-default .edui-colorpicker-tablefirstrow {

diff --git a/vendor/ueditor/themes/default/css/ueditor.min.css b/vendor/ueditor/themes/default/css/ueditor.min.css
diff --git a/vendor/ueditor/ueditor.all.js b/vendor/ueditor/ueditor.all.js
@@ -1,7 +1,7 @@
 /*!
  * UEditor
  * version: ueditor
- * build: Sun Oct 01 2017 23:13:56 GMT+0800 (CST)
+ * build: Tue Oct 10 2017 23:17:02 GMT+0800 (CST)
  */
 
 (function(){
@@ -15066,7 +15066,7 @@ UE.plugins['list'] = function () {
         customCss.push('.list-paddingleft-2{padding-left:'+me.options.listDefaultPaddingLeft+'px}');
         customCss.push('.list-paddingleft-3{padding-left:'+me.options.listDefaultPaddingLeft*2+'px}');
         //如果不给宽度会在自定应样式里出现滚动条
-        utils.cssRule('list', 'ol,ul{margin:0;pading:0;'+(browser.ie ? '' : 'width:95%')+'}li{clear:both;}'+customCss.join('\n'), me.document);
+        utils.cssRule('list', 'ol,ul{box-sizing:border-box;margin:0;pading:0;'+(browser.ie ? '' : 'width:95%')+'}li{clear:both;}'+customCss.join('\n'), me.document);
     });
     //单独处理剪切的问题
     me.ready(function(){

diff --git a/vendor/ueditor/ueditor.all.min.js b/vendor/ueditor/ueditor.all.min.js
diff --git a/vendor/ueditor/ueditor.parse.js b/vendor/ueditor/ueditor.parse.js
@@ -1,7 +1,7 @@
 /*!
  * UEditor
  * version: ueditor
- * build: Sun Oct 01 2017 23:13:56 GMT+0800 (CST)
+ * build: Tue Oct 10 2017 23:17:02 GMT+0800 (CST)
  */
 
 (function(){

diff --git a/vendor/ueditor/ueditor.parse.min.js b/vendor/ueditor/ueditor.parse.min.js