tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixes for documentation file

pull/1/head
Sebastian 9 years ago
parent
6c132ea389
commit
f492b1fff2
3 changed files with 12 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/Squidex/Squidex.csproj
  2. 6
      src/Squidex/Views/Shared/Docs.cshtml
  3. 5
      src/Squidex/package.json

12
src/Squidex/Squidex.csproj
View File

@ -69,10 +69,10 @@
<PackageReference Include="Microsoft.OData.Core" Version="6.15.0" /> <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <Target Name="IncludeDocFile" BeforeTargets="PrepareForPublish">
<Reference Include="System.Web"> <ItemGroup Condition=" '$(DocumentationFile)' != '' ">
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.Web.dll</HintPath> <_DocumentationFile Include="$(DocumentationFile)" />
</Reference> <ContentWithTargetPath Include="@(_DocumentationFile->'%(FullPath)')" RelativePath="%(_DocumentationFile.Identity)" TargetPath="%(_DocumentationFile.Filename)%(_DocumentationFile.Extension)" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup> </ItemGroup>
</Target>
</Project> </Project>

6
src/Squidex/Views/Shared/Docs.cshtml
View File

@ -13,7 +13,7 @@
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
position: fixed; position: static;
} }
h1, h1,
@ -31,8 +31,8 @@
</style> </style>
</head> </head>
<body> <body>
<redoc lazy-rendering="true" spec-url="@Url.Content(ViewBag.Specification)"></redoc> <redoc spec-url="@Url.Content(ViewBag.Specification)"></redoc>
<script src="https://rebilly.github.io/ReDoc/releases/v1.10.1/redoc.min.js"></script> <script src="/scripts/redoc.min.js"></script>
</body> </body>
</html> </html>

5
src/Squidex/package.json
View File

@ -8,9 +8,9 @@
"test": "karma start", "test": "karma start",
"test:coverage": "karma start karma.coverage.conf.js", "test:coverage": "karma start karma.coverage.conf.js",
"test:clean": "rimraf _test-output", "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": "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" "build:clean": "rimraf wwwroot/build"
}, },
"dependencies": { "dependencies": {
@ -29,6 +29,7 @@
"mousetrap": "1.6.0", "mousetrap": "1.6.0",
"oidc-client": "1.3.0-beta.3", "oidc-client": "1.3.0-beta.3",
"pikaday": "1.5.1", "pikaday": "1.5.1",
"redoc": "1.10.0",
"rxjs": "5.2.0", "rxjs": "5.2.0",
"zone.js": "0.7.7" "zone.js": "0.7.7"
}, },

Write Preview
Loading…
Cancel
Save