StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated history and bootstrap test file

This commit is contained in:
jos 2016-04-11 21:42:38 +02:00
parent 81829c9dac
commit 309e8f9bc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.md
View File

@ -5,8 +5,10 @@ https://github.com/josdejong/jsoneditor
## not yet released, version 5.5.0
- Implemented a dropdown for values having an JSON Schema enum. Thanks @tdakanalis.
- Implemented a dropdown for values having an JSON Schema enum.
Thanks @tdakanalis.
- Fixed #291, #292: Some CSS broken when using the editor in combination with
bootstrap. Thanks @nucleartide.
## 2016-04-09, version 5.4.0

6
test/test_bootstrap.html
View File

@ -1,10 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css" rel="stylesheet" type="text/css">
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"></script>
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" type="text/css">
<!--<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css" rel="stylesheet" type="text/css">-->
<link href="../dist/jsoneditor.css" rel="stylesheet" type="text/css">
<script src="../dist/jsoneditor.js"></script>