Merge pull request #861 from fsprojects/modern-theme

Modern theme
fsprojects · Nov 21, 2023 · dca47e4 · dca47e4
2 parents 7707ea0 + 3487b2f
commit dca47e4
Show file tree

Hide file tree

Showing 48 changed files with 2,480 additions and 1,785 deletions.
diff --git a/.github/workflows/modern-theme.yml b/.github/workflows/modern-theme.yml
@@ -1,4 +1,4 @@
-name: Modern theme
+name: Build and Test and Publish (main)
 
 on: workflow_dispatch
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,8 +25,14 @@
     <PackageTags>F# fsharp formatting markdown code fssnip literate programming</PackageTags>
     <RepositoryUrl>https://github.com/fsprojects/FSharp.Formatting</RepositoryUrl>
     <PackageProjectUrl>https://fsprojects.github.io/FSharp.Formatting</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/fsprojects/FSharp.Formatting/master/docs/files/img/logo.png</PackageIconUrl>
+    <PackageIcon>logo.png</PackageIcon>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
+    <ChangelogFile>../../RELEASE_NOTES.md</ChangelogFile>
   </PropertyGroup>
+
+    <ItemGroup Condition="'$(IsPackable)' == 'true'">
+        <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\"/>
+        <PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
+    </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -24,5 +24,6 @@
     <PackageVersion Include="FSharp.Data" Version="6.3.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8"  />
   </ItemGroup>
 </Project>
diff --git a/FSharp.Formatting.sln b/FSharp.Formatting.sln
@@ -123,12 +123,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "leftside", "leftside", "{18
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{FAD5C374-4748-4A3D-A435-FFA425916F3A}"
 	ProjectSection(SolutionItems) = preProject
-		docs\content\fsdocs-custom.css = docs\content\fsdocs-custom.css
 		docs\content\fsdocs-default.css = docs\content\fsdocs-default.css
 		docs\content\fsdocs-search.js = docs\content\fsdocs-search.js
 		docs\content\fsdocs-tips.js = docs\content\fsdocs-tips.js
-		docs\content\navbar-fixed-left.css = docs\content\navbar-fixed-left.css
-		docs\content\navbar-fixed-right.css = docs\content\navbar-fixed-right.css
+		docs\content\fsdocs-theme-toggle.js = docs\content\fsdocs-theme-toggle.js
 	EndProjectSection
 EndProject
 Global