From 97ffc0ec4fbdcda7c0f9090a2d71acd44e4c4f84 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 3 Mar 2015 00:48:32 -0700 Subject: Make fonts real web fonts --- css/common.css | 14 ++-- css/fonts/FiraSans-Bold.otf | Bin 156868 -> 0 bytes css/fonts/FiraSans-BoldItalic.otf | Bin 160152 -> 0 bytes css/fonts/FiraSans-ExtraBold.otf | Bin 157024 -> 0 bytes css/fonts/FiraSans-ExtraBoldItalic.otf | Bin 161376 -> 0 bytes css/fonts/FiraSans-Hair.otf | Bin 244880 -> 0 bytes css/fonts/FiraSans-HairItalic.otf | Bin 259132 -> 0 bytes css/fonts/FiraSans-Heavy.otf | Bin 154364 -> 0 bytes css/fonts/FiraSans-HeavyItalic.otf | Bin 158724 -> 0 bytes css/fonts/FiraSans-Italic.otf | Bin 155200 -> 0 bytes css/fonts/FiraSans-Light.otf | Bin 151640 -> 0 bytes css/fonts/FiraSans-LightItalic.otf | Bin 155692 -> 0 bytes css/fonts/FiraSans-Medium.otf | Bin 154464 -> 0 bytes css/fonts/FiraSans-MediumItalic.otf | Bin 158552 -> 0 bytes css/fonts/FiraSans-Regular.otf | Bin 151472 -> 0 bytes css/fonts/FiraSans-SemiBold.otf | Bin 155296 -> 0 bytes css/fonts/FiraSans-SemiBoldItalic.otf | Bin 159160 -> 0 bytes css/fonts/FiraSans-UltraLight.otf | Bin 151688 -> 0 bytes css/fonts/FiraSans-UltraLightItalic.otf | Bin 155872 -> 0 bytes css/fonts/PlayfairDisplay-Black.otf | Bin 156104 -> 0 bytes css/fonts/PlayfairDisplay-BlackItalic.otf | Bin 146040 -> 0 bytes css/fonts/PlayfairDisplay-Bold.otf | Bin 158148 -> 0 bytes css/fonts/PlayfairDisplay-BoldItalic.otf | Bin 153672 -> 0 bytes css/fonts/PlayfairDisplay-Italic.otf | Bin 144252 -> 0 bytes css/fonts/PlayfairDisplay-Regular.otf | Bin 148580 -> 0 bytes css/fonts/PlayfairDisplaySC-Black.ttf | Bin 155088 -> 0 bytes css/fonts/PlayfairDisplaySC-BlackItalic.ttf | Bin 155512 -> 0 bytes css/fonts/PlayfairDisplaySC-Bold.ttf | Bin 157092 -> 0 bytes css/fonts/PlayfairDisplaySC-BoldItalic.ttf | Bin 154024 -> 0 bytes css/fonts/PlayfairDisplaySC-Italic.ttf | Bin 149740 -> 0 bytes css/fonts/PlayfairDisplaySC-Regular.ttf | Bin 153236 -> 0 bytes css/fonts/fira.css | 121 ---------------------------- css/fonts/playfair.css | 98 ---------------------- 33 files changed, 8 insertions(+), 225 deletions(-) delete mode 100644 css/fonts/FiraSans-Bold.otf delete mode 100644 css/fonts/FiraSans-BoldItalic.otf delete mode 100644 css/fonts/FiraSans-ExtraBold.otf delete mode 100644 css/fonts/FiraSans-ExtraBoldItalic.otf delete mode 100644 css/fonts/FiraSans-Hair.otf delete mode 100644 css/fonts/FiraSans-HairItalic.otf delete mode 100644 css/fonts/FiraSans-Heavy.otf delete mode 100644 css/fonts/FiraSans-HeavyItalic.otf delete mode 100644 css/fonts/FiraSans-Italic.otf delete mode 100644 css/fonts/FiraSans-Light.otf delete mode 100644 css/fonts/FiraSans-LightItalic.otf delete mode 100644 css/fonts/FiraSans-Medium.otf delete mode 100644 css/fonts/FiraSans-MediumItalic.otf delete mode 100644 css/fonts/FiraSans-Regular.otf delete mode 100644 css/fonts/FiraSans-SemiBold.otf delete mode 100644 css/fonts/FiraSans-SemiBoldItalic.otf delete mode 100644 css/fonts/FiraSans-UltraLight.otf delete mode 100644 css/fonts/FiraSans-UltraLightItalic.otf delete mode 100644 css/fonts/PlayfairDisplay-Black.otf delete mode 100644 css/fonts/PlayfairDisplay-BlackItalic.otf delete mode 100644 css/fonts/PlayfairDisplay-Bold.otf delete mode 100644 css/fonts/PlayfairDisplay-BoldItalic.otf delete mode 100644 css/fonts/PlayfairDisplay-Italic.otf delete mode 100644 css/fonts/PlayfairDisplay-Regular.otf delete mode 100644 css/fonts/PlayfairDisplaySC-Black.ttf delete mode 100644 css/fonts/PlayfairDisplaySC-BlackItalic.ttf delete mode 100644 css/fonts/PlayfairDisplaySC-Bold.ttf delete mode 100644 css/fonts/PlayfairDisplaySC-BoldItalic.ttf delete mode 100644 css/fonts/PlayfairDisplaySC-Italic.ttf delete mode 100644 css/fonts/PlayfairDisplaySC-Regular.ttf delete mode 100644 css/fonts/fira.css delete mode 100644 css/fonts/playfair.css diff --git a/css/common.css b/css/common.css index 411086c..190aea6 100644 --- a/css/common.css +++ b/css/common.css @@ -7,14 +7,16 @@ * vim: fdm=marker */ /* Import rules {{{ */ -@import url("fonts/playfair.css"); -@import url("fonts/fira.css"); +/* Playfair Display (headings) */ +@import url(http://fonts.googleapis.com/css?family=Playfair+Display:400,700,400italic,700italic&subset=latin,latin-ext); +/* Fira Sans (body) */ +@import url(http://code.cdn.mozilla.net/fonts/fira.css); /* @import url("fonts/courier-prime.css"); * ^^^^^^ for typewriter pages in Paul */ /* }}} */ /* Body & Links {{{ */ html, body { - font-family: Fira, sans-serif; + font-family: "Fira Sans", sans-serif; font-size: 12pt; margin: 0; padding: 0; @@ -75,7 +77,7 @@ header { } /* headings */ h1.title { - font-family: Playfair, serif; + font-family: "Playfair Display", serif; font-size: 16pt; /* font-weight: bold; */ font-weight: 400; @@ -83,7 +85,7 @@ h1.title { text-transform: uppercase; } h1.subtitle { - font-family: Playfair, serif; + font-family: "Playfair Display", serif; font-size: 15pt; font-style: italic; font-weight: 400; @@ -91,7 +93,7 @@ h1.subtitle { top: -0.5em; } h2 { - font-family: Fira, sans-serif; + font-family: "Fira Sans", sans-serif; font-size: 14pt; font-weight: 600; } diff --git a/css/fonts/FiraSans-Bold.otf b/css/fonts/FiraSans-Bold.otf deleted file mode 100644 index 5fdf4e3..0000000 Binary files a/css/fonts/FiraSans-Bold.otf and /dev/null differ diff --git a/css/fonts/FiraSans-BoldItalic.otf b/css/fonts/FiraSans-BoldItalic.otf deleted file mode 100644 index afeb8aa..0000000 Binary files a/css/fonts/FiraSans-BoldItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-ExtraBold.otf b/css/fonts/FiraSans-ExtraBold.otf deleted file mode 100644 index 341ae41..0000000 Binary files a/css/fonts/FiraSans-ExtraBold.otf and /dev/null differ diff --git a/css/fonts/FiraSans-ExtraBoldItalic.otf b/css/fonts/FiraSans-ExtraBoldItalic.otf deleted file mode 100644 index b09dc88..0000000 Binary files a/css/fonts/FiraSans-ExtraBoldItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-Hair.otf b/css/fonts/FiraSans-Hair.otf deleted file mode 100644 index 7ecc18e..0000000 Binary files a/css/fonts/FiraSans-Hair.otf and /dev/null differ diff --git a/css/fonts/FiraSans-HairItalic.otf b/css/fonts/FiraSans-HairItalic.otf deleted file mode 100644 index dfd2902..0000000 Binary files a/css/fonts/FiraSans-HairItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-Heavy.otf b/css/fonts/FiraSans-Heavy.otf deleted file mode 100644 index ee58ef3..0000000 Binary files a/css/fonts/FiraSans-Heavy.otf and /dev/null differ diff --git a/css/fonts/FiraSans-HeavyItalic.otf b/css/fonts/FiraSans-HeavyItalic.otf deleted file mode 100644 index f1fa3d0..0000000 Binary files a/css/fonts/FiraSans-HeavyItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-Italic.otf b/css/fonts/FiraSans-Italic.otf deleted file mode 100644 index c73dcd6..0000000 Binary files a/css/fonts/FiraSans-Italic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-Light.otf b/css/fonts/FiraSans-Light.otf deleted file mode 100644 index ac224b8..0000000 Binary files a/css/fonts/FiraSans-Light.otf and /dev/null differ diff --git a/css/fonts/FiraSans-LightItalic.otf b/css/fonts/FiraSans-LightItalic.otf deleted file mode 100644 index 32c6a40..0000000 Binary files a/css/fonts/FiraSans-LightItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-Medium.otf b/css/fonts/FiraSans-Medium.otf deleted file mode 100644 index a027450..0000000 Binary files a/css/fonts/FiraSans-Medium.otf and /dev/null differ diff --git a/css/fonts/FiraSans-MediumItalic.otf b/css/fonts/FiraSans-MediumItalic.otf deleted file mode 100644 index 71f968c..0000000 Binary files a/css/fonts/FiraSans-MediumItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-Regular.otf b/css/fonts/FiraSans-Regular.otf deleted file mode 100644 index 1efd98a..0000000 Binary files a/css/fonts/FiraSans-Regular.otf and /dev/null differ diff --git a/css/fonts/FiraSans-SemiBold.otf b/css/fonts/FiraSans-SemiBold.otf deleted file mode 100644 index 3f4a808..0000000 Binary files a/css/fonts/FiraSans-SemiBold.otf and /dev/null differ diff --git a/css/fonts/FiraSans-SemiBoldItalic.otf b/css/fonts/FiraSans-SemiBoldItalic.otf deleted file mode 100644 index 4ef1fae..0000000 Binary files a/css/fonts/FiraSans-SemiBoldItalic.otf and /dev/null differ diff --git a/css/fonts/FiraSans-UltraLight.otf b/css/fonts/FiraSans-UltraLight.otf deleted file mode 100644 index 4aba4de..0000000 Binary files a/css/fonts/FiraSans-UltraLight.otf and /dev/null differ diff --git a/css/fonts/FiraSans-UltraLightItalic.otf b/css/fonts/FiraSans-UltraLightItalic.otf deleted file mode 100644 index 852454d..0000000 Binary files a/css/fonts/FiraSans-UltraLightItalic.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplay-Black.otf b/css/fonts/PlayfairDisplay-Black.otf deleted file mode 100644 index 0d73b1c..0000000 Binary files a/css/fonts/PlayfairDisplay-Black.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplay-BlackItalic.otf b/css/fonts/PlayfairDisplay-BlackItalic.otf deleted file mode 100644 index cd8bce8..0000000 Binary files a/css/fonts/PlayfairDisplay-BlackItalic.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplay-Bold.otf b/css/fonts/PlayfairDisplay-Bold.otf deleted file mode 100644 index ba9044b..0000000 Binary files a/css/fonts/PlayfairDisplay-Bold.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplay-BoldItalic.otf b/css/fonts/PlayfairDisplay-BoldItalic.otf deleted file mode 100644 index e4c85e9..0000000 Binary files a/css/fonts/PlayfairDisplay-BoldItalic.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplay-Italic.otf b/css/fonts/PlayfairDisplay-Italic.otf deleted file mode 100644 index 2cba927..0000000 Binary files a/css/fonts/PlayfairDisplay-Italic.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplay-Regular.otf b/css/fonts/PlayfairDisplay-Regular.otf deleted file mode 100644 index a3e5773..0000000 Binary files a/css/fonts/PlayfairDisplay-Regular.otf and /dev/null differ diff --git a/css/fonts/PlayfairDisplaySC-Black.ttf b/css/fonts/PlayfairDisplaySC-Black.ttf deleted file mode 100644 index 18fcb2a..0000000 Binary files a/css/fonts/PlayfairDisplaySC-Black.ttf and /dev/null differ diff --git a/css/fonts/PlayfairDisplaySC-BlackItalic.ttf b/css/fonts/PlayfairDisplaySC-BlackItalic.ttf deleted file mode 100644 index 4c952ca..0000000 Binary files a/css/fonts/PlayfairDisplaySC-BlackItalic.ttf and /dev/null differ diff --git a/css/fonts/PlayfairDisplaySC-Bold.ttf b/css/fonts/PlayfairDisplaySC-Bold.ttf deleted file mode 100644 index 5a88505..0000000 Binary files a/css/fonts/PlayfairDisplaySC-Bold.ttf and /dev/null differ diff --git a/css/fonts/PlayfairDisplaySC-BoldItalic.ttf b/css/fonts/PlayfairDisplaySC-BoldItalic.ttf deleted file mode 100644 index 0bd311d..0000000 Binary files a/css/fonts/PlayfairDisplaySC-BoldItalic.ttf and /dev/null differ diff --git a/css/fonts/PlayfairDisplaySC-Italic.ttf b/css/fonts/PlayfairDisplaySC-Italic.ttf deleted file mode 100644 index 5450163..0000000 Binary files a/css/fonts/PlayfairDisplaySC-Italic.ttf and /dev/null differ diff --git a/css/fonts/PlayfairDisplaySC-Regular.ttf b/css/fonts/PlayfairDisplaySC-Regular.ttf deleted file mode 100644 index 1ed6bc5..0000000 Binary files a/css/fonts/PlayfairDisplaySC-Regular.ttf and /dev/null differ diff --git a/css/fonts/fira.css b/css/fonts/fira.css deleted file mode 100644 index d26d8f3..0000000 --- a/css/fonts/fira.css +++ /dev/null @@ -1,121 +0,0 @@ -/* FIRA FONT for Autocento project. - * ONLY PUT @font-face RULES HERE. - */ - -/* Hair = 100 */ -@font-face { - font-family: Fira; - font-weight: 100; - font-style: normal; - src: url(FiraSans-Hair.otf); -} -@font-face { - font-family: Fira; - font-weight: 100; - font-style: italic; - src: url(FiraSans-HairItalic.otf); -} -/* Ultralight = 200 */ -@font-face { - font-family: Fira; - font-weight: 200; - font-style: normal; - src: url(FiraSans-UltraLight.otf); -} -@font-face { - font-family: Fira; - font-weight: 200; - font-style: italic; - src: url(FiraSans-UltraLightItalic.otf); -} -/* Light = 300 */ -@font-face { - font-family: Fira; - font-weight: 300; - font-style: normal; - src: url(FiraSans-Light.otf); -} -@font-face { - font-family: Fira; - font-weight: 300; - font-style: italic; - src: url(FiraSans-LightItalic.otf); -} -/* Regular = 400 */ -@font-face { - font-family: Fira; - font-weight: 400; - font-style: normal; - src: url(FiraSans-Regular.otf); -} -@font-face { - font-family: Fira; - font-weight: 400; - font-style: italic; - src: url(FiraSans-Italic.otf); -} -/* Medium = 500 */ -@font-face { - font-family: Fira; - font-weight: 500; - font-style: normal; - src: url(FiraSans-Medium.otf); -} -@font-face { - font-family: Fira; - font-weight: 500; - font-style: italic; - src: url(FiraSans-MediumItalic.otf); -} -/* Semibold = 600 */ -@font-face { - font-family: Fira; - font-weight: 600; - font-style: normal; - src: url(FiraSans-SemiBold.otf); -} -@font-face { - font-family: Fira; - font-weight: 600; - font-style: italic; - src: url(FiraSans-SemiBoldItalic.otf); -} -/* Bold = 700 */ -@font-face { - font-family: Fira; - font-weight: 700; - font-style: normal; - src: url(FiraSans-Bold.otf); -} -@font-face { - font-family: Fira; - font-weight: 700; - font-style: italic; - src: url(FiraSans-BoldItalic.otf); -} -/* Bold = 800 */ -@font-face { - font-family: Fira; - font-weight: 800; - font-style: normal; - src: url(FiraSans-ExtraBold.otf); -} -@font-face { - font-family: Fira; - font-weight: 800; - font-style: italic; - src: url(FiraSans-ExtraBoldItalic.otf); -} -/* Heavy = 900 */ -@font-face { - font-family: Fira; - font-weight: 900; - font-style: normal; - src: url(FiraSans-Heavy.otf); -} -@font-face { - font-family: Fira; - font-weight: 900; - font-style: italic; - src: url(FiraSans-HeavyItalic.otf); -} diff --git a/css/fonts/playfair.css b/css/fonts/playfair.css deleted file mode 100644 index 9fcb95a..0000000 --- a/css/fonts/playfair.css +++ /dev/null @@ -1,98 +0,0 @@ -/* PLAYFAIR DISPLAY FONT for Autocento project. - * ONLY PUT @font-face RULES HERE. - * vim: fdm=marker - */ -/* NORMAL VARIANT {{{ */ -/* Regular = 400 */ -@font-face { - font-family: Playfair; - font-variant: normal; - font-weight: 400; - font-style: normal; - src: url("PlayfairDisplay-Regular.otf"); -} -@font-face { - font-family: Playfair; - font-variant: normal; - font-weight: 400; - font-style: italic; - src: url("PlayfairDisplay-Italic.otf"); -} -/* Bold = 700 */ -@font-face { - font-family: Playfair; - font-variant: normal; - font-weight: 700; - font-style: normal; - src: url("PlayfairDisplay-Bold.otf"); -} -@font-face { - font-family: Playfair; - font-variant: normal; - font-weight: 700; - font-style: italic; - src: url("PlayfairDisplay-BoldItalic.otf"); -} -/* Black = 900 */ -@font-face { - font-family: Playfair; - font-variant: normal; - font-weight: 900; - font-style: normal; - src: url("PlayfairDisplay-Black.otf"); -} -@font-face { - font-family: Playfair; - font-variant: normal; - font-weight: 900; - font-style: italic; - src: url("PlayfairDisplay-BlackItalic.otf"); -} -/* }}} */ -/* SMALL CAPS VARIANT {{{ */ -/* Regular = 400 */ -@font-face { - font-family: PlayfairSC; - font-variant: small-caps; - font-weight: 400; - font-style: normal; - src: url("PlayfairDisplaySC-Regular.ttf"); -} -@font-face { - font-family: PlayfairSC; - font-variant: small-caps; - font-weight: 400; - font-style: italic; - src: url("PlayfairDisplaySC-Italic.ttf"); -} -/* Bold = 700 */ -@font-face { - font-family: PlayfairSC; - font-variant: small-caps; - font-weight: 700; - font-style: normal; - src: url("PlayfairDisplaySC-Bold.ttf"); -} -@font-face { - font-family: PlayfairSC; - font-variant: small-caps; - font-weight: 700; - font-style: italic; - src: url("PlayfairDisplaySC-BoldItalic.ttf"); -} -/* Black = 900 */ -@font-face { - font-family: PlayfairSC; - font-variant: small-caps; - font-weight: 900; - font-style: normal; - src: url("PlayfairDisplaySC-Black.ttf"); -} -@font-face { - font-family: PlayfairSC; - font-variant: small-caps; - font-weight: 900; - font-style: italic; - src: url("PlayfairDisplaySC-BlackItalic.ttf"); -} -/* }}} */ -- cgit 1.4.1-21-gabe81