Skip to content

Commit 4f44421

Browse files
authored
Merge pull request #2711 from FoothillSolutions/fix-website-assets
Fix website assets
2 parents 1ba479c + 0452168 commit 4f44421

31 files changed

+116
-113
lines changed

RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Release Notes
22

3+
## 6.0.0-alpha001 - 2022-11-02
4+
* ENHANCEMENT: Fix website assets loading
5+
36
## 6.0.0-alpha001 - 2022-11-01
47
* ENHANCEMENT: Update dependencies of repository, thanks @yazeedobaid - https://fake.build/articles/fake-v6-release-announcement.html
58
* ENHANCEMENT: Remove obsolete APIs and replace their usage with alternative suggested API's, thanks @yazeedobaid - https://fake.build/articles/fake-v6-release-announcement.html

docs/_template.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
<title>{{fsdocs-page-title}}</title>
66
<meta charset="utf-8">
77
<meta name="description" content="FAKE - F# Make - A DSL for build tasks - guide page">
8-
<link rel="apple-touch-icon" sizes="180x180" href="{{root}}content/apple-touch-icon.png">
9-
<link rel="icon" type="image/png" sizes="32x32" href="{{root}}content/favicon-32x32.png">
10-
<link rel="icon" type="image/png" sizes="16x16" href="{{root}}content/favicon-16x16.png">
11-
<link rel="manifest" href="{{root}}content/site.webmanifest">
12-
<link rel="mask-icon" href="{{root}}content/safari-pinned-tab.svg" color="#5bbad5">
8+
<link rel="apple-touch-icon" sizes="180x180" href="/content/apple-touch-icon.png">
9+
<link rel="icon" type="image/png" sizes="32x32" href="/content/favicon-32x32.png">
10+
<link rel="icon" type="image/png" sizes="16x16" href="/content/favicon-16x16.png">
11+
<link rel="manifest" href="/content/site.webmanifest">
12+
<link rel="mask-icon" href="/content/safari-pinned-tab.svg" color="#5bbad5">
1313
<meta name="msapplication-TileColor" content="#2d89ef">
1414
<meta name="theme-color" content="#ffffff">
1515

1616
<meta name="author" content="{{fsdocs-authors}}">
1717
<meta name="viewport" content="width=device-width, initial-scale=1">
1818
<meta http-equiv="X-UA-Compatible" content="ie=edge">
1919

20-
<link type="text/css" rel="stylesheet" href="{{root}}content/fsdocs-{{fsdocs-theme}}.css">
21-
<script type="text/javascript" src="{{root}}content/fsdocs-tips.js"></script>
20+
<link type="text/css" rel="stylesheet" href="/content/fsdocs-{{fsdocs-theme}}.css">
21+
<script type="text/javascript" src="/content/fsdocs-tips.js"></script>
2222

23-
<link type="text/css" rel="stylesheet" href="{{root}}content/assets/css/style.css">
24-
<link type="text/css" rel="stylesheet" href="{{root}}content/assets/css/prism.css">
25-
<link type="text/css" rel="stylesheet" href="{{root}}content/assets/css/tailwind.css">
23+
<link type="text/css" rel="stylesheet" href="/content/assets/css/style.css">
24+
<link type="text/css" rel="stylesheet" href="/content/assets/css/prism.css">
25+
<link type="text/css" rel="stylesheet" href="/content/assets/css/tailwind.css">
2626
<script defer src="https://unpkg.com/[email protected]/dist/cdn.min.js"></script>
2727

