Merge pull request #851 from fsprojects/firefox-font

Get weights for roboto mono
fsprojects · Oct 10, 2023 · ecb45a0 · ecb45a0
2 parents 27cb3f2 + 53803d9
commit ecb45a0
Show file tree

Hide file tree

Showing 29 changed files with 11 additions and 2,871 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
   <ItemGroup>

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+## 19.1.1
+
+* Fix code rendering on firefox. [#851](https://github.com/fsprojects/FSharp.Formatting/pull/851)
+
 ## 19.1.0
 
 * Only reload css file when changed. [#845](https://github.com/fsprojects/FSharp.Formatting/pull/845)

diff --git a/build.fsx b/build.fsx
@@ -77,7 +77,7 @@ pipeline "CI" {
         run $"dotnet build {solutionFile} --configuration {configuration}"
     }
 
-    stage "NuGet" { run $"dotnet pack {solutionFile} --output {artifactsDir} --configuration {configuration}" }
+    stage "NuGet" { run $"dotnet pack {solutionFile} --output \"{artifactsDir}\" --configuration {configuration}" }
 
     stage "Tests" {
         run
@@ -91,10 +91,10 @@ pipeline "CI" {
         // Τhe tool has been uninstalled when the
         // artifacts folder was removed in the Clean stage.
         run
-            $"dotnet tool install --no-cache --version %s{release.NugetVersion} --add-source %s{artifactsDir} --tool-path %s{artifactsDir} fsdocs-tool"
+            $"dotnet tool install --no-cache --version %s{release.NugetVersion} --add-source \"%s{artifactsDir}\" --tool-path \"%s{artifactsDir}\" fsdocs-tool"
 
-        run $"{fsdocTool} build --strict --clean --properties Configuration=Release"
-        run $"dotnet tool uninstall fsdocs-tool --tool-path %s{artifactsDir}"
+        run $"\"{fsdocTool}\" build --strict --clean --properties Configuration=Release"
+        run $"dotnet tool uninstall fsdocs-tool --tool-path \"%s{artifactsDir}\""
         run (fun _ -> Shell.cleanDir ".packages")
     }
 

diff --git a/docs/content/fsdocs-default.css b/docs/content/fsdocs-default.css
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Hind+Vadodara&family=Roboto+Mono&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Hind+Vadodara&family=Roboto+Mono:wght@400;500;600&display=swap');
 /*--------------------------------------------------------------------------
   Formatting for page & standard document content
 /*--------------------------------------------------------------------------*/

diff --git a/global.json b/global.json
@@ -1,6 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.400",
-    "rollForward": "minor"
+    "version": "7.0.400"
   }
 }
diff --git a/src/FSharp.Formatting.ApiDocs/packages.lock.json b/src/FSharp.Formatting.ApiDocs/packages.lock.json
diff --git a/src/FSharp.Formatting.CSharpFormat/packages.lock.json b/src/FSharp.Formatting.CSharpFormat/packages.lock.json
diff --git a/src/FSharp.Formatting.CodeFormat/packages.lock.json b/src/FSharp.Formatting.CodeFormat/packages.lock.json
diff --git a/src/FSharp.Formatting.Common/packages.lock.json b/src/FSharp.Formatting.Common/packages.lock.json