Merge branch 'JSONEditor' into JSONEditorMaster
Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js src/main/less/screen.less
unknown
@@ -126,6 +126,7 @@
|
||||
max-width: 960px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
/* JSONEditor specific styling */
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap b,
|
||||
.swagger-section .swagger-ui-wrap strong {
|
||||
@@ -458,6 +459,17 @@
|
||||
.swagger-section .swagger-ui-wrap .required {
|
||||
font-weight: bold;
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap .editor_holder {
|
||||
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap .editor_holder label {
|
||||
font-weight: normal!important;
|
||||
/* JSONEditor uses bold by default for all labels, we revert that back to normal to not give the impression that by default fields are required */
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap .editor_holder label.required {
|
||||
font-weight: bold!important;
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap input.parameter {
|
||||
width: 300px;
|
||||
border: 1px solid #aaa;
|
||||
|
||||
@@ -126,6 +126,7 @@
|
||||
max-width: 960px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
/* JSONEditor specific styling */
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap b,
|
||||
.swagger-section .swagger-ui-wrap strong {
|
||||
@@ -458,6 +459,17 @@
|
||||
.swagger-section .swagger-ui-wrap .required {
|
||||
font-weight: bold;
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap .editor_holder {
|
||||
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap .editor_holder label {
|
||||
font-weight: normal!important;
|
||||
/* JSONEditor uses bold by default for all labels, we revert that back to normal to not give the impression that by default fields are required */
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap .editor_holder label.required {
|
||||
font-weight: bold!important;
|
||||
}
|
||||
.swagger-section .swagger-ui-wrap input.parameter {
|
||||
width: 300px;
|
||||
border: 1px solid #aaa;
|
||||
@@ -1277,3 +1289,9 @@
|
||||
text-align: center;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.swagger-section .swagger-collapse:before {
|
||||
content: "-";
|
||||
}
|
||||
.swagger-section .swagger-expand:before {
|
||||
content: "+";
|
||||
}
|
||||
|
||||
BIN
src/main/html/images/collapse.gif
Normal file
|
After Width: | Height: | Size: 69 B |
BIN
src/main/html/images/expand.gif
Normal file
|
After Width: | Height: | Size: 73 B |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 645 B After Width: | Height: | Size: 644 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 770 B After Width: | Height: | Size: 769 B |
|
Before Width: | Height: | Size: 824 B After Width: | Height: | Size: 823 B |
|
Before Width: | Height: | Size: 980 B After Width: | Height: | Size: 979 B |
@@ -1,3 +1,4 @@
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
@@ -19,6 +20,7 @@
|
||||
<script src='lib/backbone-min.js' type='text/javascript'></script>
|
||||
<script src='swagger-ui.js' type='text/javascript'></script>
|
||||
<script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
|
||||
<script src='lib/jsoneditor.min.js' type='text/javascript'></script>
|
||||
<script src='lib/marked.js' type='text/javascript'></script>
|
||||
<script src='lib/swagger-oauth.js' type='text/javascript'></script>
|
||||
|
||||
@@ -69,6 +71,7 @@
|
||||
log("Unable to Load SwaggerUI");
|
||||
},
|
||||
docExpansion: "none",
|
||||
jsonEditor:true,
|
||||
apisSorter: "alpha",
|
||||
showRequestHeaders: false
|
||||
});
|
||||
|
||||