Merge pull request #1282 from nprdm/develop_2.0

fehguy · fehguy · commit eb70c736df65 · 2015-05-13T17:41:34.000-04:00
Fixes #1233
diff --git a/dist/css/print.css b/dist/css/print.css
@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }
diff --git a/dist/css/screen.css b/dist/css/screen.css
@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
@@ -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) {
   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)))
-    + "</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));
   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";
diff --git a/dist/swagger-ui.min.js b/dist/swagger-ui.min.js
diff --git a/src/main/html/css/print.css b/src/main/html/css/print.css
@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }
diff --git a/src/main/html/css/screen.css b/src/main/html/css/screen.css
@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }
diff --git a/src/main/less/specs.less b/src/main/less/specs.less
@@ -1085,6 +1085,10 @@
             }
         }
     }
+
+    .operation-status td.markdown > p:last-child {
+        padding-bottom: 0;
+    }
 }
 
 }
diff --git a/src/main/template/status_code.handlebars b/src/main/template/status_code.handlebars
@@ -1,5 +1,5 @@
 <td width='15%' class='code'>{{code}}</td>
-<td>{{{message}}}</td>
+<td class="markdown">{{{message}}}</td>
 <td width='50%'><span class="model-signature" /></td>
 <td class="headers">
   <table>

Original file line number	Diff line number	Diff line change
`@@ -1069,6 +1069,9 @@`
`1069`	`1069`	`.swagger-section .swagger-ui-wrap form.form_box p strong {`
`1070`	`1070`	`color: black;`
`1071`	`1071`	`}`
	`1072`	`+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {`
	`1073`	`+ padding-bottom: 0;`
	`1074`	`+}`
`1072`	`1075`	`.swagger-section .title {`
`1073`	`1076`	`font-style: bold;`
`1074`	`1077`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1085,6 +1085,10 @@`
`1085`	`1085`	`}`
`1086`	`1086`	`}`
`1087`	`1087`	`}`
	`1088`	`+`
	`1089`	`+ .operation-status td.markdown > p:last-child {`
	`1090`	`+ padding-bottom: 0;`
	`1091`	`+ }`
`1088`	`1092`	`}`
`1089`	`1093`
`1090`	`1094`	`}`