From dff0783132f7a2ba7cd4005a15fc639615a7d239 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Tue, 25 Aug 2015 15:12:12 +0200
Subject: Fix stylesheets and templates to use jekyll-assets.

---
 blog/_assets/stylesheets/main.scss | 5 +----
 blog/_includes/head.html           | 4 ++--
 blog/_includes/header.html         | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'blog')

diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss
index a6abce1..fc6fb42 100644
--- a/blog/_assets/stylesheets/main.scss
+++ b/blog/_assets/stylesheets/main.scss
@@ -1,6 +1,3 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
 @import "config";
 @import "common";
 @import "header";
@@ -12,7 +9,7 @@ body {
     line-height: 135%;
 
     background: {
-        image: url({{ "/assets/images/background.jpg" | prepend: site.baseurl_root }});
+        image: image_url("background.jpg");
         repeat: no-repeat;
         position: center top;
         color: black;
diff --git a/blog/_includes/head.html b/blog/_includes/head.html
index 93f1512..1d66aa8 100644
--- a/blog/_includes/head.html
+++ b/blog/_includes/head.html
@@ -9,6 +9,6 @@
      {% endif %}
    </title>
    <meta name="description" content="{{ site.description }}">
-   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl_root }}">
    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl_root | prepend: site.url }}">
- </head>
+   {% stylesheet main %}
+</head>
diff --git a/blog/_includes/header.html b/blog/_includes/header.html
index c873fb1..6813c67 100644
--- a/blog/_includes/header.html
+++ b/blog/_includes/header.html
@@ -1,6 +1,6 @@
 <header id="header">
   <div id="logo">
-    <img src="{{ '/assets/images/header.png' | prepend: site.baseurl_root }}" alt="Norsk Urskog">
+    {% image header.png alt="Norsk Urskog" %}
     <p>Norwegian Underground Metal Sampler</p>
   </div>
   <div id="banner-pos-1">
-- 
cgit v1.2.3