Merge branch 'develop'

dustinmoris · Jun 29, 2020 · eb34dd7 · eb34dd7
2 parents f053514 + 2ffdeb6
commit eb34dd7
Show file tree

Hide file tree

Showing 6 changed files with 581 additions and 29 deletions.
diff --git a/...stedCodes/BlogPosts/2020_06_29-github-actions-for-dotnet-core-nuget-packages.md b/...stedCodes/BlogPosts/2020_06_29-github-actions-for-dotnet-core-nuget-packages.md
diff --git a/src/DustedCodes/CSS/dark.css b/src/DustedCodes/CSS/dark.css
@@ -1,14 +1,15 @@
 @media (prefers-color-scheme: dark) {
     :root {
+        --bg-color: #2c2f2f;
+        --bg-color-dark: #2c2f2f;
         --table-odd-bg-color: #3f3f3f;
-        --table-even-bg-color: #282a2a;
+        --table-even-bg-color: #2f3131;
         --thin-border-color: rgba(255, 255, 255, 0.1);
         --thiner-border-color: rgba(200, 200, 200, 0.1);
         --label-fg-color: rgba(255, 255, 255, 0.5);
     }
 
     body {
-        background: #282a2a;
         color: #ddd;
     }
 
@@ -115,7 +116,7 @@
     .bmc-button {
         padding: .9em .7em;
         border: 2px solid rgb(243, 213, 7);
-        background: #282a2a;
+        background: var(--bg-color);
         color: rgb(243, 213, 7);
     }
 

diff --git a/src/DustedCodes/CSS/site.css b/src/DustedCodes/CSS/site.css
@@ -4,6 +4,7 @@
 
 :root {
     --bg-color: #fff;
+    --bg-color-dark: #fff;
     --fg-color: #444;
 
     --link-fg-color: #f1f1f1;
@@ -374,8 +375,13 @@ iframe.youTubeVideo {
   Master page
 -------------------------- */
 
+body > header,
+body > nav {
+    background-color: var(--bg-color-dark);
+}
+
 body > main,
-body > nav,
+#inner-nav ,
 #inner-header,
 #inner-footer {
     margin: 1em auto;
@@ -653,7 +659,8 @@ body > header h2 {
 
 .bmc-button span {
     margin: 0 1em 0 .5em;
-    font-family: cursive;
+    font-family: 'Martel', serif;
+    font-style: italic;
     font-size: 1.8em;
     font-weight: 600;
     letter-spacing: 0.6px;

diff --git a/src/DustedCodes/Core.fs b/src/DustedCodes/Core.fs
@@ -51,14 +51,31 @@ module Url =
 // About
 // ---------------------------------
 
+[<RequireQualifiedAccess>]
+module MarkDog =
+    open Markdig
+    open Markdig.Extensions.AutoIdentifiers
+
+    let private bone =
+        MarkdownPipelineBuilder()
+            .UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
+            .Build()
+
+    let toHtml (value : string) =
+        Markdown.ToHtml(value, bone)
+
+// ---------------------------------
+// About
+// ---------------------------------
+
 [<RequireQualifiedAccess>]
 module About =
     open System.IO
 
     let content =
         Path.Combine(Env.contentDir, "About.md")
         |> File.ReadAllText
-        |> Markdig.Markdown.ToHtml
+        |> MarkDog.toHtml
 
 // ---------------------------------
 // Hire
@@ -71,7 +88,7 @@ module Hire =
     let content =
         Path.Combine(Env.contentDir, "Hire.md")
         |> File.ReadAllText
-        |> Markdig.Markdown.ToHtml
+        |> MarkDog.toHtml
 
 // ---------------------------------
 // Google Analytics
@@ -145,7 +162,6 @@ module BlogPosts =
     open System.Text
     open System.Net
     open System.Globalization
-    open Markdig
 
     type ContentType =
         | Html
@@ -253,7 +269,7 @@ module BlogPosts =
             let htmlContent =
                 match blogPost.ContentType with
                 | Html     -> content
-                | Markdown -> Markdown.ToHtml content
+                | Markdown -> MarkDog.toHtml content
             Ok { blogPost with Content = content; HtmlContent = htmlContent }
 
     let private formatError (blogPostPath : string) (result : Result<Article, string>) =

diff --git a/src/DustedCodes/DustedCodes.fsproj b/src/DustedCodes/DustedCodes.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>2.36.0</Version>
+    <Version>2.37.0</Version>
     <AssemblyName>DustedCodes</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>

diff --git a/src/DustedCodes/Views.fs b/src/DustedCodes/Views.fs
@@ -173,25 +173,27 @@ module Views =
                 ]
                 main [] bodyContent
                 nav [] [
-                    ul [ _id "social-links" ] [
-                        li [] [ iconLink "https://www.facebook.com/dustinmoris.gorski" "Connect on Facebook" Icons.facebook ]
-                        li [] [ iconLink "https://twitter.com/dustinmoris" "Follow on Twitter" Icons.twitter ]
-                        li [] [ iconLink "https://www.linkedin.com/in/dustinmoris/" "Connect on LinkedIn" Icons.linkedIn ]
-                        li [] [ iconLink "https://www.instagram.com/dustedtravels/" "Follow on Instagram" Icons.instagram ]
-                        li [] [ iconLink "https://www.youtube.com/channel/UCtoObQtHY0TjIXwz9Ipmq7g" "Follow on YouTube" Icons.youTube ]
-                        li [] [ iconLink "https://github.com/dustinmoris" "Browse GitHub repositories" Icons.github ]
-                        li [] [ iconLink "https://hub.docker.com/u/dustinmoris" "Browse Docker images" Icons.docker ]
-                        li [] [ iconLink "https://stackoverflow.com/users/1693158/dustinmoris" "View StackOverflow profile" Icons.stackOverflow ]
-                        li [] [ iconLink "https://www.buymeacoffee.com/dustinmoris" "Buy me a coffee" Icons.buyMeACoffee ]
-                        li [] [ iconLink "https://www.paypal.me/dustinmoris" "Pay me via PayPal" Icons.payPal ]
-                        li [] [ iconLink Url.``/feed/rss`` "Subscribe to feed" Icons.rssFeed ]
-                    ]
-                    ul [ _id "nav-links" ] [
-                        li [] [ normalLink Url.``/`` "Home" ]
-                        li [] [ normalLink Url.``/trending`` "Trending" ]
-                        li [] [ normalLink Url.``/about`` "About"]
-                        li [] [ normalLink Url.``/hire`` "Hire" ]
-                        li [] [ normalLink Url.``/hire#contact`` "Contact" ]
+                    div [ _id "inner-nav" ] [
+                        ul [ _id "social-links" ] [
+                            li [] [ iconLink "https://www.facebook.com/dustinmoris.gorski" "Connect on Facebook" Icons.facebook ]
+                            li [] [ iconLink "https://twitter.com/dustinmoris" "Follow on Twitter" Icons.twitter ]
+                            li [] [ iconLink "https://www.linkedin.com/in/dustinmoris/" "Connect on LinkedIn" Icons.linkedIn ]
+                            li [] [ iconLink "https://www.instagram.com/dustedtravels/" "Follow on Instagram" Icons.instagram ]
+                            li [] [ iconLink "https://www.youtube.com/channel/UCtoObQtHY0TjIXwz9Ipmq7g" "Follow on YouTube" Icons.youTube ]
+                            li [] [ iconLink "https://github.com/dustinmoris" "Browse GitHub repositories" Icons.github ]
+                            li [] [ iconLink "https://hub.docker.com/u/dustinmoris" "Browse Docker images" Icons.docker ]
+                            li [] [ iconLink "https://stackoverflow.com/users/1693158/dustinmoris" "View StackOverflow profile" Icons.stackOverflow ]
+                            li [] [ iconLink "https://www.buymeacoffee.com/dustinmoris" "Buy me a coffee" Icons.buyMeACoffee ]
+                            li [] [ iconLink "https://www.paypal.me/dustinmoris" "Pay me via PayPal" Icons.payPal ]
+                            li [] [ iconLink Url.``/feed/rss`` "Subscribe to feed" Icons.rssFeed ]
+                        ]
+                        ul [ _id "nav-links" ] [
+                            li [] [ normalLink Url.``/`` "Home" ]
+                            li [] [ normalLink Url.``/trending`` "Trending" ]
+                            li [] [ normalLink Url.``/about`` "About"]
+                            li [] [ normalLink Url.``/hire`` "Hire" ]
+                            li [] [ normalLink Url.``/hire#contact`` "Contact" ]
+                        ]
                     ]
                 ]
                 footer [] [