From f6e04192926c1b2321fbad3ffc09ba4b8036764a Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sun, 24 Dec 2017 16:51:49 +0100
Subject: [PATCH] Switched to jekyll assets

Signed-off-by: Jim Martens <github@2martens.de>
---
 {_sass => _assets/css}/_base.scss             |  0
 _assets/css/_bootstrap-custom.scss            | 42 +++++++++++++++++++
 {_sass => _assets/css}/_layout.scss           |  0
 .../css}/_syntax-highlighting.scss            |  0
 {_sass => _assets/css}/_video-embedding.scss  |  0
 {css => _assets/css}/main.scss                | 16 +++----
 _includes/head.html                           |  4 +-
 feed.xml                                      | 29 +++++++------
 8 files changed, 64 insertions(+), 27 deletions(-)
 rename {_sass => _assets/css}/_base.scss (100%)
 create mode 100644 _assets/css/_bootstrap-custom.scss
 rename {_sass => _assets/css}/_layout.scss (100%)
 rename {_sass => _assets/css}/_syntax-highlighting.scss (100%)
 rename {_sass => _assets/css}/_video-embedding.scss (100%)
 rename {css => _assets/css}/main.scss (83%)

diff --git a/_sass/_base.scss b/_assets/css/_base.scss
similarity index 100%
rename from _sass/_base.scss
rename to _assets/css/_base.scss
diff --git a/_assets/css/_bootstrap-custom.scss b/_assets/css/_bootstrap-custom.scss
new file mode 100644
index 0000000..ccc5186
--- /dev/null
+++ b/_assets/css/_bootstrap-custom.scss
@@ -0,0 +1,42 @@
+/*!
+ * Bootstrap v4.0.0-beta.2 (https://getbootstrap.com)
+ * Copyright 2011-2017 The Bootstrap Authors
+ * Copyright 2011-2017 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+@import "bootstrap/functions";
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+@import "bootstrap/root";
+@import "bootstrap/print";
+@import "bootstrap/reboot";
+@import "bootstrap/type";
+@import "bootstrap/images";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+@import "bootstrap/transitions";
+@import "bootstrap/dropdown";
+@import "bootstrap/button-group";
+@import "bootstrap/input-group";
+@import "bootstrap/custom-forms";
+@import "bootstrap/nav";
+@import "bootstrap/navbar";
+@import "bootstrap/card";
+@import "bootstrap/breadcrumb";
+@import "bootstrap/pagination";
+@import "bootstrap/badge";
+@import "bootstrap/jumbotron";
+@import "bootstrap/alert";
+@import "bootstrap/progress";
+@import "bootstrap/media";
+@import "bootstrap/list-group";
+@import "bootstrap/close";
+@import "bootstrap/modal";
+@import "bootstrap/tooltip";
+@import "bootstrap/popover";
+@import "bootstrap/carousel";
+@import "bootstrap/utilities";
diff --git a/_sass/_layout.scss b/_assets/css/_layout.scss
similarity index 100%
rename from _sass/_layout.scss
rename to _assets/css/_layout.scss
diff --git a/_sass/_syntax-highlighting.scss b/_assets/css/_syntax-highlighting.scss
similarity index 100%
rename from _sass/_syntax-highlighting.scss
rename to _assets/css/_syntax-highlighting.scss
diff --git a/_sass/_video-embedding.scss b/_assets/css/_video-embedding.scss
similarity index 100%
rename from _sass/_video-embedding.scss
rename to _assets/css/_video-embedding.scss
diff --git a/css/main.scss b/_assets/css/main.scss
similarity index 83%
rename from css/main.scss
rename to _assets/css/main.scss
index e98dd39..847f9b0 100644
--- a/css/main.scss
+++ b/_assets/css/main.scss
@@ -1,9 +1,4 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-
+@charset "UTF-8";
 
 // Our variables
 $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -47,10 +42,11 @@ $on-laptop:        800px;
 
 // Import partials from `sass_dir` (defaults to `_sass`)
 @import
-        "base",
-        "layout",
-        "syntax-highlighting",
-        "video-embedding"
+"bootstrap-custom",
+//"base",
+//"layout",
+//"syntax-highlighting",
+"video-embedding"
 ;
 
 .post-content {
diff --git a/_includes/head.html b/_includes/head.html
index 41340ae..1a97922 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,7 +6,7 @@
   <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+  {% stylesheet main.scss %}
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | prepend: site.baseurl | prepend: site.url }}">
 </head>
diff --git a/feed.xml b/feed.xml
index a6628bd..d15b505 100644
--- a/feed.xml
+++ b/feed.xml
@@ -2,29 +2,28 @@
 layout: null
 ---
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<rss version="2.0">
   <channel>
     <title>{{ site.title | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
     <link>{{ site.url }}{{ site.baseurl }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
     <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>
     {% for post in site.posts limit:10 %}
-      <item>
-        <title>{{ post.title | xml_escape }}</title>
-        <description>{{ post.content | xml_escape }}</description>
-        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
-        {% for tag in post.tags %}
-        <category>{{ tag | xml_escape }}</category>
-        {% endfor %}
-        {% for cat in post.categories %}
-        <category>{{ cat | xml_escape }}</category>
-        {% endfor %}
-      </item>
+    <item>
+      <title>{{ post.title | xml_escape }}</title>
+      <description>{{ post.content | xml_escape }}</description>
+      <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
+      <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
+      <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
+      {% for tag in post.tags %}
+      <category>{{ tag | xml_escape }}</category>
+      {% endfor %}
+      {% for cat in post.categories %}
+      <category>{{ cat | xml_escape }}</category>
+      {% endfor %}
+    </item>
     {% endfor %}
   </channel>
 </rss>