Corrected issues with merge of 2.x changes

This commit is contained in:
Shelby Sanders 2014-08-04 20:02:00 -07:00
parent 24d77f027d
commit ae8858c66b
4 changed files with 3 additions and 15 deletions

View File

@ -96,16 +96,3 @@ Options are passed to `explorer(app, options)`.
> Default: Read from package.json
> Sets your API version. If not present, will read from your app's package.json.
=======
> Set the base path for swagger resources.
> Default: `app.get('restAPIRoot')` or `/swagger/resources`.
`swaggerDistRoot`: **String**
> Set a path within your application for overriding Swagger UI files.
> If present, will search `swaggerDistRoot` first when attempting to load Swagger UI, allowing
you to pick and choose overrides.
> See [index.html](public/index.html), where you may want to begin your overrides.
> The rest of the UI is provided by [Swagger UI](https://github.com/wordnik/swagger-ui).

View File

@ -23,4 +23,4 @@
/*
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
*/
*/

View File

@ -1672,4 +1672,4 @@ pre code {
}
.message-fail {
color: #cc0000;
}
}

View File

@ -61,3 +61,4 @@ $(function() {
}
}
});