Merge pull request jdorn#719 from germanbisurgi/master

fix for jdorn#662 and jdorn#718

Author: schmunk42

src/editors/colorpicker.js

@@ -10,7 +10,10 @@ import { extend } from '../utilities.js'
 
 export class ColorEditor extends StringEditor {
   postBuild () {
-    if (window.Picker) this.input.type = 'text'
+    if (window.Picker) {
+      this.input.type = 'text'
+    }
+    this.input.style.padding = '3px'
   }
 
   setValue (value, initial, fromTemplate) {

src/editors/object.js

@@ -547,11 +547,12 @@ export class ObjectEditor extends AbstractEditor {
         this.header.textContent = this.getTitle()
       }
       this.title = this.theme.getHeader(this.header)
+      this.title.style.display = 'inline-block'
       this.controls = this.theme.getButtonHolder()
       this.controls.style.margin = '0 0 0 10px'
 
       this.container.appendChild(this.title)
-      this.title.appendChild(this.controls)
+      this.container.appendChild(this.controls)
       this.container.style.position = 'relative'
 
       /* Edit JSON modal */