Merge pull request sergiokopplin#120 from jehartzog/inline-sass

sergiokopplin · sergiokopplin · commit c4f909fedae3 · 2016-05-23T21:44:50.000-03:00
Inlining of SASS, gitignore SASS cache and gulp watch _sass
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 node_modules
 _site
+.sass-cache
diff --git a/_includes/style.scss b/_includes/style.scss
@@ -1,5 +1,3 @@
----
----
 
 @import "base/variables";
 @import "base/normalize";
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -19,7 +19,11 @@
     <link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html','' }}">
     <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.url }}{{ "/feed.xml" }}" />
 
-    <link rel="stylesheet" href="{{ site.url }}/assets/styles/style.css">
+    <style>
+    {% capture scss_sheet %}{% include style.scss %}{% endcapture %}
+    {{ scss_sheet | scssify }}
+    </style>
+
 </head>
 <body>
 
diff --git a/tasks/watch.js b/tasks/watch.js
@@ -2,5 +2,5 @@ var gulp = require('gulp');
 
 gulp.task('watch', function() {
     gulp.watch('assets/images/**/*.{jpg,png,gif}', ['imagemin']);
-    gulp.watch(['_drafts/*', 'assets/styles/**/*', '_includes/*', '_layouts/*', '_posts/*', '*.{html,md}', '_config.yml'], ['jekyll-rebuild']);
+    gulp.watch(['_drafts/*', '_sass/**/*', '_includes/*', '_layouts/*', '_posts/*', '*.{html,md}', '_config.yml'], ['jekyll-rebuild']);
 });
