From b53b4a5e5a0fb60dd9fc6400d057a453e3694b8c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 31 Jul 2014 04:40:07 -0400 Subject: [PATCH] Move to Sass. --- .../_font-awesome.scss} | 0 .../css/gridism.css => _sass/_gridism.scss} | 0 .../normalize.css => _sass/_normalize.scss} | 0 .../css/pygments.css => _sass/_pygments.scss} | 0 .../css/style.css => _sass/_style.scss} | 0 site/css/screen.css | 31 ------------------- site/css/screen.scss | 8 +++++ 7 files changed, 8 insertions(+), 31 deletions(-) rename site/{_includes/css/font-awesome.css => _sass/_font-awesome.scss} (100%) rename site/{_includes/css/gridism.css => _sass/_gridism.scss} (100%) rename site/{_includes/css/normalize.css => _sass/_normalize.scss} (100%) rename site/{_includes/css/pygments.css => _sass/_pygments.scss} (100%) rename site/{_includes/css/style.css => _sass/_style.scss} (100%) delete mode 100644 site/css/screen.css create mode 100644 site/css/screen.scss diff --git a/site/_includes/css/font-awesome.css b/site/_sass/_font-awesome.scss similarity index 100% rename from site/_includes/css/font-awesome.css rename to site/_sass/_font-awesome.scss diff --git a/site/_includes/css/gridism.css b/site/_sass/_gridism.scss similarity index 100% rename from site/_includes/css/gridism.css rename to site/_sass/_gridism.scss diff --git a/site/_includes/css/normalize.css b/site/_sass/_normalize.scss similarity index 100% rename from site/_includes/css/normalize.css rename to site/_sass/_normalize.scss diff --git a/site/_includes/css/pygments.css b/site/_sass/_pygments.scss similarity index 100% rename from site/_includes/css/pygments.css rename to site/_sass/_pygments.scss diff --git a/site/_includes/css/style.css b/site/_sass/_style.scss similarity index 100% rename from site/_includes/css/style.css rename to site/_sass/_style.scss diff --git a/site/css/screen.css b/site/css/screen.css deleted file mode 100644 index c49c94af..00000000 --- a/site/css/screen.css +++ /dev/null @@ -1,31 +0,0 @@ ---- ---- - -{% capture screen %} -/* *\ - * $normalize.css * -\* */ -{% include css/normalize.css %} -/* *\ - * $gridism.css * -\* */ -{% include css/gridism.css %} -/* *\ - * $style.css * -\* */ -{% include css/style.css %} -/* *\ - * $pygments.css * -\* */ -{% include css/pygments.css %} -/* *\ - * $font-awesome.css * -\* */ -{% include css/font-awesome.css %} -{% endcapture %} - -{% if site.GH_ENV %} - {{ screen | strip_newlines | remove: ' ' }} -{% else %} - {{ screen }} -{% endif %} diff --git a/site/css/screen.scss b/site/css/screen.scss new file mode 100644 index 00000000..bca8c2bb --- /dev/null +++ b/site/css/screen.scss @@ -0,0 +1,8 @@ +--- +--- + +@import "normalize"; +@import "gridism"; +@import "style"; +@import "pygments"; +@import "font-awesome"