Released v5.4.0

HISTORY.md

@@ -3,9 +3,9 @@
 https://github.com/josdejong/jsoneditor
 
 
-## not yet released, version 5.4.0
+## 2016-04-09, version 5.4.0
 
-- Upgraded all dependencies.
+- Upgraded all dependencies (`ajv`, `brace`, etc).
 - Fixed #289: Some CSS breaking when using the editor in combination with
   materialize.css or bootstrap.
 - Fixed #290: `setText()` not working in mode text or code.

dist/jsoneditor.css

@@ -1,3 +1,28 @@
+/* reset styling (prevent conflicts with bootstrap, materialize.css, etc.) */
+
+div.jsoneditor input {
+  height: auto;
+  border: inherit;
+}
+
+div.jsoneditor input:focus {
+  border: none !important;
+  box-shadow: none !important;
+}
+
+div.jsoneditor table {
+  border-collapse: collapse;
+  width: auto;
+}
+
+div.jsoneditor td,
+div.jsoneditor th {
+  padding: 0;
+  display: table-cell;
+  text-align: left;
+  vertical-align: inherit;
+  border-radius: inherit;
+}
 div.jsoneditor-field,
 div.jsoneditor-value,
 div.jsoneditor-readonly {
@@ -465,6 +490,7 @@ div.jsoneditor-contextmenu-root {
 
 div.jsoneditor-contextmenu {
   position: absolute;
+  box-sizing: content-box;
   z-index: 99999;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsoneditor",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "main": "./index",
   "description": "A web-based tool to view, edit, format, and validate JSON",
   "tags": [