diff --git a/site/css/default.css b/site/css/default.css index 7f00512..0b7baf5 100644 --- a/site/css/default.css +++ b/site/css/default.css @@ -1,19 +1,29 @@ body { - color: white; - background-color: black; - background-image: linear-gradient(to bottom, rgba(0,0,0,0.9) 0%,rgba(0,0,0,0.9) 100%), url(/images/Chaoszone.svg); + color: black; + font-family: 'Sans'; + font-size: 20px; + font-weight: normal; + font-style: normal; + padding: 0 2rem 0; + display: flex; + min-height: 100vh; + flex-direction: column; +} + +body::before { + z-index: -1; + content: ' '; + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + background-color: #800000; + background-image: linear-gradient(to bottom, rgba(128,0,0,0.9) 0%,rgba(128,0,0,0.9) 100%), url(/images/Chaoszone.black.svg); background-size: contain; background-attachment:fixed; background-repeat:no-repeat; background-position: center; - font-family: 'MontserratLight'; - font-size: 20px; - font-weight: normal; - font-style: normal; - margin: 0 2rem 0; - display: flex; - min-height: 100vh; - flex-direction: column; } header { @@ -22,7 +32,7 @@ header { padding: 12px 0px 12px 0px; font-family: 'MontserratBlack'; font-size: 30px; - margin-left: 15rem; + margin-left: 25rem; } h1, h2, h3, h4, h5 { @@ -40,7 +50,7 @@ a:hover { } #logo, #logo img { - max-width: 13rem; + max-width: 23rem; } #logo { @@ -84,12 +94,15 @@ nav li a:first-child { } article { - padding-left: 15rem; + margin-left: 25rem; +} + +article img { + max-width: 100%; } footer { border-top: solid 2px white; - color: #555; font-size: 12px; margin-top: 30px; padding: 12px 0px 12px 0px; diff --git a/site/images/Chaoszone.black.svg b/site/images/Chaoszone.black.svg new file mode 100644 index 0000000..df172da --- /dev/null +++ b/site/images/Chaoszone.black.svg @@ -0,0 +1,35 @@ + + + + + + + image/svg+xml + + + + + + + + + diff --git a/site/images/Chaoszone_crest.36c3.svg b/site/images/Chaoszone_crest.36c3.svg new file mode 100644 index 0000000..b16b261 Binary files /dev/null and b/site/images/Chaoszone_crest.36c3.svg differ diff --git a/site/images/FAHRPLAN.svg b/site/images/FAHRPLAN.svg new file mode 100644 index 0000000..3aee631 --- /dev/null +++ b/site/images/FAHRPLAN.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Main.hs b/src/Main.hs index d6d6ecc..78869c9 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -56,18 +56,29 @@ main = do defaultCtx >>= relativizeUrls - match "site/index.md" $ do - route $ myRoute `composeRoutes` setExtension "html" + create ["index.html"] $ do + route idRoute compile $ do - posts <- fmap (take 5) . recentFirst =<< loadAll "site/posts/*" - let indexCtx = listField "posts" postCtx (return posts) <> - constField "title" "Home" <> + post <- fmap head . recentFirst =<< (loadAll "site/posts/*" + :: Compiler [Item String]) + let indexCtx = + constField "date" "%B %e, %Y" <> defaultCtx - getResourceBody - >>= applyAsTemplate indexCtx - >>= renderPandoc - >>= loadAndApplyTemplate "templates/default.html" defaultCtx - >>= relativizeUrls + makeItem (itemBody post) + >>= relativizeUrls + + -- match "site/index.md" $ do + -- route $ myRoute `composeRoutes` setExtension "html" + -- compile $ do + -- posts <- fmap (take 5) . recentFirst =<< loadAll "site/posts/*" + -- let indexCtx = listField "posts" postCtx (return posts) <> + -- constField "title" "Home" <> + -- defaultCtx + -- getResourceBody + -- >>= applyAsTemplate indexCtx + -- >>= renderPandoc + -- >>= loadAndApplyTemplate "templates/default.html" defaultCtx + -- >>= relativizeUrls create ["archive.html"] $ do route idRoute diff --git a/templates/archive.html b/templates/archive.html index 625725e..8829ad4 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -1,3 +1,3 @@ -Here you can find all my previous posts: +Here you can find all previous posts: $partial("templates/post-list.html")$ diff --git a/templates/default.html b/templates/default.html index 736e85b..a1e0c34 100644 --- a/templates/default.html +++ b/templates/default.html @@ -15,7 +15,7 @@