From ed278bb1173129ed71dbbbfa2a0de6b3fa41bd48 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Tue, 25 Mar 2014 02:01:27 -0400 Subject: [PATCH] Various minor aesthetic fixes - made the border surrounding content a consistent width on each page - minor aesthetic changes to the tag page - removed need for index.html Signed-off-by: Collin J. Doering --- index.html | 5 ---- sass/_blog-page.sass | 2 +- sass/_tag-page.sass | 3 ++- site.hs | 4 ++-- templates/default.haml | 2 +- templates/pages/blog.haml | 2 +- templates/pages/contact.haml | 11 ++++----- templates/pages/home.haml | 37 ++++++++++++++--------------- templates/partials/post-teaser.haml | 2 +- templates/tag-page.haml | 5 ++-- 10 files changed, 33 insertions(+), 40 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index ef20cce..0000000 --- a/index.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Index ---- - -loading diff --git a/sass/_blog-page.sass b/sass/_blog-page.sass index 393f9c9..08c0861 100644 --- a/sass/_blog-page.sass +++ b/sass/_blog-page.sass @@ -21,7 +21,7 @@ @import 'sass/util' .post - @include border-box(0.5em) + @include border-box() header margin-bottom: 0.8em diff --git a/sass/_tag-page.sass b/sass/_tag-page.sass index f08d325..b98b169 100644 --- a/sass/_tag-page.sass +++ b/sass/_tag-page.sass @@ -24,8 +24,9 @@ background-size: contain background-repeat: no-repeat background-position: 50% - padding: 0.75em + padding: 24px 39px margin: 0 0.35em 0 0.1em #tag text-transform: capitalize + margin-bottom: 8px diff --git a/site.hs b/site.hs index cc08bad..5bcecb1 100644 --- a/site.hs +++ b/site.hs @@ -249,7 +249,7 @@ main = do route r compile $ getResourceString >>= withItemBody (unixFilter "jsmin" []) - match "index.html" $ do + create ["index.html"] $ do route idRoute compile $ do -- Generate nav-bar from pages/* ordered by metadata 'weight' @@ -257,7 +257,7 @@ main = do let indexCtx = listField "pages" pagesCtx (return pages) <> defaultContext - getResourceBody + makeItem "loading" >>= applyAsTemplate indexCtx >>= loadAndApplyTemplate "templates/default.haml" indexCtx >>= relativizeUrls diff --git a/templates/default.haml b/templates/default.haml index 62c9e9f..497162b 100644 --- a/templates/default.haml +++ b/templates/default.haml @@ -10,7 +10,7 @@ %meta(charset="utf-8") %title RekahSoft - %meta(name="description" content="Custom soltuions to unique problems") + %meta(name="description" content="The technical musings of a minimalist") %meta(name="author" content="Collin Doering") / Mobile Specific Metas diff --git a/templates/pages/blog.haml b/templates/pages/blog.haml index 64c2992..bf135e3 100644 --- a/templates/pages/blog.haml +++ b/templates/pages/blog.haml @@ -1,2 +1,2 @@ -#blog-page.container +#blog-page $partial("templates/partials/post-teaser-list.haml")$ diff --git a/templates/pages/contact.haml b/templates/pages/contact.haml index 481a99f..10716aa 100644 --- a/templates/pages/contact.haml +++ b/templates/pages/contact.haml @@ -1,6 +1,5 @@ -#contact-page.container - .border-box - .row - $partial("templates/partials/business-card.haml")$ - #about-me-blurb.row - $body0$ +#contact-page.container.border-box + .row + $partial("templates/partials/business-card.haml")$ + #about-me-blurb.row + $body0$ diff --git a/templates/pages/home.haml b/templates/pages/home.haml index 9f63c08..85a4117 100644 --- a/templates/pages/home.haml +++ b/templates/pages/home.haml @@ -1,19 +1,18 @@ -#home-page.container - .border-box - .row - .eight.columns.alpha - $partial("templates/partials/business-card.haml")$ - .seven.columns.offset-by-one.omega - #recent-posts - %h1 Recent Posts - %hr/ - $partial("templates/partials/recent-posts-list.haml")$ - #tag-cloud - %h1 Tag Cloud - %hr/ - $tagCloud$ - .row - #license.eight.columns.alpha - $license$ - #tools.seven.columns.offset-by-one.omega - $tools$ +#home-page.container.border-box + .row + .eight.columns.alpha + $partial("templates/partials/business-card.haml")$ + .seven.columns.offset-by-one.omega + #recent-posts + %h1 Recent Posts + %hr/ + $partial("templates/partials/recent-posts-list.haml")$ + #tag-cloud + %h1 Tag Cloud + %hr/ + $tagCloud$ + .row + #license.eight.columns.alpha + $license$ + #tools.seven.columns.offset-by-one.omega + $tools$ diff --git a/templates/partials/post-teaser.haml b/templates/partials/post-teaser.haml index f98c00c..c9f4bc8 100644 --- a/templates/partials/post-teaser.haml +++ b/templates/partials/post-teaser.haml @@ -1,4 +1,4 @@ -%article.post +%article.post.container %header %h1.title %a(href="$url$") $title$ diff --git a/templates/tag-page.haml b/templates/tag-page.haml index 21a7db6..8c1502a 100644 --- a/templates/tag-page.haml +++ b/templates/tag-page.haml @@ -1,6 +1,5 @@ -#tag-page.container - %h1#tag $tag$ +#tag-page + %h1#tag.container $tag$ $for(posts)$ $partial("templates/partials/post-teaser.haml")$ $endfor$ -