From d4aeef6cbc816d3c877848df09f6c7e3ccf15557 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Thu, 17 Oct 2013 17:53:41 -0400 Subject: [PATCH] moved css and font into root directory, with no template magic --- _layouts/default.html | 9 +++++++-- assets/css/all.css | 10 ---------- {_includes/css => css}/base.css | 0 {assets/css => css}/font-awesome-ie7.min.css | 0 {_includes/css => css}/font-awesome.css | 0 {_includes/css => css}/layout.css | 0 {_includes/css => css}/peaksea.css | 0 {_includes/css => css}/screen.css | 0 {_includes/css => css}/skeleton.css | 0 {assets/font => font}/FontAwesome.otf | Bin {assets/font => font}/fontawesome-webfont.eot | Bin {assets/font => font}/fontawesome-webfont.svg | 0 {assets/font => font}/fontawesome-webfont.ttf | Bin {assets/font => font}/fontawesome-webfont.woff | Bin 14 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 assets/css/all.css rename {_includes/css => css}/base.css (100%) rename {assets/css => css}/font-awesome-ie7.min.css (100%) rename {_includes/css => css}/font-awesome.css (100%) rename {_includes/css => css}/layout.css (100%) rename {_includes/css => css}/peaksea.css (100%) rename {_includes/css => css}/screen.css (100%) rename {_includes/css => css}/skeleton.css (100%) rename {assets/font => font}/FontAwesome.otf (100%) rename {assets/font => font}/fontawesome-webfont.eot (100%) rename {assets/font => font}/fontawesome-webfont.svg (100%) rename {assets/font => font}/fontawesome-webfont.ttf (100%) rename {assets/font => font}/fontawesome-webfont.woff (100%) diff --git a/_layouts/default.html b/_layouts/default.html index e7455ad..66c8247 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -15,7 +15,12 @@ - + + + + + + @@ -37,4 +42,4 @@ {% include analytics.html %} - \ No newline at end of file + diff --git a/assets/css/all.css b/assets/css/all.css deleted file mode 100644 index 20b89db..0000000 --- a/assets/css/all.css +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: nil ---- - -{% include css/font-awesome.css %} -{% include css/base.css %} -{% include css/skeleton.css %} -{% include css/screen.css %} -{% include css/layout.css %} -{% include css/peaksea.css %} diff --git a/_includes/css/base.css b/css/base.css similarity index 100% rename from _includes/css/base.css rename to css/base.css diff --git a/assets/css/font-awesome-ie7.min.css b/css/font-awesome-ie7.min.css similarity index 100% rename from assets/css/font-awesome-ie7.min.css rename to css/font-awesome-ie7.min.css diff --git a/_includes/css/font-awesome.css b/css/font-awesome.css similarity index 100% rename from _includes/css/font-awesome.css rename to css/font-awesome.css diff --git a/_includes/css/layout.css b/css/layout.css similarity index 100% rename from _includes/css/layout.css rename to css/layout.css diff --git a/_includes/css/peaksea.css b/css/peaksea.css similarity index 100% rename from _includes/css/peaksea.css rename to css/peaksea.css diff --git a/_includes/css/screen.css b/css/screen.css similarity index 100% rename from _includes/css/screen.css rename to css/screen.css diff --git a/_includes/css/skeleton.css b/css/skeleton.css similarity index 100% rename from _includes/css/skeleton.css rename to css/skeleton.css diff --git a/assets/font/FontAwesome.otf b/font/FontAwesome.otf similarity index 100% rename from assets/font/FontAwesome.otf rename to font/FontAwesome.otf diff --git a/assets/font/fontawesome-webfont.eot b/font/fontawesome-webfont.eot similarity index 100% rename from assets/font/fontawesome-webfont.eot rename to font/fontawesome-webfont.eot diff --git a/assets/font/fontawesome-webfont.svg b/font/fontawesome-webfont.svg similarity index 100% rename from assets/font/fontawesome-webfont.svg rename to font/fontawesome-webfont.svg diff --git a/assets/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf similarity index 100% rename from assets/font/fontawesome-webfont.ttf rename to font/fontawesome-webfont.ttf diff --git a/assets/font/fontawesome-webfont.woff b/font/fontawesome-webfont.woff similarity index 100% rename from assets/font/fontawesome-webfont.woff rename to font/fontawesome-webfont.woff