Update css for swagger 2.4.1, add missing resource to fix js error
Change-Id: I91c932ed21564eb862438464642a2f62982e8c71
diff --git a/web/api/src/main/resources/docs/css/print.css b/web/api/src/main/resources/docs/css/print.css
index cd3aa8b..2e6b310 100644
--- a/web/api/src/main/resources/docs/css/print.css
+++ b/web/api/src/main/resources/docs/css/print.css
@@ -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;
@@ -807,6 +819,9 @@
outline: 2px solid black;
outline-color: #cc0000;
}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
+ max-width: 300px;
+}
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
padding: 10px;
@@ -1121,14 +1136,14 @@
font-size: 24px;
padding: 10px 0;
}
-.swagger-section .api-popup-dialog p.error-msg {
+.swagger-section .api-popup-dialog .error-msg {
padding-left: 5px;
padding-bottom: 5px;
}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
+.swagger-section .api-popup-dialog .api-popup-authbtn {
height: 30px;
}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
+.swagger-section .api-popup-dialog .api-popup-cancel {
height: 30px;
}
.swagger-section .api-popup-scopes {
@@ -1138,14 +1153,14 @@
padding: 5px 0;
line-height: 20px;
}
-.swagger-section .api-popup-scopes .api-scope-desc {
- padding-left: 20px;
- font-style: italic;
-}
.swagger-section .api-popup-scopes li input {
position: relative;
top: 2px;
}
+.swagger-section .api-popup-scopes .api-scope-desc {
+ padding-left: 20px;
+ font-style: italic;
+}
.swagger-section .api-popup-actions {
padding-top: 10px;
}
diff --git a/web/api/src/main/resources/docs/css/screen.css b/web/api/src/main/resources/docs/css/screen.css
index 5586d96..c3c3815 100644
--- a/web/api/src/main/resources/docs/css/screen.css
+++ b/web/api/src/main/resources/docs/css/screen.css
@@ -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;
@@ -807,6 +819,9 @@
outline: 2px solid black;
outline-color: #cc0000;
}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
+ max-width: 300px;
+}
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
padding: 10px;
@@ -1121,14 +1136,14 @@
font-size: 24px;
padding: 10px 0;
}
-.swagger-section .api-popup-dialog p.error-msg {
+.swagger-section .api-popup-dialog .error-msg {
padding-left: 5px;
padding-bottom: 5px;
}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
+.swagger-section .api-popup-dialog .api-popup-authbtn {
height: 30px;
}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
+.swagger-section .api-popup-dialog .api-popup-cancel {
height: 30px;
}
.swagger-section .api-popup-scopes {
@@ -1138,14 +1153,14 @@
padding: 5px 0;
line-height: 20px;
}
-.swagger-section .api-popup-scopes .api-scope-desc {
- padding-left: 20px;
- font-style: italic;
-}
.swagger-section .api-popup-scopes li input {
position: relative;
top: 2px;
}
+.swagger-section .api-popup-scopes .api-scope-desc {
+ padding-left: 20px;
+ font-style: italic;
+}
.swagger-section .api-popup-actions {
padding-top: 10px;
}
@@ -1155,8 +1170,16 @@
.swagger-section .auth {
float: right;
}
-.swagger-section #api_information_panel {
- position: absolute;
+.swagger-section .api-ic {
+ height: 18px;
+ vertical-align: middle;
+ display: inline-block;
+ background: url(../images/explorer_icons.png) no-repeat;
+}
+.swagger-section .api-ic .api_information_panel {
+ position: relative;
+ margin-top: 20px;
+ margin-left: -5px;
background: #FFF;
border: 1px solid #ccc;
border-radius: 5px;
@@ -1167,34 +1190,32 @@
color: black;
padding: 5px;
}
-.swagger-section #api_information_panel p .api-msg-enabled {
+.swagger-section .api-ic .api_information_panel p .api-msg-enabled {
color: green;
}
-.swagger-section #api_information_panel p .api-msg-disabled {
+.swagger-section .api-ic .api_information_panel p .api-msg-disabled {
color: red;
}
-.swagger-section .api-ic {
- height: 18px;
- vertical-align: middle;
- display: inline-block;
- background: url(../images/explorer_icons.png) no-repeat;
+.swagger-section .api-ic:hover .api_information_panel {
+ position: absolute;
+ display: block;
}
.swagger-section .ic-info {
background-position: 0 0;
width: 18px;
- margin-top: -7px;
+ margin-top: -6px;
margin-left: 4px;
}
.swagger-section .ic-warning {
background-position: -60px 0;
width: 18px;
- margin-top: -7px;
+ margin-top: -6px;
margin-left: 4px;
}
.swagger-section .ic-error {
background-position: -30px 0;
width: 18px;
- margin-top: -7px;
+ margin-top: -6px;
margin-left: 4px;
}
.swagger-section .ic-off {
@@ -1220,36 +1241,32 @@
font-size: small;
padding: 14px;
}
-
-.swagger-section #header a#logo {
- font-size: 1.6em;
- font-weight: bold;
- text-decoration: none;
- background: transparent url(../images/onos-logo.png) no-repeat left center;
- padding: 20px 0 20px 60px;
- color: white;
+.swagger-section #input_baseUrl {
+ width: 200px;
+ display: none;
}
-.swagger-section #header form#api_selector {
+.swagger-section #api_selector {
display: block;
clear: none;
float: right;
}
-.swagger-section #header form#api_selector .input {
+.swagger-section #api_selector .input {
display: block;
clear: none;
float: left;
margin: 0 10px 0 0;
}
-.swagger-section #header form#api_selector .input input#input_apiKey {
+.swagger-section #api_selector input {
+ font-size: 0.9em;
+ padding: 3px;
+ margin: 0;
+}
+.swagger-section #input_apiKey {
width: 200px;
border-radius: 3px;
border: solid 2px #fff;
}
-.swagger-section #header form#api_selector .input input#input_baseUrl {
- width: 200px;
- display: none;
-}
-.swagger-section #header form#api_selector .input a#explore {
+.swagger-section #explore {
display: block;
text-decoration: none;
font-weight: bold;
@@ -1264,10 +1281,17 @@
-khtml-border-radius: 4px;
border-radius: 4px;
}
-.swagger-section #header form#api_selector .input a#explore:hover {
+.swagger-section #explore:hover {
background-color: #CE5650;
}
-
+.swagger-section #header #logo {
+ font-size: 1.6em;
+ font-weight: bold;
+ text-decoration: none;
+ background: transparent url(../images/onos-logo.png) no-repeat left center;
+ padding: 20px 0 20px 60px;
+ color: white;
+}
.swagger-section #header form#api_selector #selector {
width: 580px;
height: 28px;
@@ -1289,12 +1313,6 @@
width: 580px;
height: 28px;
}
-
-.swagger-section #header form#api_selector .input input {
- font-size: 0.9em;
- padding: 3px;
- margin: 0;
-}
.swagger-section #content_message {
margin: 10px 15px;
font-style: italic;
@@ -1305,3 +1323,9 @@
text-align: center;
padding-top: 10px;
}
+.swagger-section .swagger-collapse:before {
+ content: "-";
+}
+.swagger-section .swagger-expand:before {
+ content: "+";
+}
diff --git a/web/api/src/main/resources/docs/images/throbber.gif b/web/api/src/main/resources/docs/images/throbber.gif
new file mode 100644
index 0000000..0639388
--- /dev/null
+++ b/web/api/src/main/resources/docs/images/throbber.gif
Binary files differ
