summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_layouts/default.html9
-rw-r--r--assets/css/all.css10
-rw-r--r--css/base.css (renamed from _includes/css/base.css)0
-rw-r--r--css/font-awesome-ie7.min.css (renamed from assets/css/font-awesome-ie7.min.css)0
-rw-r--r--css/font-awesome.css (renamed from _includes/css/font-awesome.css)0
-rw-r--r--css/layout.css (renamed from _includes/css/layout.css)0
-rw-r--r--css/peaksea.css (renamed from _includes/css/peaksea.css)0
-rw-r--r--css/screen.css (renamed from _includes/css/screen.css)0
-rw-r--r--css/skeleton.css (renamed from _includes/css/skeleton.css)0
-rw-r--r--font/FontAwesome.otf (renamed from assets/font/FontAwesome.otf)bin50204 -> 50204 bytes
-rwxr-xr-xfont/fontawesome-webfont.eot (renamed from assets/font/fontawesome-webfont.eot)bin29360 -> 29360 bytes
-rwxr-xr-xfont/fontawesome-webfont.svg (renamed from assets/font/fontawesome-webfont.svg)0
-rwxr-xr-xfont/fontawesome-webfont.ttf (renamed from assets/font/fontawesome-webfont.ttf)bin64960 -> 64960 bytes
-rwxr-xr-xfont/fontawesome-webfont.woff (renamed from assets/font/fontawesome-webfont.woff)bin34420 -> 34420 bytes
14 files changed, 7 insertions, 12 deletions
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 @@
<link rel="shortcut icon" href="/favicon.png">
<link rel="alternate" type="application/rss+xml" title="{{ site.theme.name }}" href="{{site.url}}/atom.xml" />
- <link rel="stylesheet" href="/assets/css/all.css">
+ <link rel="stylesheet" href="/css/font-awesome.css">
+ <link rel="stylesheet" href="/css/base.css">
+ <link rel="stylesheet" href="/css/skeleton.css">
+ <link rel="stylesheet" href="/css/screen.css">
+ <link rel="stylesheet" href="/css/layout.css">
+ <link rel="stylesheet" href="/css/peaksea.css">
<!--[if IE 7]>
<link rel="stylesheet" href="/assets/css/font-awesome-ie7.min.css">
<![endif]-->
@@ -37,4 +42,4 @@
{% include analytics.html %}
</body>
-</html> \ No newline at end of file
+</html>
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
index c4c0a37..c4c0a37 100644
--- a/_includes/css/base.css
+++ b/css/base.css
diff --git a/assets/css/font-awesome-ie7.min.css b/css/font-awesome-ie7.min.css
index 47e0508..47e0508 100644
--- a/assets/css/font-awesome-ie7.min.css
+++ b/css/font-awesome-ie7.min.css
diff --git a/_includes/css/font-awesome.css b/css/font-awesome.css
index 389f3b7..389f3b7 100644
--- a/_includes/css/font-awesome.css
+++ b/css/font-awesome.css
diff --git a/_includes/css/layout.css b/css/layout.css
index 572c8f6..572c8f6 100644
--- a/_includes/css/layout.css
+++ b/css/layout.css
diff --git a/_includes/css/peaksea.css b/css/peaksea.css
index edc59c8..edc59c8 100644
--- a/_includes/css/peaksea.css
+++ b/css/peaksea.css
diff --git a/_includes/css/screen.css b/css/screen.css
index 4b5c0d4..4b5c0d4 100644
--- a/_includes/css/screen.css
+++ b/css/screen.css
diff --git a/_includes/css/skeleton.css b/css/skeleton.css
index d0264a4..d0264a4 100644
--- a/_includes/css/skeleton.css
+++ b/css/skeleton.css
diff --git a/assets/font/FontAwesome.otf b/font/FontAwesome.otf
index 32dd8b1..32dd8b1 100644
--- a/assets/font/FontAwesome.otf
+++ b/font/FontAwesome.otf
Binary files differ
diff --git a/assets/font/fontawesome-webfont.eot b/font/fontawesome-webfont.eot
index c080283..c080283 100755
--- a/assets/font/fontawesome-webfont.eot
+++ b/font/fontawesome-webfont.eot
Binary files differ
diff --git a/assets/font/fontawesome-webfont.svg b/font/fontawesome-webfont.svg
index 10a1e1b..10a1e1b 100755
--- a/assets/font/fontawesome-webfont.svg
+++ b/font/fontawesome-webfont.svg
diff --git a/assets/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf
index 908f69e..908f69e 100755
--- a/assets/font/fontawesome-webfont.ttf
+++ b/font/fontawesome-webfont.ttf
Binary files differ
diff --git a/assets/font/fontawesome-webfont.woff b/font/fontawesome-webfont.woff
index a33af95..a33af95 100755
--- a/assets/font/fontawesome-webfont.woff
+++ b/font/fontawesome-webfont.woff
Binary files differ