Update to Tiny CSS

2 files changed, 21 insertions, 40 deletions

diff --git a/_includes/fonts.scss b/_includes/fonts.scss
deleted file mode 100644
index bff4b44..0000000
--- a/_includes/fonts.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-// Open Sans
-@font-face {
-    font-family: 'open_sans';
-    src: url('/assets/fonts/OpenSans-Light.eot');
-    src: url('/assets/fonts/OpenSans-Light.woff') format('woff'),
-        url('/assets/fonts/OpenSans-Light.ttf') format('truetype');
-    font-weight: 200;
-    font-style: normal;
-}
-
-// Source Code Pro
-@font-face {
-    font-family: 'source_code_pro';
-    src: url('/assets/fonts/sourcecodepro-regular.eot');
-    src: url('/assets/fonts/sourcecodepro-regular.woff') format('woff'),
-        url('/assets/fonts/sourcecodepro-regular.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
-
-// Merriweather
-@font-face {
-    font-family: 'merriweather_light';
-    src: url('/assets/fonts/merriweather-lightitalic-webfont.eot');
-    src: url('/assets/fonts/merriweather-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/assets/fonts/merriweather-lightitalic-webfont.woff') format('woff'),
-         url('/assets/fonts/merriweather-lightitalic-webfont.ttf') format('truetype');
-    font-weight: normal;
-    font-style: italic;
-}
-
-@font-face {
-    font-family: 'merriweather_light';
-    src: url('/assets/fonts/merriweather_light-webfont.eot');
-    src: url('/assets/fonts/merriweather_light-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/assets/fonts/merriweather_light-webfont.woff') format('woff'),
-         url('/assets/fonts/merriweather_light-webfont.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
\ No newline at end of file
diff --git a/_includes/tiny.scss b/_includes/tiny.scss
new file mode 100644
index 0000000..4b29cf2
--- /dev/null
+++ b/_includes/tiny.scss
@@ -0,0 +1,21 @@
+// Include fonts first so we can get them loading immediately
+@import "tiny/fonts";
+
+// These contain variables and mixins used throughout Tiny
+@import "tiny/variables";
+@import "tiny/mixins";
+
+// Normalize, of course
+@import "tiny/normalize";
+
+// General styles
+@import "tiny/base";
+@import "tiny/layout";
+@import "tiny/type";
+// @import "tiny/syntax";
+
+// Utility classes
+@import "tiny/utility";
+
+// Icon fonts
+@import "font-awesome/font-awesome";