From 69f3b78beddcd28e1e1f5818351bee4d8140e10e Mon Sep 17 00:00:00 2001 From: JJ Date: Thu, 25 Jul 2024 22:21:21 -0700 Subject: update css and generator --- css/style.css | 17 +++++++++++++---- site.hs | 22 ++++++++++++---------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/css/style.css b/css/style.css index 1e9d011..0508254 100644 --- a/css/style.css +++ b/css/style.css @@ -68,6 +68,19 @@ nav a:hover { font-size: 1.15em; } +ul { + list-style: square; +} + +footer { + text-align: right; + padding-bottom: 1em; +} + +.indent { + text-indent: 1em; +} + #intro { display: flex; flex-direction: row; @@ -86,10 +99,6 @@ nav a:hover { margin-top: 0; } -footer { - text-align: right; -} - @media screen and (max-width: 700px) { header { flex-direction: column; diff --git a/site.hs b/site.hs index a87a46e..f25048b 100644 --- a/site.hs +++ b/site.hs @@ -6,15 +6,17 @@ import Text.Pandoc.Highlighting -- Pass custom options to the Pandoc compiler pandocCompiler :: Compiler (Item String) -pandocCompiler = - let defaultExtensions = writerExtensions defaultHakyllWriterOptions - addedExtensions = extensionsFromList [Ext_lists_without_preceding_blankline] - removedExtensions = extensionsFromList [Ext_blank_before_header, Ext_blank_before_blockquote] - writerOptions = defaultHakyllWriterOptions { - writerExtensions = disableExtensions (defaultExtensions <> pandocExtensions <> addedExtensions) removedExtensions, - writerHTMLMathMethod = MathML - } - in pandocCompilerWith defaultHakyllReaderOptions writerOptions +pandocCompiler = pandocCompilerWith readerOptions writerOptions where + writerOptions = defaultHakyllWriterOptions { + writerExtensions = writerExtensions defaultHakyllWriterOptions + <> pandocExtensions, + writerHTMLMathMethod = MathML + } + readerOptions = defaultHakyllReaderOptions { + readerExtensions = readerExtensions defaultHakyllReaderOptions + <> pandocExtensions + <> extensionsFromList [Ext_lists_without_preceding_blankline] + } -- Loads the template specified in a post's metadata, if it exists loadLayoutTemplate :: Context String -> Item String -> Compiler (Item String) @@ -50,7 +52,7 @@ main = hakyll $ do >>= loadLayoutTemplate defaultContext >>= relativizeUrls - -- Additionally copy non-HTML files verbatium + -- Additionally copy non-HTML files raw, without front matter match ("**.md" .||. "**.rst" .||. "**.org" .||. "**.adoc") $ version "raw" $ do route idRoute compile getResourceBody -- cgit v1.2.3-70-g09d2