Merge pull request #1282 from nprdm/develop_2.0

Fixes #1233
This commit is contained in:
Tony Tam
2015-05-13 17:41:34 -04:00
8 changed files with 29 additions and 9 deletions

3
dist/css/print.css vendored
View File

@@ -1069,6 +1069,9 @@
.swagger-section .swagger-ui-wrap form.form_box p strong { .swagger-section .swagger-ui-wrap form.form_box p strong {
color: black; color: black;
} }
.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
.swagger-section .title { .swagger-section .title {
font-style: bold; font-style: bold;
} }

3
dist/css/screen.css vendored
View File

@@ -1069,6 +1069,9 @@
.swagger-section .swagger-ui-wrap form.form_box p strong { .swagger-section .swagger-ui-wrap form.form_box p strong {
color: black; color: black;
} }
.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
.swagger-section .title { .swagger-section .title {
font-style: bold; font-style: bold;
} }

2
dist/swagger-ui.js vendored
View File

@@ -1086,7 +1086,7 @@ this["Handlebars"]["templates"]["status_code"] = Handlebars.template({"1":functi
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td width='15%' class='code'>" var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td width='15%' class='code'>"
+ escapeExpression(((helper = (helper = helpers.code || (depth0 != null ? depth0.code : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"code","hash":{},"data":data}) : helper))) + escapeExpression(((helper = (helper = helpers.code || (depth0 != null ? depth0.code : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"code","hash":{},"data":data}) : helper)))
+ "</td>\n<td>"; + "</td>\n<td class=\"markdown\">";
stack1 = ((helper = (helper = helpers.message || (depth0 != null ? depth0.message : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"message","hash":{},"data":data}) : helper)); stack1 = ((helper = (helper = helpers.message || (depth0 != null ? depth0.message : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"message","hash":{},"data":data}) : helper));
if (stack1 != null) { buffer += stack1; } if (stack1 != null) { buffer += stack1; }
buffer += "</td>\n<td width='50%'><span class=\"model-signature\" /></td>\n<td class=\"headers\">\n <table>\n <tbody>\n"; buffer += "</td>\n<td width='50%'><span class=\"model-signature\" /></td>\n<td class=\"headers\">\n <table>\n <tbody>\n";

File diff suppressed because one or more lines are too long

View File

@@ -1069,6 +1069,9 @@
.swagger-section .swagger-ui-wrap form.form_box p strong { .swagger-section .swagger-ui-wrap form.form_box p strong {
color: black; color: black;
} }
.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
.swagger-section .title { .swagger-section .title {
font-style: bold; font-style: bold;
} }

View File

@@ -1069,6 +1069,9 @@
.swagger-section .swagger-ui-wrap form.form_box p strong { .swagger-section .swagger-ui-wrap form.form_box p strong {
color: black; color: black;
} }
.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
.swagger-section .title { .swagger-section .title {
font-style: bold; font-style: bold;
} }

View File

@@ -1085,6 +1085,10 @@
} }
} }
} }
.operation-status td.markdown > p:last-child {
padding-bottom: 0;
}
} }
} }

View File

@@ -1,5 +1,5 @@
<td width='15%' class='code'>{{code}}</td> <td width='15%' class='code'>{{code}}</td>
<td>{{{message}}}</td> <td class="markdown">{{{message}}}</td>
<td width='50%'><span class="model-signature" /></td> <td width='50%'><span class="model-signature" /></td>
<td class="headers"> <td class="headers">
<table> <table>