From f492b1fff2346e62617894b0f5a22d0091509b60 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 16 Mar 2017 19:25:10 +0100 Subject: [PATCH] Fixes for documentation file --- src/Squidex/Squidex.csproj | 12 ++++++------ src/Squidex/Views/Shared/Docs.cshtml | 6 +++--- src/Squidex/package.json | 5 +++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 46aee52e5..8f685d3ca 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -69,10 +69,10 @@ - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.Web.dll - - - + + + <_DocumentationFile Include="$(DocumentationFile)" /> + + + diff --git a/src/Squidex/Views/Shared/Docs.cshtml b/src/Squidex/Views/Shared/Docs.cshtml index f042e37d6..a4541b6c1 100644 --- a/src/Squidex/Views/Shared/Docs.cshtml +++ b/src/Squidex/Views/Shared/Docs.cshtml @@ -13,7 +13,7 @@ body { margin: 0; padding: 0; - position: fixed; + position: static; } h1, @@ -31,8 +31,8 @@ - + - + \ No newline at end of file diff --git a/src/Squidex/package.json b/src/Squidex/package.json index cb0031801..881f38e21 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -8,9 +8,9 @@ "test": "karma start", "test:coverage": "karma start karma.coverage.conf.js", "test:clean": "rimraf _test-output", - "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000", + "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & cpx node_modules/redoc/dist/redoc.min.js wwwroot/scripts/ webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000", "build": "webpack --config app-config/webpack.run.prod.js --display-error-details --bail", - "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/", + "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & cpx node_modules/redoc/dist/redoc.min.js wwwroot/scripts/", "build:clean": "rimraf wwwroot/build" }, "dependencies": { @@ -29,6 +29,7 @@ "mousetrap": "1.6.0", "oidc-client": "1.3.0-beta.3", "pikaday": "1.5.1", + "redoc": "1.10.0", "rxjs": "5.2.0", "zone.js": "0.7.7" },