Skip to content

Commit 1f73415

Browse files
fehguyfehguy
committed
Merge pull request #1345 from swagger-api/develop_2.0
merge from develop 2.0 for release
2 parents f289076 + 6738810 commit 1f73415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+12397
-1420
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###
2-
# swagger-ui-builder - https://github.com/wordnik/swagger-ui/
2+
# swagger-ui-builder - https://github.com/swagger-api/swagger-ui/
33
# Container for building the swagger-ui static site
44
#
55
# Build: docker build -t swagger-ui-builder .

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2015 Reverb Technologies, Inc.
1+
Copyright 2015 SmartBear Software
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The Swagger Specification has undergone 4 revisions since initial creation in 20
2020

2121
Swagger UI Version | Release Date | Swagger Spec compatibility | Notes | Status
2222
------------------ | ------------ | -------------------------- | ----- | ------
23-
2.1.1-M2 | 2015-04-16 | 1.1, 1.2, 2.0 | [master](https://github.com/swagger-api/swagger-ui) |
23+
2.1.1 | 2015-06-06 | 1.1, 1.2, 2.0 | [master](https://github.com/swagger-api/swagger-ui) |
2424
2.0.24 | 2014-09-12 | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |
2525
1.0.13 | 2013-03-08 | 1.1, 1.2 | [tag v1.0.13](https://github.com/swagger-api/swagger-ui/tree/v1.0.13) |
2626
1.0.1 | 2011-10-11 | 1.0, 1.1 | [tag v1.0.1](https://github.com/swagger-api/swagger-ui/tree/v1.0.1) |
@@ -96,8 +96,9 @@ operationsSorter | Apply a sort to the operation list of each API. It can be 'al
9696
onComplete | This is a callback function parameter which can be passed to be notified of when SwaggerUI has completed rendering successfully.
9797
onFailure | This is a callback function parameter which can be passed to be notified of when SwaggerUI encountered a failure was unable to render.
9898
highlightSizeThreshold | Any size response below this threshold will be highlighted syntactically, attempting to highlight large responses can lead to browser hangs, not including a threshold will default to highlight all returned responses.
99-
supportedSubmitMethods | An array of of the HTTP operations that will have the 'Try it out!` option. An empty array disables all operations. This does not filter the operations from the display.
99+
supportedSubmitMethods | An array of of the HTTP operations that will have the 'Try it out!' option. An empty array disables all operations. This does not filter the operations from the display.
100100
oauth2RedirectUrl | OAuth redirect URL
101+
showRequestHeaders | Whether or not to show the headers that were sent when making a request via the 'Try it out!' option. Defaults to `false`.
101102

102103
* All other parameters are explained in greater detail below
103104

@@ -228,7 +229,7 @@ Plsee see [releases](https://github.com/swagger-api/swagger-ui/releases) for cha
228229

229230
## License
230231

231-
Copyright 2011-2015 Reverb technologies, Inc.
232+
Copyright 2011-2015 SmartBear Software
232233

233234
Licensed under the Apache License, Version 2.0 (the "License");
234235
you may not use this file except in compliance with the License.

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swagger-ui",
33
"main": "dist/index.html",
4-
"version": "2.1.5-M2",
4+
"version": "2.1.0",
55
"authors": [
66
"Mohsen Azimi <[email protected]>"
77
],
@@ -13,7 +13,7 @@
1313
"Swagger",
1414
"API"
1515
],
16-
"license": "Copyright 2015 Reverb Technologies, Inc.",
16+
"license": "Copyright 2015 SmartBear Software",
1717
"homepage": "http://swagger.io",
1818
"private": true,
1919
"ignore": [

‎dist/css/print.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,17 @@
426426
.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
427427
font-weight: bold;
428428
}
429+
.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
430+
.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
431+
display: inline;
432+
}
433+
.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
434+
display: block;
435+
content: '';
436+
}
437+
.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
438+
margin-right: -3px;
439+
}
429440
.swagger-section .swagger-ui-wrap .model-signature .propName {
430441
font-weight: bold;
431442
}

‎dist/css/screen.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,17 @@
426426
.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
427427
font-weight: bold;
428428
}
429+
.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
430+
.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
431+
display: inline;
432+
}
433+
.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
434+
display: block;
435+
content: '';
436+
}
437+
.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
438+
margin-right: -3px;
439+
}
429440
.swagger-section .swagger-ui-wrap .model-signature .propName {
430441
font-weight: bold;
431442
}

