Skip to content

Commit

Permalink
Move inline style to themes so it can be overridden. Fixes jdorn#509
Browse files Browse the repository at this point in the history
  • Loading branch information
jdorn committed Sep 27, 2015
1 parent 4471e12 commit 635adc1
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/editors/object.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({

// Container for child editor area
this.editor_holder = this.theme.getIndentedPanel();
this.editor_holder.style.paddingBottom = '0';
this.container.appendChild(this.editor_holder);

// Container for rows of child editors
Expand Down
1 change: 1 addition & 0 deletions src/themes/bootstrap2.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ JSONEditor.defaults.themes.bootstrap2 = JSONEditor.AbstractTheme.extend({
getIndentedPanel: function() {
var el = document.createElement('div');
el.className = 'well well-small';
el.style.paddingBottom = 0;
return el;
},
getFormInputDescription: function(text) {
Expand Down
1 change: 1 addition & 0 deletions src/themes/bootstrap3.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ JSONEditor.defaults.themes.bootstrap3 = JSONEditor.AbstractTheme.extend({
getIndentedPanel: function() {
var el = document.createElement('div');
el.className = 'well well-sm';
el.style.paddingBottom = 0;
return el;
},
getFormInputDescription: function(text) {
Expand Down
1 change: 1 addition & 0 deletions src/themes/foundation.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ JSONEditor.defaults.themes.foundation = JSONEditor.AbstractTheme.extend({
getIndentedPanel: function() {
var el = document.createElement('div');
el.className = 'panel';
el.style.paddingBottom = 0;
return el;
},
getHeaderButtonHolder: function() {
Expand Down

0 comments on commit 635adc1

Please sign in to comment.