Merge branch 'bmcbride-patch-1'

jdorn · jdorn · commit 40d1674c993f · 2014-06-29T23:30:59.000-07:00
diff --git a/src/themes/bootstrap3.js b/src/themes/bootstrap3.js
@@ -42,6 +42,8 @@ JSONEditor.defaults.themes.bootstrap3 = JSONEditor.AbstractTheme.extend({
       label.style.fontSize = '14px';
       group.style.marginTop = '0';
       group.appendChild(label);
+      input.style.position = 'relative';
+      input.style.float = 'left';
     } 
     else {
       group.className += ' form-group';

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ JSONEditor.defaults.themes.bootstrap3 = JSONEditor.AbstractTheme.extend({`
`42`	`42`	`label.style.fontSize = '14px';`
`43`	`43`	`group.style.marginTop = '0';`
`44`	`44`	`group.appendChild(label);`
	`45`	`+ input.style.position = 'relative';`
	`46`	`+ input.style.float = 'left';`
`45`	`47`	`}`
`46`	`48`	`else {`
`47`	`49`	`group.className += ' form-group';`