2828
{{fsdocs-watch-script}}
@@ -35,8 +35,8 @@
3535
lg:border-t-0 lg:border-r-0 lg:border-l-0 lg:shadow border-b-[#d4b43c]/50 mx-4 lg:mx-0"
3636
:class="{'bg-white': open === false}">
3737
<div class="flex gap-2 items-center block">
38-
<a class="flex items-center gap-2" href="{{root}}index.html">
39-
<img src="{{root}}content/assets/img/logo.svg" alt="FAKE - F# Make - A DSL for build tasks and more"
38+
<a class="flex items-center gap-2" href="/index.html">
39+
<img src="/content/assets/img/logo.svg" alt="FAKE - F# Make - A DSL for build tasks and more"
4040
width="28" height="28" class="w-10 h-10">
4141
<span class="text-lg text-slate-900 font-bold hover:text-[#d4b43c]">FAKE</span>
4242
</a>
@@ -59,10 +59,10 @@
5959
<div class="flex items-center pt-10 md:pt-0">
6060
<div class="md:mr-5">
6161
<ul class="flex space-x-4">
62-
<li><a class="font-medium hover:text-[#d4b43c]" href="{{root}}reference/index.html">API Docs</a>
62+
<li><a class="font-medium hover:text-[#d4b43c]" href="/reference/index.html">API Docs</a>
6363
</li>
6464
<li class="md:hidden">|</li>
65-
<li><a class="font-medium hover:text-[#d4b43c]" href="{{root}}guide.html">Guide</a></li>
65+
<li><a class="font-medium hover:text-[#d4b43c]" href="/guide.html">Guide</a></li>
6666
</ul>
6767
</div>
6868
<button
@@ -128,8 +128,8 @@
128128
<div class=" sticky inset-0 flex justify-between items-center bg-[#f9f9f9] py-4 border-b border-[#d4b43c]/50
129129
lg:hidden">
130130
<div class="flex gap-2 items-center">
131-
<a class="flex items-center gap-2" href="{{root}}index.html">
132-
<img src="{{root}}content/assets/img/logo.svg"
131+
<a class="flex items-center gap-2" href="/index.html">
132+
<img src="/content/assets/img/logo.svg"
133133
alt="FAKE - F# Make - A DSL for build tasks and more" width="28" height="28"
134134
class="w-10 h-10">
135135
<span class="text-lg text-slate-900 font-bold hover:text-[#d4b43c]">FAKE</span>
@@ -369,7 +369,7 @@ <h4 class="text-lg">Get in touch</h4>
369369
</div>
370370
</div>
371371
</footer>
372-
<script type="text/javascript" src="{{root}}content/assets/js/prism.js"></script>
372+
<script type="text/javascript" src="/content/assets/js/prism.js"></script>
373373
</body>
374374

375375
</html>

docs/articles/api-slack.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
In this article you will learn how to create a [Slack](https://slack.com) webhook integration and
44
send a notification to it. This article assumes that you already have a Slack team setup.
55

6-
To see the available Slack APIs in FAKE, please see the [`API-Reference`]({{root}}reference/fake-api-slack.html) for the Slack module.
6+
To see the available Slack APIs in FAKE, please see the [`API-Reference`](/reference/fake-api-slack.html) for the Slack module.
77

88
## Adding a Webhook Integration to a Channel
99

@@ -51,6 +51,6 @@ Slack.sendNotification webhookUrl (fun p ->
5151

5252
The result should look something like this:
5353

54-
![alt text]({{root}}content/img/slacknotification/slacknotification.png "Slack Notification Result")
54+
![alt text](/content/img/slacknotification/slacknotification.png "Slack Notification Result")
5555

5656
For additional information on the parameters, check out Slack's [Webhook Documentation](https://api.slack.com/incoming-webhooks)

docs/articles/core-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The Vault module in FAKE provide a way to secure sensitive information from the build logs. It works in a way similar
44
to secret variables in VSTS.
55

6-
To see the available Vault APIs in FAKE, please see the [`API-Reference`]({{root}}reference/fake-core-vault.html) for the Vault module.
6+
To see the available Vault APIs in FAKE, please see the [`API-Reference`](/reference/fake-core-vault.html) for the Vault module.
77

88
## Goals and non-goals
99

docs/articles/dotnet-assemblyinfo.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
In this article the `AssemblyInfo` task is used in order to set specific version information to .NET assemblies.
44

5-
If you succeeded with the [Getting Started tutorial]({{root}}guide/getting-started.html), then you just have to modify your
5+
If you succeeded with the [Getting Started tutorial](/guide/getting-started.html), then you just have to modify your
66
`BuildApp` target to the following:
77

88
```fsharp
@@ -36,7 +36,7 @@ Target.create "BuildApp" (fun _ ->
3636
```
3737

3838
As you can see generating an `AssemblyInfo.fs` file is pretty easy with FAKE. You can read more about the C# and F# `AssemblyInfo` tasks
39-
in the [API docs]({{root}}reference/fake-dotnet-assemblyinfofile.html).
39+
in the [API docs](/reference/fake-dotnet-assemblyinfofile.html).
4040

4141
## Setting the version Number
4242

@@ -49,7 +49,7 @@ let version =
4949
| _ -> "0.2"
5050
```
5151

52-
![alt text]({{root}}/content/img/assemblyinfo/result.png "The file version is set by FAKE")
52+
![alt text](//content/img/assemblyinfo/result.png "The file version is set by FAKE")
5353

5454
## Storing the `githash` in the `AssemblyInfo` File
5555

@@ -70,18 +70,18 @@ AssemblyInfo.Metadata("githash", commitHash)
7070

7171
One of the easiest ways to retrieve this hash is to load and use a reflector program, like [<ins>ILSpy</ins>](https://github.com/icsharpcode/ILSpy):
7272

73-
![alt text]({{root}}/content/img/assemblyinfo/assemblymetadata.png "Checking the git hash of an assembly")
73+
![alt text](//content/img/assemblyinfo/assemblymetadata.png "Checking the git hash of an assembly")
7474

7575
## Using the `SolutionInfo` Approach
7676

7777
Some companies split their `AssemblyInfo` into a `SolutionInfo.cs` which is shared by all projects and a specific `AssemblyInfo.cs` per
7878
project which contains the product data. All versioning data is generated by the `AssemblyInfo` task into the `SolutionInfo.cs` and the
7979
`AssemblyInfo.cs` files are edited manually. This could look like this:
8080

81-
![alt text]({{root}}/content/img/assemblyinfo/solutioninfo.png "SolutionInfo.cs is shared between projects")
81+
![alt text](//content/img/assemblyinfo/solutioninfo.png "SolutionInfo.cs is shared between projects")
8282

8383
> The above picture and code within is from FAKE v4 (but the concept is very similar with fake 5 and above)
8484
8585
The generated `SolutionInfo.cs` looks like this:
8686

87-
![alt text]({{root}}/content/img/assemblyinfo/generated.png "Generated SolutionInfo.cs")
87+
![alt text](//content/img/assemblyinfo/generated.png "Generated SolutionInfo.cs")

docs/articles/dotnet-nuget.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
If you are using a source control system like [*Git*](http://git-scm.com/) you probably don't want to store all binary dependencies in it.
44
With FAKE you can use [*NuGet*](http://nuget.org/) to download all dependent packages during the build.
55

6-
To see the available NuGet APIs in FAKE, please see the [`API-Reference`]({{root}}reference/fake-dotnet-nuget.html) for the NuGet module.
6+
To see the available NuGet APIs in FAKE, please see the [`API-Reference`](/reference/fake-dotnet-nuget.html) for the NuGet module.
77

88
## Setting the Stage for NuGet
99

docs/articles/dotnet-testing-coverlet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[Coverlet](https://github.com/tonerdo/coverlet) is a cross platform code coverage framework for .NET, with support for line,
44
branch and method coverage. It works with .NET Framework on Windows and .NET Core on all supported platforms.
55

6-
To see the available Coverlet APIs in FAKE, please see the [`API-Reference`]({{root}}reference/fake-dotnet-testing-coverlet.html)
6+
To see the available Coverlet APIs in FAKE, please see the [`API-Reference`](/reference/fake-dotnet-testing-coverlet.html)
77
for the Coverlet module.
88

99
## Minimal working example

docs/articles/dotnet-testing-specflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ and supports the .NET framework, Xamarin and Mono.
88

99
The package `Fake.DotNet.Testing.SpecFlow` is a bridge to the [*SpecFlow*](specflow.exe) CLI.
1010

11-
To see the available SpecFlow APIs in FAKE, please see the [`API-Reference`]({{root}}reference/fake-dotnet-testing-specflow.html)
11+
To see the available SpecFlow APIs in FAKE, please see the [`API-Reference`](/reference/fake-dotnet-testing-specflow.html)
1212
for the SpecFlow module.
1313

1414
## Minimal working example

docs/articles/fake-v6-release-announcement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ and move a step closer to complete the transition that started in FAKE v5. We ha
33
obsolete API's and replaced there usages with alternatives, updated dependencies, polished some
44
API's, and refreshed the website!
55

6-
![FAKE v6 Home Page Hero Section]({{root}}content/img/fakev6-release/fake-v6-hero-section.png)
6+
![FAKE v6 Home Page Hero Section](/content/img/fakev6-release/fake-v6-hero-section.png)
77

88
The above screenshot is from the new FAKE website!
99

docs/articles/installer-squirrel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[*Squirrel.Windows*](https://github.com/Squirrel/Squirrel.Windows) is an installation tool with an auto-update system
44
for Windows desktop apps.
55

6-
To see the available Squirrel APIs in FAKE, please see the [`API-Reference`]({{root}}reference/fake-installer-squirrel.html) for the Squirrel module.
6+
To see the available Squirrel APIs in FAKE, please see the [`API-Reference`](/reference/fake-installer-squirrel.html) for the Squirrel module.
77

88
## `Squirrel.exe` CLI tool
99

0 commit comments

Comments
 (0)