Merge branch 'master' into releases

This commit is contained in:
Roman Hotsiy 2016-02-03 18:57:47 +02:00
commit c2c3e07005
3 changed files with 11 additions and 3 deletions

View File

@ -104,8 +104,9 @@ Redoc.init('http://petstore.swagger.io/v2/swagger.json', {
`git clone https://github.com/Rebilly/ReDoc.git` `git clone https://github.com/Rebilly/ReDoc.git`
2. Go to the project folder 2. Go to the project folder
`cd ReDoc` `cd ReDoc`
3. Install node modules 3. Install node modules and front-end dependencies
`npm install` `npm install`
`npm run jspm-install`
4. _(optional)_ Replace `demo/swagger.json` with your own schema 4. _(optional)_ Replace `demo/swagger.json` with your own schema
5. Start the server 5. Start the server
`npm start` `npm start`

View File

@ -78,3 +78,10 @@ $array-marker-line-height: 1.5;
background-color: $headers-color; background-color: $headers-color;
} }
} }
tabs .params-wrap > .param-wrap:first-of-type .param-name {
border-left: 0;
&:before {
display: none;
}
}

View File

@ -1,7 +1,7 @@
{ {
"name": "redoc", "name": "redoc",
"description": "Swagger-generated API Reference Documentation", "description": "Swagger-generated API Reference Documentation",
"version": "0.5.1", "version": "0.5.2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/Rebilly/ReDoc" "url": "git://github.com/Rebilly/ReDoc"
@ -10,7 +10,7 @@
"scripts": { "scripts": {
"test": "gulp lint && ./build/run_tests.sh", "test": "gulp lint && ./build/run_tests.sh",
"prepublish": "gulp build", "prepublish": "gulp build",
"postinstall": "npm install jspm && jspm install", "jspm-install": "jspm install",
"start": "gulp serve", "start": "gulp serve",
"build-dist": "gulp build", "build-dist": "gulp build",
"branch-release": "git reset --hard && branch-release", "branch-release": "git reset --hard && branch-release",