diff --git a/css/default.scss b/css/default.scss index d1f7f5d..4c9a820 100644 --- a/css/default.scss +++ b/css/default.scss @@ -1,15 +1,17 @@ +@import url(/fonts/fonts.css); + $bg-color: #F3F8F1; $primary-color: #D7263D; $secondary-color: #984EA3; html { - font-family: "Iosevka", sans; + font-family: "SpaceGrotesk"; background-color: $bg-color; } a { - color: $primary-color; - text-decoration: none; + color: $primary-color; + text-decoration: none; } a:hover { @@ -163,6 +165,7 @@ img { code { color: white; background-color: #212121; - font-family: monospace; - padding: 0 3px; + font-size: 1rem; + font-family: "PressStart"; + padding: .1rem .3rem .2rem; } diff --git a/site.hs b/site.hs index 8ea3986..173f997 100644 --- a/site.hs +++ b/site.hs @@ -4,7 +4,6 @@ import Data.Monoid (mappend) import Hakyll import Hakyll.Web.Sass (sassCompiler) - -------------------------------------------------------------------------------- config :: Configuration config = @@ -14,11 +13,9 @@ config = main :: IO () main = hakyllWith config $ do - match "images/*" $ do - route idRoute - compile copyFileCompiler - - match "files/*" $ do + -- Static directories + + match ("fonts/*" .||. "images/*" .||. "files/*") $ do route idRoute compile copyFileCompiler @@ -33,7 +30,7 @@ main = hakyllWith config $ do route idRoute compile compressCssCompiler - match "posts/*" $ do + match ("posts/*" .||. "publications/*") $ do route $ setExtension "html" compile $ pandocCompiler @@ -41,14 +38,6 @@ main = hakyllWith config $ do >>= loadAndApplyTemplate "templates/default.html" postCtx >>= relativizeUrls - match "publications/*" $ do - route $ setExtension "html" - compile $ - pandocCompiler - >>= loadAndApplyTemplate "templates/post.html" postCtx - >>= loadAndApplyTemplate "templates/default.html" postCtx - >>= relativizeUrls - match "index.html" $ do route idRoute compile $ do