scss baseline

codinfox · May 22, 2016 · 64182fc · 64182fc
1 parent 62e7883
commit 64182fc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,6 @@ validation-report.json
 # Folders to ignore
 node_modules
 bower_components
+
+# sass
+.sass-cache
diff --git a/_config.yml b/_config.yml
@@ -9,12 +9,12 @@ paginate: 5
 
 permalink: pretty
 
-# About/contact
+  # About/contact
 author:
   name: Mark Otto
 email: markdotto@gmail.com
 
-# Custom vars
+  # Custom vars
 version: 1.0.0
 
 gems:
@@ -23,3 +23,7 @@ gems:
 markdown: kramdown
 kramdown:
   input: GFM
+
+sass:
+  style: compressed
+  sass_dir: _scss    
diff --git a/_includes/head.html b/_includes/head.html
@@ -15,9 +15,7 @@
   </title>
 
   <!-- CSS -->
-  <link rel="stylesheet" href="{{ site.baseurl }}/public/css/poole.css">
-  <link rel="stylesheet" href="{{ site.baseurl }}/public/css/syntax.css">
-  <link rel="stylesheet" href="{{ site.baseurl }}/public/css/lanyon.css">
+  <link rel="stylesheet" href="{{ site.baseurl }}/public/css/main.css">
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
 
   <!-- Icons -->

diff --git a/public/css/lanyon.css → _scss/base/_lanyon.scss b/public/css/lanyon.css → _scss/base/_lanyon.scss
diff --git a/public/css/poole.css → _scss/base/_poole.scss b/public/css/poole.css → _scss/base/_poole.scss
diff --git a/public/css/syntax.css → _scss/base/_syntax.scss b/public/css/syntax.css → _scss/base/_syntax.scss
diff --git a/public/css/main.scss b/public/css/main.scss
@@ -0,0 +1,6 @@
+---
+---
+
+@import 'base/poole';
+@import 'base/lanyon';
+@import 'base/syntax';