diff --git a/images/Git-Icon-Black.png b/images/Git-Icon-Black.png new file mode 100644 index 0000000..aeba612 Binary files /dev/null and b/images/Git-Icon-Black.png differ diff --git a/images/Git-Icon-Black_orig.png b/images/Git-Icon-Black_orig.png new file mode 100644 index 0000000..c190e85 Binary files /dev/null and b/images/Git-Icon-Black_orig.png differ diff --git a/images/git_16.png b/images/git_16.png new file mode 100644 index 0000000..bad65b5 Binary files /dev/null and b/images/git_16.png differ diff --git a/images/git_32.png b/images/git_32.png new file mode 100644 index 0000000..aeba612 Binary files /dev/null and b/images/git_32.png differ diff --git a/images/profile_grayscale.jpg b/images/profile_grayscale.jpg new file mode 100644 index 0000000..b0a8ae6 Binary files /dev/null and b/images/profile_grayscale.jpg differ diff --git a/index.html b/index.html deleted file mode 100644 index 6da8c26..0000000 --- a/index.html +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Home ---- - -

Welcome

- -

Not much here yet. See the top bar

diff --git a/about.markdown b/index.markdown similarity index 98% rename from about.markdown rename to index.markdown index bdf38ac..4e48819 100644 --- a/about.markdown +++ b/index.markdown @@ -1,5 +1,5 @@ --- -title: About +title: Mats Rauhala --- ![](./images/profile.jpg) diff --git a/site.hs b/site.hs index dcf230c..58ed8a8 100644 --- a/site.hs +++ b/site.hs @@ -25,7 +25,7 @@ main = hakyll $ do route idRoute compile compressCssCompiler - match (fromList ["about.markdown", "contact.markdown"]) $ do + match (fromList ["index.markdown", "contact.markdown"]) $ do route $ setExtension "html" compile $ pandocCompiler >>= loadAndApplyTemplate "templates/default.html" defaultContext @@ -59,17 +59,6 @@ main = hakyll $ do >>= loadAndApplyTemplate "templates/default.html" archiveCtx >>= relativizeUrls - match "index.html" $ do - route idRoute - compile $ do - let indexCtx = - constField "title" "Home" `mappend` - defaultContext - - getResourceBody - >>= applyAsTemplate indexCtx - >>= loadAndApplyTemplate "templates/default.html" indexCtx - >>= relativizeUrls match "templates/*" $ compile templateBodyCompiler diff --git a/templates/default.html b/templates/default.html index 61f904f..cfc259c 100644 --- a/templates/default.html +++ b/templates/default.html @@ -14,9 +14,10 @@ rauhala.info