diff --git a/src/fonts/century-supra/Century Supra C3 Bold.otf b/src/fonts/century-supra/Century Supra C3 Bold.otf
deleted file mode 100644
index f0bbd29..0000000
Binary files a/src/fonts/century-supra/Century Supra C3 Bold.otf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra C3 Bold.ttf b/src/fonts/century-supra/Century Supra C3 Bold.ttf
deleted file mode 100644
index 598aa29..0000000
Binary files a/src/fonts/century-supra/Century Supra C3 Bold.ttf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra C3 Regular.otf b/src/fonts/century-supra/Century Supra C3 Regular.otf
deleted file mode 100644
index 3a6ec98..0000000
Binary files a/src/fonts/century-supra/Century Supra C3 Regular.otf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra C3 Regular.ttf b/src/fonts/century-supra/Century Supra C3 Regular.ttf
deleted file mode 100644
index 5e1fc81..0000000
Binary files a/src/fonts/century-supra/Century Supra C3 Regular.ttf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Bold Italic.otf b/src/fonts/century-supra/Century Supra T3 Bold Italic.otf
deleted file mode 100644
index 1090b9f..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Bold Italic.otf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Bold Italic.ttf b/src/fonts/century-supra/Century Supra T3 Bold Italic.ttf
deleted file mode 100644
index 8771bc9..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Bold Italic.ttf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Bold.otf b/src/fonts/century-supra/Century Supra T3 Bold.otf
deleted file mode 100644
index adb6f2f..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Bold.otf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Bold.ttf b/src/fonts/century-supra/Century Supra T3 Bold.ttf
deleted file mode 100644
index 74d0457..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Bold.ttf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Italic.otf b/src/fonts/century-supra/Century Supra T3 Italic.otf
deleted file mode 100644
index 694f1ab..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Italic.otf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Italic.ttf b/src/fonts/century-supra/Century Supra T3 Italic.ttf
deleted file mode 100644
index 771e982..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Italic.ttf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Regular.otf b/src/fonts/century-supra/Century Supra T3 Regular.otf
deleted file mode 100644
index 673c38a..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Regular.otf and /dev/null differ
diff --git a/src/fonts/century-supra/Century Supra T3 Regular.ttf b/src/fonts/century-supra/Century Supra T3 Regular.ttf
deleted file mode 100644
index 002c52a..0000000
Binary files a/src/fonts/century-supra/Century Supra T3 Regular.ttf and /dev/null differ
diff --git a/src/fonts/century-supra/century_supra_c3_bold.woff b/src/fonts/century-supra/century_supra_c3_bold.woff
deleted file mode 100644
index d44dfed..0000000
Binary files a/src/fonts/century-supra/century_supra_c3_bold.woff and /dev/null differ
diff --git a/src/fonts/century-supra/century_supra_c3_regular.woff b/src/fonts/century-supra/century_supra_c3_regular.woff
deleted file mode 100644
index b9b75b3..0000000
Binary files a/src/fonts/century-supra/century_supra_c3_regular.woff and /dev/null differ
diff --git a/src/fonts/century-supra/century_supra_t3_bold.woff b/src/fonts/century-supra/century_supra_t3_bold.woff
deleted file mode 100644
index 5a91692..0000000
Binary files a/src/fonts/century-supra/century_supra_t3_bold.woff and /dev/null differ
diff --git a/src/fonts/century-supra/century_supra_t3_bold_italic.woff b/src/fonts/century-supra/century_supra_t3_bold_italic.woff
deleted file mode 100644
index ecd91b2..0000000
Binary files a/src/fonts/century-supra/century_supra_t3_bold_italic.woff and /dev/null differ
diff --git a/src/fonts/century-supra/century_supra_t3_italic.woff b/src/fonts/century-supra/century_supra_t3_italic.woff
deleted file mode 100644
index 1356314..0000000
Binary files a/src/fonts/century-supra/century_supra_t3_italic.woff and /dev/null differ
diff --git a/src/fonts/century-supra/century_supra_t3_regular.woff b/src/fonts/century-supra/century_supra_t3_regular.woff
deleted file mode 100644
index f485ab2..0000000
Binary files a/src/fonts/century-supra/century_supra_t3_regular.woff and /dev/null differ
diff --git a/src/fonts/century-supra/stylesheet.css.pp b/src/fonts/century-supra/stylesheet.css.pp
deleted file mode 100644
index f2bf7f6..0000000
--- a/src/fonts/century-supra/stylesheet.css.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang pollen
-
-@font-face {
- font-family: 'Century Supra';
- src: url('Century Supra T3 Regular.otf') format('opentype'),
- url('Century Supra T3 Regular.ttf') format('truetype'),
- url('century_supra_t3_regular.woff') format('woff');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Century Supra';
- src: url('Century Supra T3 Bold.otf') format('opentype'),
- url('Century Supra T3 Bold.ttf') format('truetype'),
- url('century_supra_t3_bold.woff') format('woff');
- font-weight: bold;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Century Supra';
- src: url('Century Supra T3 Italic.otf') format('opentype'),
- url('Century Supra T3 Italic.ttf') format('truetype'),
- url('century_supra_t3_italic.woff') format('woff');
- font-weight: normal;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Century Supra';
- src: url('Century Supra T3 Bold Italic.otf') format('opentype'),
- url('Century Supra T3 Bold Italic.ttf') format('truetype'),
- url('century_supra_t3_bold_italic.woff') format('woff');
- font-weight: bold;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Century Supra (Small Caps)';
- src: url('Century Supra C3 Regular.otf') format('opentype'),
- url('Century Supra C3 Regular.ttf') format('truetype'),
- url('century_supra_c3_regular.woff') format('woff');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Century Supra (Small Caps)';
- src: url('Century Supra C3 Bold.otf') format('opentype'),
- url('Century Supra C3 Bold.ttf') format('truetype'),
- url('century_supra_c3_bold.woff') format('woff');
- font-weight: bold;
- font-style: normal;
-}
diff --git a/src/fonts/charter/Charter Bold Italic.otf b/src/fonts/charter/Charter Bold Italic.otf
new file mode 100644
index 0000000..f9f56df
Binary files /dev/null and b/src/fonts/charter/Charter Bold Italic.otf differ
diff --git a/src/fonts/charter/Charter Bold Italic.ttf b/src/fonts/charter/Charter Bold Italic.ttf
new file mode 100644
index 0000000..8bf2421
Binary files /dev/null and b/src/fonts/charter/Charter Bold Italic.ttf differ
diff --git a/src/fonts/charter/Charter Bold.otf b/src/fonts/charter/Charter Bold.otf
new file mode 100644
index 0000000..2c9089d
Binary files /dev/null and b/src/fonts/charter/Charter Bold.otf differ
diff --git a/src/fonts/charter/Charter Bold.ttf b/src/fonts/charter/Charter Bold.ttf
new file mode 100644
index 0000000..c8f7e85
Binary files /dev/null and b/src/fonts/charter/Charter Bold.ttf differ
diff --git a/src/fonts/charter/Charter Italic.otf b/src/fonts/charter/Charter Italic.otf
new file mode 100644
index 0000000..0b0917e
Binary files /dev/null and b/src/fonts/charter/Charter Italic.otf differ
diff --git a/src/fonts/charter/Charter Italic.ttf b/src/fonts/charter/Charter Italic.ttf
new file mode 100644
index 0000000..a650121
Binary files /dev/null and b/src/fonts/charter/Charter Italic.ttf differ
diff --git a/src/fonts/charter/Charter Regular.otf b/src/fonts/charter/Charter Regular.otf
new file mode 100644
index 0000000..d2314d3
Binary files /dev/null and b/src/fonts/charter/Charter Regular.otf differ
diff --git a/src/fonts/charter/Charter Regular.ttf b/src/fonts/charter/Charter Regular.ttf
new file mode 100644
index 0000000..33c6d7c
Binary files /dev/null and b/src/fonts/charter/Charter Regular.ttf differ
diff --git a/src/fonts/charter/charter_bold.woff b/src/fonts/charter/charter_bold.woff
new file mode 100644
index 0000000..ebb9853
Binary files /dev/null and b/src/fonts/charter/charter_bold.woff differ
diff --git a/src/fonts/charter/charter_bold_italic.woff b/src/fonts/charter/charter_bold_italic.woff
new file mode 100644
index 0000000..b9047d9
Binary files /dev/null and b/src/fonts/charter/charter_bold_italic.woff differ
diff --git a/src/fonts/charter/charter_italic.woff b/src/fonts/charter/charter_italic.woff
new file mode 100644
index 0000000..526537c
Binary files /dev/null and b/src/fonts/charter/charter_italic.woff differ
diff --git a/src/fonts/charter/charter_regular.woff b/src/fonts/charter/charter_regular.woff
new file mode 100644
index 0000000..92e57b1
Binary files /dev/null and b/src/fonts/charter/charter_regular.woff differ
diff --git a/src/fonts/charter/stylesheet.css.pp b/src/fonts/charter/stylesheet.css.pp
new file mode 100644
index 0000000..8372bfc
--- /dev/null
+++ b/src/fonts/charter/stylesheet.css.pp
@@ -0,0 +1,37 @@
+#lang pollen
+
+@font-face {
+ font-family: 'Charter';
+ src: url('Charter Regular.otf') format('opentype'),
+ url('Charter Regular.ttf') format('truetype'),
+ url('charter_regular.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Charter';
+ src: url('Charter Bold.otf') format('opentype'),
+ url('Charter Bold.ttf') format('truetype'),
+ url('charter_bold.woff') format('woff');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Charter';
+ src: url('Charter Italic.otf') format('opentype'),
+ url('Charter Italic.ttf') format('truetype'),
+ url('charter_italic.woff') format('woff');
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Charter';
+ src: url('Charter Bold Italic.otf') format('opentype'),
+ url('Charter Bold Italic.ttf') format('truetype'),
+ url('charter_bold_italic.woff') format('woff');
+ font-weight: bold;
+ font-style: italic;
+}
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Bold.eot b/src/fonts/cooper-hewitt/CooperHewitt-Bold.eot
new file mode 100644
index 0000000..64413dd
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Bold.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Bold.svg b/src/fonts/cooper-hewitt/CooperHewitt-Bold.svg
new file mode 100644
index 0000000..a15c8fb
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Bold.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Bold.woff b/src/fonts/cooper-hewitt/CooperHewitt-Bold.woff
new file mode 100644
index 0000000..b33ac1b
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Bold.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.eot
new file mode 100644
index 0000000..5d840dc
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.svg
new file mode 100644
index 0000000..bd6764f
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.woff
new file mode 100644
index 0000000..a71b6a9
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-BoldItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Book.eot b/src/fonts/cooper-hewitt/CooperHewitt-Book.eot
new file mode 100644
index 0000000..07cb19d
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Book.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Book.svg b/src/fonts/cooper-hewitt/CooperHewitt-Book.svg
new file mode 100644
index 0000000..12ee232
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Book.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Book.woff b/src/fonts/cooper-hewitt/CooperHewitt-Book.woff
new file mode 100644
index 0000000..a4d6974
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Book.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.eot
new file mode 100644
index 0000000..6aee4b3
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.svg
new file mode 100644
index 0000000..4599ddd
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.woff
new file mode 100644
index 0000000..ce8d73b
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-BookItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Heavy.eot b/src/fonts/cooper-hewitt/CooperHewitt-Heavy.eot
new file mode 100644
index 0000000..76be7d8
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Heavy.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Heavy.svg b/src/fonts/cooper-hewitt/CooperHewitt-Heavy.svg
new file mode 100644
index 0000000..4703374
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Heavy.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Heavy.woff b/src/fonts/cooper-hewitt/CooperHewitt-Heavy.woff
new file mode 100644
index 0000000..5242ac0
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Heavy.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.eot
new file mode 100644
index 0000000..a38af56
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.svg
new file mode 100644
index 0000000..a589c7a
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.woff
new file mode 100644
index 0000000..52715fc
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-HeavyItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Light.eot b/src/fonts/cooper-hewitt/CooperHewitt-Light.eot
new file mode 100644
index 0000000..c0952b0
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Light.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Light.svg b/src/fonts/cooper-hewitt/CooperHewitt-Light.svg
new file mode 100644
index 0000000..131157d
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Light.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Light.woff b/src/fonts/cooper-hewitt/CooperHewitt-Light.woff
new file mode 100644
index 0000000..3c73d8c
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Light.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.eot
new file mode 100644
index 0000000..6d0e7f2
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.svg
new file mode 100644
index 0000000..d2e0172
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.woff
new file mode 100644
index 0000000..69e802e
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-LightItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Medium.eot b/src/fonts/cooper-hewitt/CooperHewitt-Medium.eot
new file mode 100644
index 0000000..7ff6e64
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Medium.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Medium.svg b/src/fonts/cooper-hewitt/CooperHewitt-Medium.svg
new file mode 100644
index 0000000..31b4002
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Medium.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Medium.woff b/src/fonts/cooper-hewitt/CooperHewitt-Medium.woff
new file mode 100644
index 0000000..23c99a7
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Medium.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.eot
new file mode 100644
index 0000000..2511727
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.svg
new file mode 100644
index 0000000..b3e46c7
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.woff
new file mode 100644
index 0000000..1d877a0
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-MediumItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Semibold.eot b/src/fonts/cooper-hewitt/CooperHewitt-Semibold.eot
new file mode 100644
index 0000000..08e7baf
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Semibold.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Semibold.svg b/src/fonts/cooper-hewitt/CooperHewitt-Semibold.svg
new file mode 100644
index 0000000..1d4b0af
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Semibold.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Semibold.woff b/src/fonts/cooper-hewitt/CooperHewitt-Semibold.woff
new file mode 100644
index 0000000..8f395de
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Semibold.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.eot
new file mode 100644
index 0000000..a512071
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.svg
new file mode 100644
index 0000000..61f3d72
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.woff
new file mode 100644
index 0000000..2d42dad
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-SemiboldItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Thin.eot b/src/fonts/cooper-hewitt/CooperHewitt-Thin.eot
new file mode 100644
index 0000000..f9a9898
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Thin.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Thin.svg b/src/fonts/cooper-hewitt/CooperHewitt-Thin.svg
new file mode 100644
index 0000000..6f95acd
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-Thin.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-Thin.woff b/src/fonts/cooper-hewitt/CooperHewitt-Thin.woff
new file mode 100644
index 0000000..6881032
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-Thin.woff differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.eot b/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.eot
new file mode 100644
index 0000000..1baa105
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.eot differ
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.svg b/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.svg
new file mode 100644
index 0000000..9b3d9aa
--- /dev/null
+++ b/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.woff b/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.woff
new file mode 100644
index 0000000..e1099c0
Binary files /dev/null and b/src/fonts/cooper-hewitt/CooperHewitt-ThinItalic.woff differ
diff --git a/src/fonts/cooper-hewitt/stylesheet.css.pp b/src/fonts/cooper-hewitt/stylesheet.css.pp
new file mode 100644
index 0000000..f9a405e
--- /dev/null
+++ b/src/fonts/cooper-hewitt/stylesheet.css.pp
@@ -0,0 +1,37 @@
+#lang pollen
+
+@font-face {
+ font-family: 'Cooper Hewitt';
+ src: url('CooperHewitt-Medium.eot'),
+ url('CooperHewitt-Medium.woff') format('woff'),
+ url('CooperHewitt-Medium.svg') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Cooper Hewitt';
+ src: url('CooperHewitt-Bold.eot'),
+ url('CooperHewitt-Bold.woff') format('woff'),
+ url('CooperHewitt-Bold.svg') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Cooper Hewitt';
+ src: url('CooperHewitt-Italic.eot'),
+ url('CooperHewitt-Italic.woff') format('woff'),
+ url('CooperHewitt-Italic.svg') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Cooper Hewitt';
+ src: url('CooperHewitt-BoldItalic.eot'),
+ url('CooperHewitt-BoldItalic.woff') format('woff'),
+ url('CooperHewitt-BoldItalic.svg') format('svg');
+ font-weight: bold;
+ font-style: italic;
+}
diff --git a/src/fonts/triplicate/Triplicate T4 Code Bold Italic.otf b/src/fonts/triplicate/Triplicate T4 Code Bold Italic.otf
deleted file mode 100644
index 2fba0fc..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Bold Italic.otf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Bold Italic.ttf b/src/fonts/triplicate/Triplicate T4 Code Bold Italic.ttf
deleted file mode 100644
index afcc16b..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Bold Italic.ttf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Bold.otf b/src/fonts/triplicate/Triplicate T4 Code Bold.otf
deleted file mode 100644
index 9618881..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Bold.otf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Bold.ttf b/src/fonts/triplicate/Triplicate T4 Code Bold.ttf
deleted file mode 100644
index 912e27b..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Bold.ttf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Italic.otf b/src/fonts/triplicate/Triplicate T4 Code Italic.otf
deleted file mode 100644
index a15b16c..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Italic.otf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Italic.ttf b/src/fonts/triplicate/Triplicate T4 Code Italic.ttf
deleted file mode 100644
index b0b8852..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Italic.ttf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Regular.otf b/src/fonts/triplicate/Triplicate T4 Code Regular.otf
deleted file mode 100644
index 28dabe0..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Regular.otf and /dev/null differ
diff --git a/src/fonts/triplicate/Triplicate T4 Code Regular.ttf b/src/fonts/triplicate/Triplicate T4 Code Regular.ttf
deleted file mode 100644
index 37d0e4e..0000000
Binary files a/src/fonts/triplicate/Triplicate T4 Code Regular.ttf and /dev/null differ
diff --git a/src/fonts/triplicate/stylesheet.css.pp b/src/fonts/triplicate/stylesheet.css.pp
deleted file mode 100644
index 32475f7..0000000
--- a/src/fonts/triplicate/stylesheet.css.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang pollen
-
-@font-face {
- font-family: 'Triplicate Code';
- src: url('Triplicate T4 Code Regular.otf') format('opentype'),
- url('Triplicate T4 Code Regular.ttf') format('truetype'),
- url('triplicate_t4_code_regular.woff') format('woff');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Triplicate Code';
- src: url('Triplicate T4 Code Bold.otf') format('opentype'),
- url('Triplicate T4 Code Bold.ttf') format('truetype'),
- url('triplicate_t4_code_bold.woff') format('woff');
- font-weight: bold;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Triplicate Code';
- src: url('Triplicate T4 Code Italic.otf') format('opentype'),
- url('Triplicate T4 Code Italic.ttf') format('truetype'),
- url('triplicate_t4_code_italic.woff') format('woff');
- font-weight: normal;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Triplicate Code';
- src: url('Triplicate T4 Code Bold Italic.otf') format('opentype'),
- url('Triplicate T4 Code Bold Italic.ttf') format('truetype'),
- url('triplicate_t4_code_bold_italic.woff') format('woff');
- font-weight: bold;
- font-style: italic;
-}
diff --git a/src/fonts/triplicate/triplicate_t4_code_bold.woff b/src/fonts/triplicate/triplicate_t4_code_bold.woff
deleted file mode 100644
index 8b86ffb..0000000
Binary files a/src/fonts/triplicate/triplicate_t4_code_bold.woff and /dev/null differ
diff --git a/src/fonts/triplicate/triplicate_t4_code_bold_italic.woff b/src/fonts/triplicate/triplicate_t4_code_bold_italic.woff
deleted file mode 100644
index 622f346..0000000
Binary files a/src/fonts/triplicate/triplicate_t4_code_bold_italic.woff and /dev/null differ
diff --git a/src/fonts/triplicate/triplicate_t4_code_italic.woff b/src/fonts/triplicate/triplicate_t4_code_italic.woff
deleted file mode 100644
index 4fbdc2e..0000000
Binary files a/src/fonts/triplicate/triplicate_t4_code_italic.woff and /dev/null differ
diff --git a/src/fonts/triplicate/triplicate_t4_code_regular.woff b/src/fonts/triplicate/triplicate_t4_code_regular.woff
deleted file mode 100644
index 7133e92..0000000
Binary files a/src/fonts/triplicate/triplicate_t4_code_regular.woff and /dev/null differ
diff --git a/src/pollen.rkt b/src/pollen.rkt
index 6e6447f..427eb70 100644
--- a/src/pollen.rkt
+++ b/src/pollen.rkt
@@ -77,8 +77,9 @@
(define (published-date date-str)
(let ((publish-date (iso8601->date date-str)))
- (txexpr
- 'p '((class "published-date")) `("Posted on " ,(~t publish-date "MMMM d, y")))))
+ `(p '((class "published-date"))
+ (small "Posted on "
+ ,(~t publish-date "MMMM d, y")))))
(define (make-excerpt doc)
(let ((elts (get-elements doc)))
diff --git a/src/stylesheet.css.pp b/src/stylesheet.css.pp
index f199ba9..fd90ca8 100644
--- a/src/stylesheet.css.pp
+++ b/src/stylesheet.css.pp
@@ -1,9 +1,10 @@
#lang pollen
◊(define navbar-height 60)
-◊(define serif-font-stack "'Century Supra', 'Palatino Linotype', Palatino, Palladio, 'URW Palladio L', 'Book Antiqua', Baskerville, 'Bookman Old Style', 'Bitstream Charter', 'Nimbus Roman No9 L', Garamond, 'Apple Garamond', 'ITC Garamond Narrow', 'New Century Schoolbook', 'Century Schoolbook', 'Century Schoolbook L', Georgia, serif")
-◊(define small-caps-font-stack "'Century Supra (Small Caps)', 'Palatino Linotype', Palatino, Palladio, 'URW Palladio L', 'Book Antiqua', Baskerville, 'Bookman Old Style', 'Bitstream Charter', 'Nimbus Roman No9 L', Garamond, 'Apple Garamond', 'ITC Garamond Narrow', 'New Century Schoolbook', 'Century Schoolbook', 'Century Schoolbook L', Georgia, serif")
-◊(define monospace-font-stack "'Triplicate Code', SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace")
+◊(define serif-font-stack "Charter, 'Palatino Linotype', Palatino, Palladio, 'URW Palladio L', 'Book Antiqua', Baskerville, 'Bookman Old Style', 'Bitstream Charter', 'Nimbus Roman No9 L', Garamond, 'Apple Garamond', 'ITC Garamond Narrow', 'New Century Schoolbook', 'Century Schoolbook', 'Century Schoolbook L', Georgia, serif")
+◊(define small-caps-font-stack "Charter, 'Palatino Linotype', Palatino, Palladio, 'URW Palladio L', 'Book Antiqua', Baskerville, 'Bookman Old Style', 'Bitstream Charter', 'Nimbus Roman No9 L', Garamond, 'Apple Garamond', 'ITC Garamond Narrow', 'New Century Schoolbook', 'Century Schoolbook', 'Century Schoolbook L', Georgia, serif")
+◊(define sans-serif-font-stack "'Cooper Hewitt', Frutiger, 'Frutiger Linotype', Univers, Calibri, 'Gill Sans', 'Gill Sans MT', 'Myriad Pro', Myriad, 'DejaVu Sans Condensed', 'Liberation Sans', 'Nimbus Sans L', Tahoma, Geneva, 'Helvetica Neue', Helvetica, Arial, sans-serif;")
+◊(define monospace-font-stack "Menlo, Consolas, Monaco, 'Liberation Mono', 'Lucida Console', monospace")
◊(define body-color "#404040")
◊(define link-color "royalblue")
◊(define link-hover-color "midnightblue")
@@ -13,10 +14,14 @@
◊(define blockquote-border-color "#CCC")
◊(define blockquote-background-color "#F9F9F9")
+html {
+ font-size: 20px;
+}
+
body {
height: 100%;
max-width: 1920px;
- font-size: 21px;
+ font-size: 1rem;
font-family: ◊|serif-font-stack|;
color: ◊|body-color|;
line-height: 1.5;
@@ -27,17 +32,37 @@ body {
header {
height: ◊|navbar-height|px;
- margin-top: 1em;
+ margin-top: 1rem;
}
footer {
text-align: center;
- padding: 1em 0 1em 0;
+ padding: 1rem 0 1rem 0;
}
h1, h2, h3, h4, h5 {
- font-size: 21px;
font-weight: bold;
+ font-family: ◊|sans-serif-font-stack|
+}
+
+h4, h5 {
+ font-size: 1rem;
+}
+
+h3 {
+ font-size: 1.25rem;
+}
+
+h2 {
+ font-size: 1.563rem;
+}
+
+h1 {
+ font-size: 1.953rem;
+}
+
+small {
+ font-size: 0.8rem;
}
a {
@@ -60,26 +85,26 @@ a:hover {
code, pre {
font-family: ◊|monospace-font-stack|;
- font-size: 20px;
+ font-size: 0.9rem;
}
ul, ol {
- margin: 0 0 1.5em 3em;
+ margin: 0 0 1.5rem 3rem;
}
li {
- margin-top: 1em;
+ margin-top: 1rem;
}
blockquote {
- margin: 1em 1.5em;
+ margin: 1rem 1.5rem;
border-left: 10px solid ◊|blockquote-border-color|;
background: ◊|blockquote-background-color|;
- padding: 1.3em 0.5em;
+ padding: 1.3rem 0.5rem;
}
pre > code.hljs {
- padding: 1.5em;
+ padding: 1.5rem;
}
.site {
@@ -93,7 +118,7 @@ pre > code.hljs {
display: grid;
grid-template-columns: repeat(12, 1fr);
grid-auto-rows: auto;
- grid-gap: 1rem;
+ grid-gap: 1rrem;
flex: 3;
}
@@ -115,16 +140,15 @@ ul.navigation {
ul.navigation > li {
display: inline;
- margin-left: 2em;
+ margin-left: 2rem;
margin-top: 0;
- font-family: ◊|small-caps-font-stack|;
- font-size: 25px;
+ font-family: ◊|sans-serif-font-stack|;
letter-spacing: 0.05rem;
}
ul.navigation > li.rss {
margin-left: auto;
- margin-right: 2em;
+ margin-right: 2rem;
}
ul.navigation > li > a {
@@ -137,16 +161,16 @@ ul.navigation > li > a:hover {
.float-left {
float: left;
- margin-right: 1em;
+ margin-right: 1rem;
}
.section-header {
- margin-top: 2em;
+ margin-top: 2rem;
}
div.divider {
- margin-top: 2em;
- margin-bottom: 2em;
+ margin-top: 2rem;
+ margin-bottom: 2rem;
border-top: 1px solid ◊|divider-color|;
}
@@ -161,6 +185,6 @@ div.divider {
}
ul, ol {
- margin: 0 0 1.5em 1em;
+ margin: 0 0 1.5rem 1rem;
}
}
diff --git a/src/template.html.p b/src/template.html.p
index 4309caf..5048c35 100644
--- a/src/template.html.p
+++ b/src/template.html.p
@@ -11,8 +11,8 @@
-
-
+
+