From 13d29804ba4bb8d578fb0278ddeb6e187bbafa6f Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 1 Feb 2020 14:37:28 +0100 Subject: Add return link --- design/Main.hs | 2 +- src/Main.hs | 4 ++-- templates/index.html | 15 +++++++++++++++ templates/main.html | 15 --------------- templates/recipe.html | 16 ++++++++++++++++ 5 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 templates/index.html delete mode 100644 templates/main.html create mode 100644 templates/recipe.html diff --git a/design/Main.hs b/design/Main.hs index 0af225d..b057cb4 100644 --- a/design/Main.hs +++ b/design/Main.hs @@ -19,7 +19,7 @@ main = putCss $ do mobile $ fontSize (px 14) desktop $ fontSize (px 18) - "a.header" ? do + ".header" ? do display block sym2 padding (px 15) (px 0) sym2 margin (px 0) auto diff --git a/src/Main.hs b/src/Main.hs index 72a4de8..50a562d 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -30,7 +30,7 @@ main = hakyllWith configuration $ do match "recettes/**" $ do route $ setExtension "html" compile $ pandocCompiler - >>= loadAndApplyTemplate "templates/main.html" defaultContext + >>= loadAndApplyTemplate "templates/recipe.html" defaultContext >>= relativizeUrls match "index.html" $ do @@ -44,7 +44,7 @@ main = hakyllWith configuration $ do compile $ getResourceBody >>= applyAsTemplate context - >>= loadAndApplyTemplate "templates/main.html" context + >>= loadAndApplyTemplate "templates/index.html" context >>= relativizeUrls match "templates/*" $ compile templateBodyCompiler diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..e6faafd --- /dev/null +++ b/templates/index.html @@ -0,0 +1,15 @@ + + + + + + $title$ + + + + +
$title$
+
$body$
+ + + diff --git a/templates/main.html b/templates/main.html deleted file mode 100644 index 5957668..0000000 --- a/templates/main.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - $title$ - - - - - $title$ -
$body$
- - - diff --git a/templates/recipe.html b/templates/recipe.html new file mode 100644 index 0000000..6585f33 --- /dev/null +++ b/templates/recipe.html @@ -0,0 +1,16 @@ + + + + + + $title$ + + + + +
$title$
+ тна Retour +
$body$
+ + + -- cgit v1.2.3