reorganizes assets and adds jekyll-assets gem

Author: mwiley

Gemfile

@@ -1,6 +1,12 @@
 source 'https://rubygems.org'
 gem 'jekyll'
-gem 'wdm', '~> 0.1.0' if Gem.win_platform?
+gem 'jekyll-assets'
+gem 'uglifier'
+
+gem 'bootstrap-sass'
+
 gem 'rake'
 gem 'rake-jekyll'
 gem 'html-proofer'
+
+gem 'wdm', '~> 0.1.0' if Gem.win_platform?

javascript/turbolinks.coffee renamed to _assets/javascripts/turbolinks.js.coffee

@@ -1,6 +1,3 @@
----
-
----
 pageCache               = {}
 cacheSize               = 10
 transitionCacheEnabled  = false

_sass/_base.scss renamed to _assets/stylesheets/_base.scss

@@ -1,6 +1,3 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
 @charset "utf-8";
 @import url(//fonts.googleapis.com/css?family=Share+Tech+Mono|Merriweather);
 
@@ -44,7 +41,6 @@ $on-laptop:        800px;
     }
 }
 
-// Import partials from `sass_dir` (defaults to `_sass`)
 @import
         "bootstrap",
         "base",

_sass/_layout.scss renamed to _assets/stylesheets/_layout.scss

@@ -9,3 +9,8 @@ url: "http://csuwebdev.com/" # the base hostname & protocol for your site
 # Build settings
 markdown: kramdown
 exclude: ['README.md', 'Gemfile', 'Gemfile.lock', 'Rakefile']
+
+# jekyll-assets settings
+assets:
+  js_compressor:  uglifier
+  css_compressor: sass

_sass/_syntax-highlighting.scss renamed to _assets/stylesheets/_syntax-highlighting.scss

@@ -5,10 +5,9 @@
 
   <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 }}">
   <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 }}" />
 
-  <script src="/javascript/turbolinks.js" type="text/javascript" charset="utf-8"></script>
+  {% stylesheet main %}
+  {% javascript turbolinks %}
 </head>

css/main.scss renamed to _assets/stylesheets/main.scss

@@ -0,0 +1,2 @@
+require "jekyll-assets"
+require "jekyll-assets/bootstrap"