‎dist/css/style.css‎

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
.swagger-section #header a#logo {
2+
font-size: 1.5em;
3+
font-weight: bold;
4+
text-decoration: none;
5+
background: transparent url(../images/logo.png) no-repeat left center;
6+
padding: 20px 0 20px 40px;
7+
}
8+
#text-head {
9+
font-size: 80px;
10+
font-family: 'Roboto', sans-serif;
11+
color: #ffffff;
12+
float: right;
13+
margin-right: 20%;
14+
}
15+
.navbar-fixed-top .navbar-nav {
16+
height: auto;
17+
}
18+
.navbar-fixed-top .navbar-brand {
19+
height: auto;
20+
}
21+
.navbar-header {
22+
height: auto;
23+
}
24+
.navbar-inverse {
25+
background-color: #000;
26+
border-color: #000;
27+
}
28+
#navbar-brand {
29+
margin-left: 20%;
30+
}
31+
.navtext {
32+
font-size: 10px;
33+
}
34+
.h1,
35+
h1 {
36+
font-size: 60px;
37+
}
38+
.navbar-default .navbar-header .navbar-brand {
39+
color: #a2dfee;
40+
}
41+
/* tag titles */
42+
.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
43+
color: #393939;
44+
font-family: 'Arvo', serif;
45+
font-size: 1.5em;
46+
}
47+
.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
48+
color: black;
49+
}
50+
.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
51+
color: #525252;
52+
padding-left: 0px;
53+
display: block;
54+
clear: none;
55+
float: left;
56+
font-family: 'Arvo', serif;
57+
font-weight: bold;
58+
}
59+
.navbar-default .navbar-collapse,
60+
.navbar-default .navbar-form {
61+
border-color: #0A0A0A;
62+
}
63+
.container1 {
64+
width: 1500px;
65+
margin: auto;
66+
margin-top: 0;
67+
background-image: url('../images/shield.png');
68+
background-repeat: no-repeat;
69+
background-position: -40px -20px;
70+
margin-bottom: 210px;
71+
}
72+
.container-inner {
73+
width: 1200px;
74+
margin: auto;
75+
background-color: rgba(223, 227, 228, 0.75);
76+
padding-bottom: 40px;
77+
padding-top: 40px;
78+
border-radius: 15px;
79+
}
80+
.header-content {
81+
padding: 0;
82+
width: 1000px;
83+
}
84+
.title1 {
85+
font-size: 80px;
86+
font-family: 'Vollkorn', serif;
87+
color: #404040;
88+
text-align: center;
89+
padding-top: 40px;
90+
padding-bottom: 100px;
91+
}
92+
#icon {
93+
margin-top: -18px;
94+
}
95+
.subtext {
96+
font-size: 25px;
97+
font-style: italic;
98+
color: #08b;
99+
text-align: right;
100+
padding-right: 250px;
101+
}
102+
.bg-primary {
103+
background-color: #00468b;
104+
}
105+
.navbar-default .nav > li > a,
106+
.navbar-default .nav > li > a:focus {
107+
color: #08b;
108+
}
109+
.navbar-default .nav > li > a,
110+
.navbar-default .nav > li > a:hover {
111+
color: #08b;
112+
}
113+
.navbar-default .nav > li > a,
114+
.navbar-default .nav > li > a:focus:hover {
115+
color: #08b;
116+
}
117+
.text-faded {
118+
font-size: 25px;
119+
font-family: 'Vollkorn', serif;
120+
}
121+
.section-heading {
122+
font-family: 'Vollkorn', serif;
123+
font-size: 45px;
124+
padding-bottom: 10px;
125+
}
126+
hr {
127+
border-color: #00468b;
128+
padding-bottom: 10px;
129+
}
130+
.description {
131+
margin-top: 20px;
132+
padding-bottom: 200px;
133+
}
134+
.description li {
135+
font-family: 'Vollkorn', serif;
136+
font-size: 25px;
137+
color: #525252;
138+
margin-left: 28%;
139+
padding-top: 5px;
140+
}
141+
.gap {
142+
margin-top: 200px;
143+
}
144+
.troubleshootingtext {
145+
color: rgba(255, 255, 255, 0.7);
146+
padding-left: 30%;
147+
}
148+
.troubleshootingtext li {
149+
list-style-type: circle;
150+
font-size: 25px;
151+
padding-bottom: 5px;
152+
}
153+
.overlay {
154+
position: absolute;
155+
top: 0;
156+
left: 0;
157+
width: 100%;
158+
height: 100%;
159+
z-index: 1000;
160+
}
161+
.block.response_body.json:hover {
162+
cursor: pointer;
163+
}
164+
.backdrop {
165+
color: blue;
166+
}
167+
#myModal {
168+
height: 100%;
169+
}
170+
.modal-backdrop {
171+
bottom: 0;
172+
position: fixed;
173+
}
174+
.curl {
175+
padding: 10px;
176+
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
177+
font-size: 0.9em;
178+
max-height: 400px;
179+
margin-top: 5px;
180+
overflow-y: auto;
181+
background-color: #fcf6db;
182+
border: 1px solid #e5e0c6;
183+
border-radius: 4px;
184+
}
185+
.curl_title {
186+
font-size: 1.1em;
187+
margin: 0;
188+
padding: 15px 0 5px;
189+
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
190+
font-weight: 500;
191+
line-height: 1.1;
192+
}
193+
.footer {
194+
display: none;
195+
}
196+
.swagger-section .swagger-ui-wrap h2 {
197+
padding: 0;
198+
}
199+
h2 {
200+
margin: 0;
201+
margin-bottom: 5px;
202+
}
203+
.markdown p {
204+
font-size: 15px;
205+
font-family: 'Arvo', serif;
206+
}
207+
.swagger-section .swagger-ui-wrap .code {
208+
font-size: 15px;
209+
font-family: 'Arvo', serif;
210+
}
211+
.swagger-section .swagger-ui-wrap b {
212+
font-family: 'Arvo', serif;
213+
}
214+
#signin:hover {
215+
cursor: pointer;
216+
}
217+
.dropdown-menu {
218+
padding: 15px;
219+
}
220+
.navbar-right .dropdown-menu {
221+
left: 0;
222+
right: auto;
223+
}
224+
#signinbutton {
225+
width: 100%;
226+
height: 32px;
227+
font-size: 13px;
228+
font-weight: bold;
229+
color: #08b;
230+
}
231+
.navbar-default .nav > li .details {
232+
color: #000000;
233+
text-transform: none;
234+
font-size: 15px;
235+
font-weight: normal;
236+
font-family: 'Open Sans', sans-serif;
237+
font-style: italic;
238+
line-height: 20px;
239+
top: -2px;
240+
}
241+
.navbar-default .nav > li .details:hover {
242+
color: black;
243+
}
244+
#signout {
245+
width: 100%;
246+
height: 32px;
247+
font-size: 13px;
248+
font-weight: bold;
249+
color: #08b;
250+
}

‎dist/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
log("Unable to Load SwaggerUI");
5353
},
5454
docExpansion: "none",
55-
apisSorter: "alpha"
55+
apisSorter: "alpha",
56+
showRequestHeaders: false
5657
});
5758

5859
function addApiKeyAuthorization(){

0 commit comments

Comments
 (0)