Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/swagger-ui.js # dist/swagger-ui.min.js
jensoleg · May 14, 2016 · 2b5baca · 2b5baca
2 parents e454303 + a6e81dc
commit 2b5baca
Show file tree

Hide file tree

Showing 32 changed files with 14,964 additions and 2,796 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,24 @@ The theme will adapt to screen size and works on tablets and mobile phones.
 
 [![Swagger Theme example](dist/images/Swagger_explorer_min.png)](http://ecs.bobbytech.dk/api)
 
+A JSON editor for the request body (disabled by default).
+
+![Swagger JSON editor example](dist/images/json_editor_integration.png)
+
+JSON editor configuration example:
+
+```javascript
+                jsonEditor: true,
+                jsonEditorOptions: {
+                    disableProperties:false,
+                    disableEditJson:false,
+                    removeEmptyProperties:true,
+                    noDefaultProperties:true
+                },
+                docExpansion: "none",
+                sorter: "alpha",
+```
+
 Give it a [try](http://swaggerui.herokuapp.com/) and enter your own swagger definition.
 
 

diff --git a/dist/css/api-explorer.css b/dist/css/api-explorer.css
@@ -205,7 +205,7 @@
     background: #ff9a57
 }
 
-.swagger-section .form-control.error {
+.swagger-section .ui-form-control.error {
     border-color: #fd8888;
     border-width: 2px
 }
@@ -346,17 +346,17 @@
     }
 }
 
-.swagger-section .parameter-item .form-control {
+.swagger-section .parameter-item .ui-form-control {
     width: auto;
     max-width: 100%
 }
 
-.swagger-section .parameter-item .form-control.body-textarea {
+.swagger-section .parameter-item .ui-form-control.body-textarea {
     min-height: 100px;
     width: 100%
 }
 
-.swagger-section .parameter-item select.form-control {
+.swagger-section .parameter-item select.ui-form-control {
     width: auto
 }