Install jekyll-assets for better asset pipeline support.

23 files changed, 29 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index c34d99a..311bbba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "jekyll"
+gem 'jekyll-assets'
 gem 'jekyll-multiple-languages-plugin'
 gem 'facets', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 614d95e..870d1e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.8)
     blankslate (2.1.2.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -14,7 +15,10 @@ GEM
     execjs (2.5.2)
     facets (3.0.0)
     fast-stemmer (1.0.2)
+    fastimage (1.7.0)
+      addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.10)
+    hike (1.2.3)
     hitimes (1.2.2)
     jekyll (2.5.3)
       classifier-reborn (~> 2.0)
@@ -31,6 +35,14 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
+    jekyll-assets (1.0.0)
+      fastimage (~> 1.6)
+      jekyll (>= 2)
+      mini_magick (~> 4.1)
+      sass (~> 3.2)
+      sprockets (~> 2.10)
+      sprockets-helpers
+      sprockets-sass
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
     jekyll-gist (1.2.1)
@@ -47,18 +59,32 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
+    mini_magick (4.2.10)
+    multi_json (1.11.2)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.11)
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
+    rack (1.6.4)
     rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.3.2)
     safe_yaml (1.0.4)
     sass (3.4.16)
+    sprockets (2.12.4)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-helpers (1.2.1)
+      sprockets (>= 2.2)
+    sprockets-sass (1.3.1)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
+    tilt (1.4.1)
     timers (4.0.1)
       hitimes
     toml (0.1.2)
@@ -71,6 +97,7 @@ PLATFORMS
 DEPENDENCIES
   facets
   jekyll
+  jekyll-assets
   jekyll-multiple-languages-plugin
 
 BUNDLED WITH
diff --git a/blog/_assets/images/.gitkeep b/blog/_assets/images/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/blog/_assets/images/.gitkeep
diff --git a/blog/assets/images/2014/NORSKURSKOG_front_cover.jpg b/blog/_assets/images/2014/NORSKURSKOG_front_cover.jpg
index b9fdd95..b9fdd95 100644
--- a/blog/assets/images/2014/NORSKURSKOG_front_cover.jpg
+++ b/blog/_assets/images/2014/NORSKURSKOG_front_cover.jpg
diff --git a/blog/assets/images/2014/cds-arrived.jpg b/blog/_assets/images/2014/cds-arrived.jpg
index 9162607..9162607 100644
--- a/blog/assets/images/2014/cds-arrived.jpg
+++ b/blog/_assets/images/2014/cds-arrived.jpg
diff --git a/blog/assets/images/2014/endolith-live.jpg b/blog/_assets/images/2014/endolith-live.jpg
index 6ba0265..6ba0265 100644
--- a/blog/assets/images/2014/endolith-live.jpg
+++ b/blog/_assets/images/2014/endolith-live.jpg
diff --git a/blog/assets/images/2014/endolith-promo.jpg b/blog/_assets/images/2014/endolith-promo.jpg
index 98c739c..98c739c 100644
--- a/blog/assets/images/2014/endolith-promo.jpg
+++ b/blog/_assets/images/2014/endolith-promo.jpg
diff --git a/blog/assets/images/2014/unspoken-live.jpg b/blog/_assets/images/2014/unspoken-live.jpg
index 9a7729a..9a7729a 100644
--- a/blog/assets/images/2014/unspoken-live.jpg
+++ b/blog/_assets/images/2014/unspoken-live.jpg
diff --git a/blog/assets/images/2014/unspoken-promo.jpg b/blog/_assets/images/2014/unspoken-promo.jpg
index 55ff848..55ff848 100644
--- a/blog/assets/images/2014/unspoken-promo.jpg
+++ b/blog/_assets/images/2014/unspoken-promo.jpg
diff --git a/blog/assets/images/2014/wyruz-live.jpg b/blog/_assets/images/2014/wyruz-live.jpg
index 675865d..675865d 100644
--- a/blog/assets/images/2014/wyruz-live.jpg
+++ b/blog/_assets/images/2014/wyruz-live.jpg
diff --git a/blog/assets/images/2014/wyruz-promo.jpg b/blog/_assets/images/2014/wyruz-promo.jpg
index e326a76..e326a76 100644
--- a/blog/assets/images/2014/wyruz-promo.jpg
+++ b/blog/_assets/images/2014/wyruz-promo.jpg
diff --git a/blog/assets/images/background.jpg b/blog/_assets/images/background.jpg
index c650208..c650208 100644
--- a/blog/assets/images/background.jpg
+++ b/blog/_assets/images/background.jpg
diff --git a/blog/assets/images/header.png b/blog/_assets/images/header.png
index 649999a..649999a 100644
--- a/blog/assets/images/header.png
+++ b/blog/_assets/images/header.png
diff --git a/blog/assets/images/logos/ET-logo.jpg b/blog/_assets/images/logos/ET-logo.jpg
index 753573f..753573f 100644
--- a/blog/assets/images/logos/ET-logo.jpg
+++ b/blog/_assets/images/logos/ET-logo.jpg
diff --git a/blog/assets/images/logos/Symphonium.jpg b/blog/_assets/images/logos/Symphonium.jpg
index 8eccf4f..8eccf4f 100644
--- a/blog/assets/images/logos/Symphonium.jpg
+++ b/blog/_assets/images/logos/Symphonium.jpg
diff --git a/blog/_assets/javascripts/.gitkeep b/blog/_assets/javascripts/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/blog/_assets/javascripts/.gitkeep
diff --git a/blog/_assets/stylesheets/.gitkeep b/blog/_assets/stylesheets/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/blog/_assets/stylesheets/.gitkeep
diff --git a/blog/_sass/_common.scss b/blog/_assets/stylesheets/_common.scss
index a392022..a392022 100644
--- a/blog/_sass/_common.scss
+++ b/blog/_assets/stylesheets/_common.scss
diff --git a/blog/_sass/_config.scss b/blog/_assets/stylesheets/_config.scss
index 68fb2b6..68fb2b6 100644
--- a/blog/_sass/_config.scss
+++ b/blog/_assets/stylesheets/_config.scss
diff --git a/blog/_sass/_header.scss b/blog/_assets/stylesheets/_header.scss
index 7998bb5..7998bb5 100644
--- a/blog/_sass/_header.scss
+++ b/blog/_assets/stylesheets/_header.scss
diff --git a/blog/_sass/_navbar.scss b/blog/_assets/stylesheets/_navbar.scss
index f5c46f5..f5c46f5 100644
--- a/blog/_sass/_navbar.scss
+++ b/blog/_assets/stylesheets/_navbar.scss
diff --git a/blog/css/main.scss b/blog/_assets/stylesheets/main.scss
index a6abce1..a6abce1 100644
--- a/blog/css/main.scss
+++ b/blog/_assets/stylesheets/main.scss
diff --git a/blog/_plugins/jekyll_assets.rb b/blog/_plugins/jekyll_assets.rb
new file mode 100644
index 0000000..320122a
--- /dev/null
+++ b/blog/_plugins/jekyll_assets.rb
@@ -0,0 +1 @@
+require "jekyll/assets"