Skip to content

Commit

Permalink
Fixed josdejong#54: CSS more robust against global settings of div po…
Browse files Browse the repository at this point in the history
…sition
  • Loading branch information
josdejong committed Jan 3, 2017
1 parent 94ca26e commit 1c8ea64
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ https://github.com/josdejong/jsoneditor

- Fixed embedded version of jsoneditor ace theme not being loaded in
minimalist version (see #55).
- Fixed a styling issue in the SearchBox of Ace editor (mode `code`).
- Fixed #54: CSS more robust against global settings of div position.
- Added docs and example on how to use a custom version of Ace editor.


Expand Down
4 changes: 4 additions & 0 deletions src/css/reset.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/* reset styling (prevent conflicts with bootstrap, materialize.css, etc.) */

div.jsoneditor div {
position: static;
}

div.jsoneditor .jsoneditor-search input {
height: auto;
border: inherit;
Expand Down

0 comments on commit 1c8ea64

Please sign in to comment.