Merge branch 'brettz9-float'

jdorn · Jul 30, 2014 · ce00976 · ce00976
2 parents 2201929 + b969bca
commit ce00976
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/theme.js b/src/theme.js
@@ -5,8 +5,8 @@ JSONEditor.AbstractTheme = Class.extend({
   getFloatRightLinkHolder: function() {
     var el = document.createElement('div');
     el.style = el.style || {};
-    el.style.float = 'right';
-    el.style['margin-left'] = '10px';
+    el.style.cssFloat = 'right';
+    el.style.marginLeft = '10px';
     return el;
   },
   getModal: function() {

diff --git a/src/themes/bootstrap3.js b/src/themes/bootstrap3.js
@@ -43,7 +43,7 @@ JSONEditor.defaults.themes.bootstrap3 = JSONEditor.AbstractTheme.extend({
       group.style.marginTop = '0';
       group.appendChild(label);
       input.style.position = 'relative';
-      input.style.float = 'left';
+      input.style.cssFloat = 'left';
     } 
     else {
       group.className += ' form-group';