diff --git a/app/site.hs b/app/site.hs
index 799232520dbdeefeefd21e7b78d646e6ffdcdadb..c59ca372b1154b38404c6a4f04e6d59adeced028 100644
--- a/app/site.hs
+++ b/app/site.hs
@@ -78,11 +78,11 @@ main = hakyllServeWith serveConf $ do
writerOptions
mapM_ matchAndCopyDirectory
- ["images/*", "images/posts/*", "images/tumblr/*"]
+ ["content/images/*", "content/images/posts/*", "content/images/tumblr/*"]
mapM_ matchAndCopy
- [ ("favicon.ico", "ico")
- , ("keybase.txt", "txt")
- , ("robots.txt", "txt")
+ [ ("content/favicon.ico", "ico")
+ , ("content/keybase.txt", "txt")
+ , ("content/robots.txt", "txt")
]
match "third_party/font-awesome/fonts/*" $ do
route $ gsubRoute "third_party/font-awesome/" (const "")
@@ -98,21 +98,21 @@ main = hakyllServeWith serveConf $ do
]
}
- create ["404.html"] $ do
- route $ setExtension "html"
+ create ["content/404.html"] $ do
+ route $ dropContentPrefix `composeRoutes` setExtension "html"
compile $ pandocHtml5Compiler
>>= loadAndApplyTemplate "templates/default.html" siteCtx
>>= relativizeUrls
>>= deIndexUrls
- create ["about.html"] $ do
- route $ indexify `composeRoutes` setExtension "html"
+ create ["content/about.html"] $ do
+ route $ dropContentPrefix `composeRoutes` indexify `composeRoutes` setExtension "html"
compile $ pandocHtml5Compiler
>>= loadAndApplyTemplate "templates/default.html" siteCtx
>>= relativizeUrls
>>= deIndexUrls
- matchMetadata "posts/*" (HM.member "legacy") $ version "legacy" $ do
+ matchMetadata "content/posts/*" (HM.member "legacy") $ version "legacy" $ do
route $ legacyRoute `composeRoutes` setExtension "html"
compile $ do
color <- unsafeCompiler pickColor
@@ -130,12 +130,12 @@ main = hakyllServeWith serveConf $ do
>>= relativizeUrls
>>= deIndexUrls
- match "posts/*" . version "markdown" $ do
- route idRoute
+ match "content/posts/*" . version "markdown" $ do
+ route dropContentPrefix
compile copyFileCompiler
- match "posts/*" $ do
- route $ directorizeDate "/index" `composeRoutes` setExtension "html"
+ match "content/posts/*" $ do
+ route $ dropContentPrefix `composeRoutes` directorizeDate "/index" `composeRoutes` setExtension "html"
compile $ do
color <- unsafeCompiler pickColor
identifier <- getUnderlying
@@ -167,8 +167,8 @@ main = hakyllServeWith serveConf $ do
>>= relativizeUrls
>>= deIndexUrls
- match "projects/*" $ do
- route $ indexify `composeRoutes` setExtension "html"
+ match "content/projects/*" $ do
+ route $ dropContentPrefix `composeRoutes` indexify `composeRoutes` setExtension "html"
compile $ do
compiled <- pandocHtml5Compiler
full <- loadAndApplyTemplate
@@ -185,10 +185,10 @@ main = hakyllServeWith serveConf $ do
>>= relativizeUrls
>>= deIndexUrls
- create ["archive.html"] $ do
- route indexify
+ create ["content/archive.html"] $ do
+ route $ dropContentPrefix `composeRoutes` indexify
compile $ do
- posts <- recentFirst =<< loadAll ("posts/*" .&&. hasNoVersion)
+ posts <- recentFirst =<< loadAll ("content/posts/*" .&&. hasNoVersion)
let archiveCtx
= listField "posts" postCtx (return posts)
@@ -201,10 +201,10 @@ main = hakyllServeWith serveConf $ do
>>= relativizeUrls
>>= deIndexUrls
- create ["projects.html"] $ do
- route indexify
+ create ["content/projects.html"] $ do
+ route $ dropContentPrefix `composeRoutes` indexify
compile $ do
- projects <- loadAllSnapshots "projects/*" "teaser"
+ projects <- loadAllSnapshots "content/projects/*" "teaser"
let archiveCtx
= listField "posts" siteCtx (return projects)
@@ -217,10 +217,10 @@ main = hakyllServeWith serveConf $ do
>>= relativizeUrls
>>= deIndexUrls
- pag <- buildPaginateWith grouper ("posts/*" .&&. hasNoVersion) makeId
+ pag <- buildPaginateWith grouper ("content/posts/*" .&&. hasNoVersion) makeId
- match "index.html" $ do
- route idRoute
+ match "content/index.html" $ do
+ route dropContentPrefix
compile $ do
tpl <- loadBody "templates/post-item-full.html"
body <- readTemplate . itemBody <$> getResourceBody
@@ -228,7 +228,7 @@ main = hakyllServeWith serveConf $ do
let paginateCtx = paginateContext pag 1
let ctx = paginateCtx <> indexCtx
- loadAllSnapshots ("posts/*" .&&. hasNoVersion) "content"
+ loadAllSnapshots ("content/posts/*" .&&. hasNoVersion) "content"
>>= fmap (take 3) . recentFirst
>>= applyTemplateList tpl ctx
>>= makeItem
@@ -265,7 +265,7 @@ main = hakyllServeWith serveConf $ do
let context = postCtx <> bodyField "description"
posts <- fmap (take 10) . recentFirst
- =<< loadAllSnapshots ("posts/*" .&&. hasNoVersion) "content-body"
+ =<< loadAllSnapshots ("content/posts/*" .&&. hasNoVersion) "content-body"
renderRss feedConf context posts
-- CONTEXTS -------------------------------------------------------------------
@@ -313,16 +313,19 @@ legacyRoute = metadataRoute $ \x -> constRoute . T.unpack . mconcat $
, "/index.html"
]
+dropContentPrefix :: Routes
+dropContentPrefix = gsubRoute "content/" (const "")
+
-- RULE HELPERS ---------------------------------------------------------------
matchAndCopyDirectory :: Pattern -> Rules ()
matchAndCopyDirectory dir = match dir $ do
- route idRoute
+ route dropContentPrefix
compile copyFileCompiler
matchAndCopy :: (Pattern, String) -> Rules ()
matchAndCopy (path, extension) = match path $ do
- route $ setExtension extension
+ route $ dropContentPrefix `composeRoutes` setExtension extension
compile copyFileCompiler
-- IDENTIFIER HELPERS ---------------------------------------------------------
diff --git a/404.html b/content/404.html
similarity index 100%
rename from 404.html
rename to content/404.html
diff --git a/about.html b/content/about.html
similarity index 100%
rename from about.html
rename to content/about.html
diff --git a/favicon.ico b/content/favicon.ico
similarity index 100%
rename from favicon.ico
rename to content/favicon.ico
diff --git a/images/avatar.jpeg b/content/images/avatar.jpeg
similarity index 100%
rename from images/avatar.jpeg
rename to content/images/avatar.jpeg
diff --git a/images/doge.png b/content/images/doge.png
similarity index 100%
rename from images/doge.png
rename to content/images/doge.png
diff --git a/images/ensure-banner.png b/content/images/ensure-banner.png
similarity index 100%
rename from images/ensure-banner.png
rename to content/images/ensure-banner.png
diff --git a/images/header_logo_float.png b/content/images/header_logo_float.png
similarity index 100%
rename from images/header_logo_float.png
rename to content/images/header_logo_float.png
diff --git a/images/markdown-mark.svg b/content/images/markdown-mark.svg
similarity index 100%
rename from images/markdown-mark.svg
rename to content/images/markdown-mark.svg
diff --git a/images/posts/2017-redesign.jpg b/content/images/posts/2017-redesign.jpg
similarity index 100%
rename from images/posts/2017-redesign.jpg
rename to content/images/posts/2017-redesign.jpg
diff --git a/images/posts/POODLE.png b/content/images/posts/POODLE.png
similarity index 100%
rename from images/posts/POODLE.png
rename to content/images/posts/POODLE.png
diff --git a/images/posts/ensure-logo.png b/content/images/posts/ensure-logo.png
similarity index 100%
rename from images/posts/ensure-logo.png
rename to content/images/posts/ensure-logo.png
diff --git a/images/posts/foundation-checkbox.png b/content/images/posts/foundation-checkbox.png
similarity index 100%
rename from images/posts/foundation-checkbox.png
rename to content/images/posts/foundation-checkbox.png
diff --git a/images/posts/gentoo-partitions.svg b/content/images/posts/gentoo-partitions.svg
similarity index 100%
rename from images/posts/gentoo-partitions.svg
rename to content/images/posts/gentoo-partitions.svg
diff --git a/images/posts/gentoo-screenfetch.png b/content/images/posts/gentoo-screenfetch.png
similarity index 100%
rename from images/posts/gentoo-screenfetch.png
rename to content/images/posts/gentoo-screenfetch.png
diff --git a/images/posts/haddocks.png b/content/images/posts/haddocks.png
similarity index 100%
rename from images/posts/haddocks.png
rename to content/images/posts/haddocks.png
diff --git a/images/posts/haskell-containers.png b/content/images/posts/haskell-containers.png
similarity index 100%
rename from images/posts/haskell-containers.png
rename to content/images/posts/haskell-containers.png
diff --git a/images/posts/hypercube.png b/content/images/posts/hypercube.png
similarity index 100%
rename from images/posts/hypercube.png
rename to content/images/posts/hypercube.png
diff --git a/images/posts/legit-logo.png b/content/images/posts/legit-logo.png
similarity index 100%
rename from images/posts/legit-logo.png
rename to content/images/posts/legit-logo.png
diff --git a/images/posts/networkmanager-vpn.png b/content/images/posts/networkmanager-vpn.png
similarity index 100%
rename from images/posts/networkmanager-vpn.png
rename to content/images/posts/networkmanager-vpn.png
diff --git a/images/posts/phabulous3.png b/content/images/posts/phabulous3.png
similarity index 100%
rename from images/posts/phabulous3.png
rename to content/images/posts/phabulous3.png
diff --git a/images/posts/snake2.png b/content/images/posts/snake2.png
similarity index 100%
rename from images/posts/snake2.png
rename to content/images/posts/snake2.png
diff --git a/images/posts/snake3.png b/content/images/posts/snake3.png
similarity index 100%
rename from images/posts/snake3.png
rename to content/images/posts/snake3.png
diff --git a/images/posts/xhprof.png b/content/images/posts/xhprof.png
similarity index 100%
rename from images/posts/xhprof.png
rename to content/images/posts/xhprof.png
diff --git a/images/schwarzwald/2014-05-01_00001.jpg b/content/images/schwarzwald/2014-05-01_00001.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00001.jpg
rename to content/images/schwarzwald/2014-05-01_00001.jpg
diff --git a/images/schwarzwald/2014-05-01_00002.jpg b/content/images/schwarzwald/2014-05-01_00002.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00002.jpg
rename to content/images/schwarzwald/2014-05-01_00002.jpg
diff --git a/images/schwarzwald/2014-05-01_00003.jpg b/content/images/schwarzwald/2014-05-01_00003.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00003.jpg
rename to content/images/schwarzwald/2014-05-01_00003.jpg
diff --git a/images/schwarzwald/2014-05-01_00004.jpg b/content/images/schwarzwald/2014-05-01_00004.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00004.jpg
rename to content/images/schwarzwald/2014-05-01_00004.jpg
diff --git a/images/schwarzwald/2014-05-01_00005.jpg b/content/images/schwarzwald/2014-05-01_00005.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00005.jpg
rename to content/images/schwarzwald/2014-05-01_00005.jpg
diff --git a/images/schwarzwald/2014-05-01_00006.jpg b/content/images/schwarzwald/2014-05-01_00006.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00006.jpg
rename to content/images/schwarzwald/2014-05-01_00006.jpg
diff --git a/images/schwarzwald/2014-05-01_00007.jpg b/content/images/schwarzwald/2014-05-01_00007.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00007.jpg
rename to content/images/schwarzwald/2014-05-01_00007.jpg
diff --git a/images/schwarzwald/2014-05-01_00008.jpg b/content/images/schwarzwald/2014-05-01_00008.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00008.jpg
rename to content/images/schwarzwald/2014-05-01_00008.jpg
diff --git a/images/schwarzwald/2014-05-01_00009.jpg b/content/images/schwarzwald/2014-05-01_00009.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00009.jpg
rename to content/images/schwarzwald/2014-05-01_00009.jpg
diff --git a/images/schwarzwald/2014-05-01_00010.jpg b/content/images/schwarzwald/2014-05-01_00010.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00010.jpg
rename to content/images/schwarzwald/2014-05-01_00010.jpg
diff --git a/images/schwarzwald/2014-05-01_00011.jpg b/content/images/schwarzwald/2014-05-01_00011.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00011.jpg
rename to content/images/schwarzwald/2014-05-01_00011.jpg
diff --git a/images/schwarzwald/2014-05-01_00012.jpg b/content/images/schwarzwald/2014-05-01_00012.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00012.jpg
rename to content/images/schwarzwald/2014-05-01_00012.jpg
diff --git a/images/schwarzwald/2014-05-01_00013.jpg b/content/images/schwarzwald/2014-05-01_00013.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00013.jpg
rename to content/images/schwarzwald/2014-05-01_00013.jpg
diff --git a/images/schwarzwald/2014-05-01_00014.jpg b/content/images/schwarzwald/2014-05-01_00014.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00014.jpg
rename to content/images/schwarzwald/2014-05-01_00014.jpg
diff --git a/images/schwarzwald/2014-05-01_00015.jpg b/content/images/schwarzwald/2014-05-01_00015.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00015.jpg
rename to content/images/schwarzwald/2014-05-01_00015.jpg
diff --git a/images/schwarzwald/2014-05-01_00016.jpg b/content/images/schwarzwald/2014-05-01_00016.jpg
similarity index 100%
rename from images/schwarzwald/2014-05-01_00016.jpg
rename to content/images/schwarzwald/2014-05-01_00016.jpg
diff --git a/images/tumblr/background.png b/content/images/tumblr/background.png
similarity index 100%
rename from images/tumblr/background.png
rename to content/images/tumblr/background.png
diff --git a/images/tumblr/colorbar.png b/content/images/tumblr/colorbar.png
similarity index 100%
rename from images/tumblr/colorbar.png
rename to content/images/tumblr/colorbar.png
diff --git a/images/tumblr/logo.png b/content/images/tumblr/logo.png
similarity index 100%
rename from images/tumblr/logo.png
rename to content/images/tumblr/logo.png
diff --git a/images/tumblr/style.css b/content/images/tumblr/style.css
similarity index 100%
rename from images/tumblr/style.css
rename to content/images/tumblr/style.css
diff --git a/index.html b/content/index.html
similarity index 100%
rename from index.html
rename to content/index.html
diff --git a/keybase.txt b/content/keybase.txt
similarity index 100%
rename from keybase.txt
rename to content/keybase.txt
diff --git a/posts/2014-01-11-reboot-to-nodejs.md b/content/posts/2014-01-11-reboot-to-nodejs.md
similarity index 100%
rename from posts/2014-01-11-reboot-to-nodejs.md
rename to content/posts/2014-01-11-reboot-to-nodejs.md
diff --git a/posts/2014-01-20-linux-setup-gnome-3.md b/content/posts/2014-01-20-linux-setup-gnome-3.md
similarity index 100%
rename from posts/2014-01-20-linux-setup-gnome-3.md
rename to content/posts/2014-01-20-linux-setup-gnome-3.md
diff --git a/posts/2014-03-08-php-is-not-dead.md b/content/posts/2014-03-08-php-is-not-dead.md
similarity index 100%
rename from posts/2014-03-08-php-is-not-dead.md
rename to content/posts/2014-03-08-php-is-not-dead.md
diff --git a/posts/2014-06-07-ensurejs.md b/content/posts/2014-06-07-ensurejs.md
similarity index 100%
rename from posts/2014-06-07-ensurejs.md
rename to content/posts/2014-06-07-ensurejs.md
diff --git a/posts/2014-07-23-scss-utility-file.md b/content/posts/2014-07-23-scss-utility-file.md
similarity index 100%
rename from posts/2014-07-23-scss-utility-file.md
rename to content/posts/2014-07-23-scss-utility-file.md
diff --git a/posts/2014-08-12-ensure-04-records.md b/content/posts/2014-08-12-ensure-04-records.md
similarity index 100%
rename from posts/2014-08-12-ensure-04-records.md
rename to content/posts/2014-08-12-ensure-04-records.md
diff --git a/posts/2014-09-18-two-problems-from-ai-class.md b/content/posts/2014-09-18-two-problems-from-ai-class.md
similarity index 100%
rename from posts/2014-09-18-two-problems-from-ai-class.md
rename to content/posts/2014-09-18-two-problems-from-ai-class.md
diff --git a/posts/2014-10-09-some-updates.md b/content/posts/2014-10-09-some-updates.md
similarity index 100%
rename from posts/2014-10-09-some-updates.md
rename to content/posts/2014-10-09-some-updates.md
diff --git a/posts/2014-10-13-laravel-pagination-update.md b/content/posts/2014-10-13-laravel-pagination-update.md
similarity index 100%
rename from posts/2014-10-13-laravel-pagination-update.md
rename to content/posts/2014-10-13-laravel-pagination-update.md
diff --git a/posts/2014-10-17-poodle-nodejs.md b/content/posts/2014-10-17-poodle-nodejs.md
similarity index 100%
rename from posts/2014-10-17-poodle-nodejs.md
rename to content/posts/2014-10-17-poodle-nodejs.md
diff --git a/posts/2014-10-18-foundation-checkboxes.md b/content/posts/2014-10-18-foundation-checkboxes.md
similarity index 100%
rename from posts/2014-10-18-foundation-checkboxes.md
rename to content/posts/2014-10-18-foundation-checkboxes.md
diff --git a/posts/2014-10-27-custom-laravel-logs.md b/content/posts/2014-10-27-custom-laravel-logs.md
similarity index 100%
rename from posts/2014-10-27-custom-laravel-logs.md
rename to content/posts/2014-10-27-custom-laravel-logs.md
diff --git a/posts/2014-11-05-modernphp-slides.md b/content/posts/2014-11-05-modernphp-slides.md
similarity index 100%
rename from posts/2014-11-05-modernphp-slides.md
rename to content/posts/2014-11-05-modernphp-slides.md
diff --git a/posts/2014-11-08-ensurejs-documentation-shields.md b/content/posts/2014-11-08-ensurejs-documentation-shields.md
similarity index 100%
rename from posts/2014-11-08-ensurejs-documentation-shields.md
rename to content/posts/2014-11-08-ensurejs-documentation-shields.md
diff --git a/posts/2014-12-04-minecraft-bot-nodejs.md b/content/posts/2014-12-04-minecraft-bot-nodejs.md
similarity index 100%
rename from posts/2014-12-04-minecraft-bot-nodejs.md
rename to content/posts/2014-12-04-minecraft-bot-nodejs.md
diff --git a/posts/2014-12-09-minecraft-ai-agent.md b/content/posts/2014-12-09-minecraft-ai-agent.md
similarity index 100%
rename from posts/2014-12-09-minecraft-ai-agent.md
rename to content/posts/2014-12-09-minecraft-ai-agent.md
diff --git a/posts/2014-12-14-cleaning-html-input-on-laravel.md b/content/posts/2014-12-14-cleaning-html-input-on-laravel.md
similarity index 100%
rename from posts/2014-12-14-cleaning-html-input-on-laravel.md
rename to content/posts/2014-12-14-cleaning-html-input-on-laravel.md
diff --git a/posts/2014-12-14-react-mousetrap-mixin.md b/content/posts/2014-12-14-react-mousetrap-mixin.md
similarity index 100%
rename from posts/2014-12-14-react-mousetrap-mixin.md
rename to content/posts/2014-12-14-react-mousetrap-mixin.md
diff --git a/posts/2015-01-19-experimenting-with-structures.md b/content/posts/2015-01-19-experimenting-with-structures.md
similarity index 100%
rename from posts/2015-01-19-experimenting-with-structures.md
rename to content/posts/2015-01-19-experimenting-with-structures.md
diff --git a/posts/2015-01-25-facadeless-migrations.md b/content/posts/2015-01-25-facadeless-migrations.md
similarity index 100%
rename from posts/2015-01-25-facadeless-migrations.md
rename to content/posts/2015-01-25-facadeless-migrations.md
diff --git a/posts/2015-02-18-phabricator-bot.md b/content/posts/2015-02-18-phabricator-bot.md
similarity index 100%
rename from posts/2015-02-18-phabricator-bot.md
rename to content/posts/2015-02-18-phabricator-bot.md
diff --git a/posts/2015-05-10-heapster-deis.md b/content/posts/2015-05-10-heapster-deis.md
similarity index 100%
rename from posts/2015-05-10-heapster-deis.md
rename to content/posts/2015-05-10-heapster-deis.md
diff --git a/posts/2015-08-23-going-static.markdown b/content/posts/2015-08-23-going-static.markdown
similarity index 100%
rename from posts/2015-08-23-going-static.markdown
rename to content/posts/2015-08-23-going-static.markdown
diff --git a/posts/2015-12-28-fedora-23-on-mbp.md b/content/posts/2015-12-28-fedora-23-on-mbp.md
similarity index 100%
rename from posts/2015-12-28-fedora-23-on-mbp.md
rename to content/posts/2015-12-28-fedora-23-on-mbp.md
diff --git a/posts/2016-02-10-laravel-xhprof.md b/content/posts/2016-02-10-laravel-xhprof.md
similarity index 100%
rename from posts/2016-02-10-laravel-xhprof.md
rename to content/posts/2016-02-10-laravel-xhprof.md
diff --git a/posts/2016-02-15-serving-hakyll-site-with-warp.md b/content/posts/2016-02-15-serving-hakyll-site-with-warp.md
similarity index 100%
rename from posts/2016-02-15-serving-hakyll-site-with-warp.md
rename to content/posts/2016-02-15-serving-hakyll-site-with-warp.md
diff --git a/posts/2016-03-13-first-impressions-on-gentoo.md b/content/posts/2016-03-13-first-impressions-on-gentoo.md
similarity index 100%
rename from posts/2016-03-13-first-impressions-on-gentoo.md
rename to content/posts/2016-03-13-first-impressions-on-gentoo.md
diff --git a/posts/2016-04-08-networkmanager-vpn.md b/content/posts/2016-04-08-networkmanager-vpn.md
similarity index 100%
rename from posts/2016-04-08-networkmanager-vpn.md
rename to content/posts/2016-04-08-networkmanager-vpn.md
diff --git a/posts/2016-04-20-haskell-travis-docker.md b/content/posts/2016-04-20-haskell-travis-docker.md
similarity index 100%
rename from posts/2016-04-20-haskell-travis-docker.md
rename to content/posts/2016-04-20-haskell-travis-docker.md
diff --git a/posts/2016-05-23-portage.md b/content/posts/2016-05-23-portage.md
similarity index 100%
rename from posts/2016-05-23-portage.md
rename to content/posts/2016-05-23-portage.md
diff --git a/posts/2016-05-24-lambdaconf-schedule.md b/content/posts/2016-05-24-lambdaconf-schedule.md
similarity index 100%
rename from posts/2016-05-24-lambdaconf-schedule.md
rename to content/posts/2016-05-24-lambdaconf-schedule.md
diff --git a/posts/2016-07-04-haddock-travis.md b/content/posts/2016-07-04-haddock-travis.md
similarity index 100%
rename from posts/2016-07-04-haddock-travis.md
rename to content/posts/2016-07-04-haddock-travis.md
diff --git a/posts/2016-07-30-fstrim-systemd.md b/content/posts/2016-07-30-fstrim-systemd.md
similarity index 100%
rename from posts/2016-07-30-fstrim-systemd.md
rename to content/posts/2016-07-30-fstrim-systemd.md
diff --git a/posts/2017-02-05-phabulous-3.md b/content/posts/2017-02-05-phabulous-3.md
similarity index 100%
rename from posts/2017-02-05-phabulous-3.md
rename to content/posts/2017-02-05-phabulous-3.md
diff --git a/projects/blog.md b/content/projects/blog.md
similarity index 100%
rename from projects/blog.md
rename to content/projects/blog.md
diff --git a/projects/craze.md b/content/projects/craze.md
similarity index 100%
rename from projects/craze.md
rename to content/projects/craze.md
diff --git a/projects/enclosure.md b/content/projects/enclosure.md
similarity index 100%
rename from projects/enclosure.md
rename to content/projects/enclosure.md
diff --git a/projects/ensure.md b/content/projects/ensure.md
similarity index 100%
rename from projects/ensure.md
rename to content/projects/ensure.md
diff --git a/projects/foundation-pagination.md b/content/projects/foundation-pagination.md
similarity index 100%
rename from projects/foundation-pagination.md
rename to content/projects/foundation-pagination.md
diff --git a/projects/gonduit.md b/content/projects/gonduit.md
similarity index 100%
rename from projects/gonduit.md
rename to content/projects/gonduit.md
diff --git a/projects/illuminated.md b/content/projects/illuminated.md
similarity index 100%
rename from projects/illuminated.md
rename to content/projects/illuminated.md
diff --git a/projects/kawaii.md b/content/projects/kawaii.md
similarity index 100%
rename from projects/kawaii.md
rename to content/projects/kawaii.md
diff --git a/projects/legit.md b/content/projects/legit.md
similarity index 100%
rename from projects/legit.md
rename to content/projects/legit.md
diff --git a/projects/minebot.md b/content/projects/minebot.md
similarity index 100%
rename from projects/minebot.md
rename to content/projects/minebot.md
diff --git a/projects/nexus.md b/content/projects/nexus.md
similarity index 100%
rename from projects/nexus.md
rename to content/projects/nexus.md
diff --git a/projects/nucleus.md b/content/projects/nucleus.md
similarity index 100%
rename from projects/nucleus.md
rename to content/projects/nucleus.md
diff --git a/projects/phabricator-yubikey.md b/content/projects/phabricator-yubikey.md
similarity index 100%
rename from projects/phabricator-yubikey.md
rename to content/projects/phabricator-yubikey.md
diff --git a/projects/phabulous.md b/content/projects/phabulous.md
similarity index 100%
rename from projects/phabulous.md
rename to content/projects/phabulous.md
diff --git a/projects/purifier.md b/content/projects/purifier.md
similarity index 100%
rename from projects/purifier.md
rename to content/projects/purifier.md
diff --git a/projects/sauron.md b/content/projects/sauron.md
similarity index 100%
rename from projects/sauron.md
rename to content/projects/sauron.md
diff --git a/projects/shift.md b/content/projects/shift.md
similarity index 100%
rename from projects/shift.md
rename to content/projects/shift.md
diff --git a/projects/speedbump.md b/content/projects/speedbump.md
similarity index 100%
rename from projects/speedbump.md
rename to content/projects/speedbump.md
diff --git a/projects/tutum-php.md b/content/projects/tutum-php.md
similarity index 100%
rename from projects/tutum-php.md
rename to content/projects/tutum-php.md
diff --git a/projects/vertex.md b/content/projects/vertex.md
similarity index 100%
rename from projects/vertex.md
rename to content/projects/vertex.md
diff --git a/robots.txt b/content/robots.txt
similarity index 100%
rename from robots.txt
rename to content/robots.txt
diff --git a/scss/typography/_headers.scss b/scss/typography/_headers.scss
index 8fb9c0be89a09da496a5ee7898310b78b27d2aa9..7ee42820fcd2fb893a33071f37f2ede7255e1366 100644
--- a/scss/typography/_headers.scss
+++ b/scss/typography/_headers.scss
@@ -2,7 +2,7 @@
h1 {
&.cardboard {
- font-family: "adelle-sans";
+ //font-family: "adelle-sans";
font-weight: 400;
transition: all 0.3s ease;
float: left;
diff --git a/templates/default.html b/templates/default.html
index f91157c8a282317b3f25b18a45406fc542d5a59e..08adf372a1741b3520dfb8d574213bcc89767b9e 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -12,8 +12,6 @@
$endif$
<link rel="stylesheet" type="text/css" href="/css/app.css" />
- <script>document.documentElement.className += ' wf-loading';</script>
-
<meta property="fb:admins" content="etcinit"/>
</head>
<body>
@@ -120,9 +118,6 @@
</div>
</div>
- <script src="https://use.typekit.net/voy2fek.js"></script>
- <script>try{Typekit.load({ async: true });}catch(e){}</script>
-
<script async type="text/javascript"
src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
</script>