Merge branch 'JSONEditor' into JSONEditorMaster

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js src/main/less/screen.less
2015-09-10 10:53:15 +02:00
parent 736e7cd90e 3128da0446
commit ea2cefa46e
49 changed files with 2904 additions and 2546 deletions
--- a/src/main/less/screen.less
+++ b/src/main/less/screen.less
@@ -144,4 +144,14 @@
    padding-top: 10px;
 }

+.swagger-collapse:before {
+  content: "-";
 }
+
+.swagger-expand:before {
+  content: "+";
+}
+
+
+}
+