From 32df4881f8facc3dd19354f6a170a238a0e550c7 Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Mon, 25 Aug 2014 01:11:31 -0400 Subject: Switch to Garamond --- Makefile | 2 +- theme/static/css/3-crimson.css | 52 --------------------- theme/static/css/3-garamond.css | 20 ++++++++ theme/static/css/4-main.css | 4 +- theme/static/css/5-chapter.css | 2 +- theme/static/fonts/EBGaramond12-AllSC.eot | Bin 0 -> 70617 bytes theme/static/fonts/EBGaramond12-AllSC.ttf | Bin 0 -> 185640 bytes theme/static/fonts/EBGaramond12-AllSC.woff | Bin 0 -> 84012 bytes theme/static/fonts/EBGaramond12-Italic.eot | Bin 0 -> 144417 bytes theme/static/fonts/EBGaramond12-Italic.ttf | Bin 0 -> 359140 bytes theme/static/fonts/EBGaramond12-Italic.woff | Bin 0 -> 172212 bytes theme/static/fonts/EBGaramond12-Regular.eot | Bin 0 -> 208469 bytes theme/static/fonts/EBGaramond12-Regular.ttf | Bin 0 -> 529316 bytes theme/static/fonts/EBGaramond12-Regular.woff | Bin 0 -> 256208 bytes theme/static/fonts/EBGaramondSC12-Regular.eot | Bin 0 -> 169533 bytes theme/static/fonts/EBGaramondSC12-Regular.ttf | Bin 0 -> 421452 bytes theme/static/fonts/EBGaramondSC12-Regular.woff | Bin 0 -> 202192 bytes theme/static/fonts/crimson-bold-webfont.eot | Bin 42558 -> 0 bytes theme/static/fonts/crimson-bold-webfont.ttf | Bin 103624 -> 0 bytes theme/static/fonts/crimson-bold-webfont.woff | Bin 46756 -> 0 bytes theme/static/fonts/crimson-bolditalic-webfont.eot | Bin 45628 -> 0 bytes theme/static/fonts/crimson-bolditalic-webfont.ttf | Bin 106488 -> 0 bytes theme/static/fonts/crimson-bolditalic-webfont.woff | Bin 52556 -> 0 bytes theme/static/fonts/crimson-italic-webfont.eot | Bin 48875 -> 0 bytes theme/static/fonts/crimson-italic-webfont.ttf | Bin 115624 -> 0 bytes theme/static/fonts/crimson-italic-webfont.woff | Bin 54700 -> 0 bytes theme/static/fonts/crimson-roman-webfont.eot | Bin 44895 -> 0 bytes theme/static/fonts/crimson-roman-webfont.ttf | Bin 98328 -> 0 bytes theme/static/fonts/crimson-roman-webfont.woff | Bin 49236 -> 0 bytes 29 files changed, 25 insertions(+), 55 deletions(-) delete mode 100755 theme/static/css/3-crimson.css create mode 100755 theme/static/css/3-garamond.css create mode 100644 theme/static/fonts/EBGaramond12-AllSC.eot create mode 100644 theme/static/fonts/EBGaramond12-AllSC.ttf create mode 100644 theme/static/fonts/EBGaramond12-AllSC.woff create mode 100644 theme/static/fonts/EBGaramond12-Italic.eot create mode 100644 theme/static/fonts/EBGaramond12-Italic.ttf create mode 100644 theme/static/fonts/EBGaramond12-Italic.woff create mode 100644 theme/static/fonts/EBGaramond12-Regular.eot create mode 100644 theme/static/fonts/EBGaramond12-Regular.ttf create mode 100644 theme/static/fonts/EBGaramond12-Regular.woff create mode 100644 theme/static/fonts/EBGaramondSC12-Regular.eot create mode 100644 theme/static/fonts/EBGaramondSC12-Regular.ttf create mode 100644 theme/static/fonts/EBGaramondSC12-Regular.woff delete mode 100755 theme/static/fonts/crimson-bold-webfont.eot delete mode 100755 theme/static/fonts/crimson-bold-webfont.ttf delete mode 100755 theme/static/fonts/crimson-bold-webfont.woff delete mode 100755 theme/static/fonts/crimson-bolditalic-webfont.eot delete mode 100755 theme/static/fonts/crimson-bolditalic-webfont.ttf delete mode 100755 theme/static/fonts/crimson-bolditalic-webfont.woff delete mode 100755 theme/static/fonts/crimson-italic-webfont.eot delete mode 100755 theme/static/fonts/crimson-italic-webfont.ttf delete mode 100755 theme/static/fonts/crimson-italic-webfont.woff delete mode 100755 theme/static/fonts/crimson-roman-webfont.eot delete mode 100755 theme/static/fonts/crimson-roman-webfont.ttf delete mode 100755 theme/static/fonts/crimson-roman-webfont.woff diff --git a/Makefile b/Makefile index b6c9b42..158689b 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ js_dir=static/js css_dir=static/css js_files=$(wildcard $(THEME_DIR)/$(js_dir)/*.js) css_files=$(sort $(wildcard $(THEME_DIR)/$(css_dir)/*.css)) -render_sources=$(wildcard $(CLEAN_DIR)/*.html) +render_sources=$(wildcard $(HTML_DIR)/*.html) render_targets=$(addprefix $(BUILD_DIR)/, $(notdir $(render_sources))) .PHONY: render cssmin jsmin assets render all jslint csslint diff --git a/theme/static/css/3-crimson.css b/theme/static/css/3-crimson.css deleted file mode 100755 index a956352..0000000 --- a/theme/static/css/3-crimson.css +++ /dev/null @@ -1,52 +0,0 @@ -@font-face { - font-family: 'crimson'; - src: url('../fonts/crimson-bold-webfont.eot'); - src: url('../fonts/crimson-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/crimson-bold-webfont.woff') format('woff'), - url('../fonts/crimson-bold-webfont.ttf') format('truetype'); - font-weight: bold; - font-style: normal; - -} - - - - -@font-face { - font-family: 'crimson'; - src: url('../fonts/crimson-bolditalic-webfont.eot'); - src: url('../fonts/crimson-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/crimson-bolditalic-webfont.woff') format('woff'), - url('../fonts/crimson-bolditalic-webfont.ttf') format('truetype'); - font-weight: bold; - font-style: italic; - -} - - - - -@font-face { - font-family: 'crimson'; - src: url('../fonts/crimson-italic-webfont.eot'); - src: url('../fonts/crimson-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/crimson-italic-webfont.woff') format('woff'), - url('../fonts/crimson-italic-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: italic; - -} - - - - -@font-face { - font-family: 'crimson'; - src: url('../fonts/crimson-roman-webfont.eot'); - src: url('../fonts/crimson-roman-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/crimson-roman-webfont.woff') format('woff'), - url('../fonts/crimson-roman-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} diff --git a/theme/static/css/3-garamond.css b/theme/static/css/3-garamond.css new file mode 100755 index 0000000..febedec --- /dev/null +++ b/theme/static/css/3-garamond.css @@ -0,0 +1,20 @@ +@font-face { + font-family: 'garamond'; + src: url('../fonts/EBGaramond12-Regular.eot'); + src: url('../fonts/EBGaramond12-Regular.eot?#iefix') format('embedded-opentype'), + url('../fonts/EBGaramond12-Regular.woff') format('woff'), + url('../fonts/EBGaramond12-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'garamond'; + src: url('../fonts/EBGaramond12-Italic.eot'); + src: url('../fonts/EBGaramond12-Italic.eot?#iefix') format('embedded-opentype'), + url('../fonts/EBGaramond12-Italic.woff') format('woff'), + url('../fonts/EBGaramond12-Italic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; +} diff --git a/theme/static/css/4-main.css b/theme/static/css/4-main.css index ac423fa..9517a13 100644 --- a/theme/static/css/4-main.css +++ b/theme/static/css/4-main.css @@ -4,9 +4,11 @@ html { } body { - font-family: "EB Garamond"; + font-family: "garamond"; margin: 0; padding: 0; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; } div.main { diff --git a/theme/static/css/5-chapter.css b/theme/static/css/5-chapter.css index 0df2989..f9684d5 100644 --- a/theme/static/css/5-chapter.css +++ b/theme/static/css/5-chapter.css @@ -48,7 +48,7 @@ section.chapter > p:first-of-type { } section.chapter > p:first-of-type:first-letter { - font-size: 2.5em; + font-size: 2em; } section.chapter blockquote.epigraph { diff --git a/theme/static/fonts/EBGaramond12-AllSC.eot b/theme/static/fonts/EBGaramond12-AllSC.eot new file mode 100644 index 0000000..85c2060 Binary files /dev/null and b/theme/static/fonts/EBGaramond12-AllSC.eot differ diff --git a/theme/static/fonts/EBGaramond12-AllSC.ttf b/theme/static/fonts/EBGaramond12-AllSC.ttf new file mode 100644 index 0000000..6d7fd85 Binary files /dev/null and b/theme/static/fonts/EBGaramond12-AllSC.ttf differ diff --git a/theme/static/fonts/EBGaramond12-AllSC.woff b/theme/static/fonts/EBGaramond12-AllSC.woff new file mode 100644 index 0000000..2f2ccc8 Binary files /dev/null and b/theme/static/fonts/EBGaramond12-AllSC.woff differ diff --git a/theme/static/fonts/EBGaramond12-Italic.eot b/theme/static/fonts/EBGaramond12-Italic.eot new file mode 100644 index 0000000..3b1ab1c Binary files /dev/null and b/theme/static/fonts/EBGaramond12-Italic.eot differ diff --git a/theme/static/fonts/EBGaramond12-Italic.ttf b/theme/static/fonts/EBGaramond12-Italic.ttf new file mode 100644 index 0000000..f21c8b9 Binary files /dev/null and b/theme/static/fonts/EBGaramond12-Italic.ttf differ diff --git a/theme/static/fonts/EBGaramond12-Italic.woff b/theme/static/fonts/EBGaramond12-Italic.woff new file mode 100644 index 0000000..fe650d3 Binary files /dev/null and b/theme/static/fonts/EBGaramond12-Italic.woff differ diff --git a/theme/static/fonts/EBGaramond12-Regular.eot b/theme/static/fonts/EBGaramond12-Regular.eot new file mode 100644 index 0000000..abd8e0b Binary files /dev/null and b/theme/static/fonts/EBGaramond12-Regular.eot differ diff --git a/theme/static/fonts/EBGaramond12-Regular.ttf b/theme/static/fonts/EBGaramond12-Regular.ttf new file mode 100644 index 0000000..ef98087 Binary files /dev/null and b/theme/static/fonts/EBGaramond12-Regular.ttf differ diff --git a/theme/static/fonts/EBGaramond12-Regular.woff b/theme/static/fonts/EBGaramond12-Regular.woff new file mode 100644 index 0000000..ab3118b Binary files /dev/null and b/theme/static/fonts/EBGaramond12-Regular.woff differ diff --git a/theme/static/fonts/EBGaramondSC12-Regular.eot b/theme/static/fonts/EBGaramondSC12-Regular.eot new file mode 100644 index 0000000..f8e8040 Binary files /dev/null and b/theme/static/fonts/EBGaramondSC12-Regular.eot differ diff --git a/theme/static/fonts/EBGaramondSC12-Regular.ttf b/theme/static/fonts/EBGaramondSC12-Regular.ttf new file mode 100644 index 0000000..a112014 Binary files /dev/null and b/theme/static/fonts/EBGaramondSC12-Regular.ttf differ diff --git a/theme/static/fonts/EBGaramondSC12-Regular.woff b/theme/static/fonts/EBGaramondSC12-Regular.woff new file mode 100644 index 0000000..c503877 Binary files /dev/null and b/theme/static/fonts/EBGaramondSC12-Regular.woff differ diff --git a/theme/static/fonts/crimson-bold-webfont.eot b/theme/static/fonts/crimson-bold-webfont.eot deleted file mode 100755 index 2bb528f..0000000 Binary files a/theme/static/fonts/crimson-bold-webfont.eot and /dev/null differ diff --git a/theme/static/fonts/crimson-bold-webfont.ttf b/theme/static/fonts/crimson-bold-webfont.ttf deleted file mode 100755 index 15b2d05..0000000 Binary files a/theme/static/fonts/crimson-bold-webfont.ttf and /dev/null differ diff --git a/theme/static/fonts/crimson-bold-webfont.woff b/theme/static/fonts/crimson-bold-webfont.woff deleted file mode 100755 index 6912e5b..0000000 Binary files a/theme/static/fonts/crimson-bold-webfont.woff and /dev/null differ diff --git a/theme/static/fonts/crimson-bolditalic-webfont.eot b/theme/static/fonts/crimson-bolditalic-webfont.eot deleted file mode 100755 index 99231ea..0000000 Binary files a/theme/static/fonts/crimson-bolditalic-webfont.eot and /dev/null differ diff --git a/theme/static/fonts/crimson-bolditalic-webfont.ttf b/theme/static/fonts/crimson-bolditalic-webfont.ttf deleted file mode 100755 index bf25c82..0000000 Binary files a/theme/static/fonts/crimson-bolditalic-webfont.ttf and /dev/null differ diff --git a/theme/static/fonts/crimson-bolditalic-webfont.woff b/theme/static/fonts/crimson-bolditalic-webfont.woff deleted file mode 100755 index 602f47f..0000000 Binary files a/theme/static/fonts/crimson-bolditalic-webfont.woff and /dev/null differ diff --git a/theme/static/fonts/crimson-italic-webfont.eot b/theme/static/fonts/crimson-italic-webfont.eot deleted file mode 100755 index c203656..0000000 Binary files a/theme/static/fonts/crimson-italic-webfont.eot and /dev/null differ diff --git a/theme/static/fonts/crimson-italic-webfont.ttf b/theme/static/fonts/crimson-italic-webfont.ttf deleted file mode 100755 index 1474d2b..0000000 Binary files a/theme/static/fonts/crimson-italic-webfont.ttf and /dev/null differ diff --git a/theme/static/fonts/crimson-italic-webfont.woff b/theme/static/fonts/crimson-italic-webfont.woff deleted file mode 100755 index 4852820..0000000 Binary files a/theme/static/fonts/crimson-italic-webfont.woff and /dev/null differ diff --git a/theme/static/fonts/crimson-roman-webfont.eot b/theme/static/fonts/crimson-roman-webfont.eot deleted file mode 100755 index b546e2d..0000000 Binary files a/theme/static/fonts/crimson-roman-webfont.eot and /dev/null differ diff --git a/theme/static/fonts/crimson-roman-webfont.ttf b/theme/static/fonts/crimson-roman-webfont.ttf deleted file mode 100755 index c9bfa97..0000000 Binary files a/theme/static/fonts/crimson-roman-webfont.ttf and /dev/null differ diff --git a/theme/static/fonts/crimson-roman-webfont.woff b/theme/static/fonts/crimson-roman-webfont.woff deleted file mode 100755 index cc07a3a..0000000 Binary files a/theme/static/fonts/crimson-roman-webfont.woff and /dev/null differ -- cgit v1.2.3-70-g09d2