diff --git a/app/web/app.css b/app/web/app.css index bd779a4..7cf5d08 100644 --- a/app/web/app.css +++ b/app/web/app.css @@ -184,7 +184,7 @@ span.header-light { margin: 40px 0 0 0 ; } -#splitter #toJSON { +#splitter #toCode { margin: 20px 0 0 0 ; } diff --git a/app/web/app.js b/app/web/app.js index cdb89f9..fff5f98 100644 --- a/app/web/app.js +++ b/app/web/app.js @@ -26,7 +26,7 @@ * Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org * * @author Jos de Jong, - * @date 2013-02-26 + * @date 2013-03-08 */ diff --git a/app/web/index.html b/app/web/index.html index 2e60586..14d78b6 100644 --- a/app/web/index.html +++ b/app/web/index.html @@ -37,7 +37,7 @@ Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org @author Jos de Jong, - @date 2013-03-07 + @date 2013-03-08 --> diff --git a/app/web/test.html b/app/web/test.html index 26cbd7b..f50fe91 100644 --- a/app/web/test.html +++ b/app/web/test.html @@ -36,7 +36,7 @@ Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org @author Jos de Jong, - @date 2013-03-07 + @date 2013-03-08 --> diff --git a/build.xml b/build.xml index 3aaf9e4..896933b 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ - + diff --git a/changelog.txt b/changelog.txt index 6aa86ba..0e97e1c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,7 +3,7 @@ http://jsoneditoronline.org -## , version 2.1.0 +## 2013-03-08, version 2.1.0 - Replaced the plain text editor with code editor Ace, which brings in syntax highlighting and code inspection. diff --git a/misc/screenshots/codeeditor_640x400.png b/misc/screenshots/codeeditor_640x400.png new file mode 100644 index 0000000..0356fdc Binary files /dev/null and b/misc/screenshots/codeeditor_640x400.png differ diff --git a/misc/screenshots/jsoneditoronline.png b/misc/screenshots/jsoneditoronline.png index 97a3dd2..807ce4b 100644 Binary files a/misc/screenshots/jsoneditoronline.png and b/misc/screenshots/jsoneditoronline.png differ diff --git a/misc/screenshots/jsoneditoronline_640x400.png b/misc/screenshots/jsoneditoronline_640x400.png index 43a52d9..0b9c9c7 100644 Binary files a/misc/screenshots/jsoneditoronline_640x400.png and b/misc/screenshots/jsoneditoronline_640x400.png differ diff --git a/misc/screenshots/plaintext_640x400.png b/misc/screenshots/plaintext_640x400.png deleted file mode 100644 index c94f22c..0000000 Binary files a/misc/screenshots/plaintext_640x400.png and /dev/null differ