kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Browse Source 
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	test/e2e/v2.js
This commit is contained in:
Laurent Lepinay
2015-09-21 14:48:29 +02:00
parent 1a8444c4c0 8bc259558b
commit 1367e8f6fa
12 changed files with 137 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/html/css/print.css
View File

@@ -819,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;

3
src/main/html/css/screen.css
View File

@@ -819,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;

1
src/main/javascript/view/OperationView.js
View File

@@ -701,6 +701,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
$.bbq.pushState('#/', 2);
Docs.collapseOperation(elem);
} else {
event.preventDefault();
Docs.expandOperation(elem);
}
},

5
src/main/less/specs.less
View File

@@ -757,6 +757,9 @@
outline: 2px solid black;
outline-color: #cc0000;
}
select[name='parameterContentType'] {
max-width:300px;
}
}
div.response {
div.block {
@@ -1117,4 +1120,4 @@
}
}
}
}