diff --git a/css/crimson.css b/css/crimson.css new file mode 100644 index 0000000..3a3f447 --- /dev/null +++ b/css/crimson.css @@ -0,0 +1,42 @@ +@font-face { + font-family: 'CrimsonBold'; + src: url('/fonts/crimson/CrimsonBold.ttf') format('truetype'); + font-weight: bold; + font-style: normal; + } + +@font-face { + font-family: 'CrimsonBoldItalic'; + src: url('/fonts/crimson/CrimsonBoldItalic.ttf') format('truetype'); + font-weight: bold; + font-style: italic; + } + +@font-face { + font-family: 'CrimsonItalic'; + src: url('/fonts/crimson/CrimsonItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'CrimsonRoman'; + src: url('/fonts/crimson/CrimsonRoman.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'CrimsonSemibold'; + src: url('/fonts/crimson/CrimsonSemibold.ttf') format('truetype'); + font-weight: bold; + font-style: normal; + } + +@font-face { + font-family: 'CrimsonSemiboldItalic'; + src: url('/fonts/crimson/CrimsonSemiboldItalic.ttf') format('truetype'); + font-weight: bold; + font-style: italic; + } + diff --git a/css/lato.css b/css/lato.css new file mode 100644 index 0000000..eb1f26c --- /dev/null +++ b/css/lato.css @@ -0,0 +1,126 @@ +@font-face { + font-family: 'LatoBlack'; + src: url('/fonts/lato/LatoBlack.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoBlackItalic'; + src: url('/fonts/LatoBlackItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoBold'; + src: url('/fonts/LatoBold.ttf') format('truetype'); + font-weight: bold; + font-style: normal; + } + +@font-face { + font-family: 'LatoBoldItalic'; + src: url('/fonts/LatoBoldItalic.ttf') format('truetype'); + font-weight: bold; + font-style: italic; + } + +@font-face { + font-family: 'LatoHairline'; + src: url('/fonts/LatoHairline.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoHairlineItalic'; + src: url('/fonts/LatoHairlineItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoHeavy'; + src: url('/fonts/LatoHeavy.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoHeavyItalic'; + src: url('/fonts/LatoHeavyItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoItalic'; + src: url('/fonts/LatoItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoLight'; + src: url('/fonts/LatoLight.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoLightItalic'; + src: url('/fonts/LatoLightItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoMedium'; + src: url('/fonts/LatoMedium.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoMediumItalic'; + src: url('/fonts/LatoMediumItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoRegular'; + src: url('/fonts/LatoRegular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoSemibold'; + src: url('/fonts/LatoSemibold.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoSemiboldItalic'; + src: url('/fonts/LatoSemiboldItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + +@font-face { + font-family: 'LatoThin'; + src: url('/fonts/LatoThin.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: 'LatoThinItalic'; + src: url('/fonts/LatoThinItalic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + } + diff --git a/css/tufte.css b/css/tufte.css deleted file mode 100644 index 9703688..0000000 --- a/css/tufte.css +++ /dev/null @@ -1,264 +0,0 @@ -@charset "UTF-8"; - -/* Import ET Book styles - adapted from https://github.com/edwardtufte/et-book/blob/gh-pages/et-book.css */ - -@font-face { font-family: "et-book"; - src: url("/fonts/et-book/et-book-roman-line-figures/et-book-roman-line-figures.eot"); - src: url("/fonts/et-book/et-book-roman-line-figures/et-book-roman-line-figures.eot?#iefix") format("embedded-opentype"), url("/fonts/et-book/et-book-roman-line-figures/et-book-roman-line-figures.woff") format("woff"), url("/fonts/et-book/et-book-roman-line-figures/et-book-roman-line-figures.ttf") format("truetype"), url("/fonts/et-book/et-book-roman-line-figures/et-book-roman-line-figures.svg#etbookromanosf") format("svg"); - font-weight: normal; - font-style: normal; } - -@font-face { font-family: "et-book"; - src: url("/fonts/et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.eot"); - src: url("/fonts/et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.eot?#iefix") format("embedded-opentype"), url("/fonts/et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.woff") format("woff"), url("/fonts/et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.ttf") format("truetype"), url("/fonts/et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.svg#etbookromanosf") format("svg"); - font-weight: normal; - font-style: italic; } - -@font-face { font-family: "et-book"; - src: url("/fonts/et-book/et-book-bold-line-figures/et-book-bold-line-figures.eot"); - src: url("/fonts/et-book/et-book-bold-line-figures/et-book-bold-line-figures.eot?#iefix") format("embedded-opentype"), url("/fonts/et-book/et-book-bold-line-figures/et-book-bold-line-figures.woff") format("woff"), url("/fonts/et-book/et-book-bold-line-figures/et-book-bold-line-figures.ttf") format("truetype"), url("/fonts/et-book/et-book-bold-line-figures/et-book-bold-line-figures.svg#etbookromanosf") format("svg"); - font-weight: bold; - font-style: normal; } - -@font-face { font-family: "et-book-roman-old-style"; - src: url("/fonts/et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.eot"); - src: url("/fonts/et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.eot?#iefix") format("embedded-opentype"), url("/fonts/et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.woff") format("woff"), url("/fonts/et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.ttf") format("truetype"), url("/fonts/et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.svg#etbookromanosf") format("svg"); - font-weight: normal; - font-style: normal; } - -/* Tufte CSS styles */ -html { font-size: 15px; } - -body { width: 87.5%; - margin-left: auto; - margin-right: auto; - padding-left: 12.5%; - font-family: et-book, Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif; - background-color: #fffff8; - color: #111; - max-width: 1400px; - counter-reset: sidenote-counter; } - -h1 { font-weight: 400; - margin-top: 4rem; - margin-bottom: 1.5rem; - font-size: 3.2rem; - line-height: 1; } - -h2 { font-style: italic; - font-weight: 400; - margin-top: 2.1rem; - margin-bottom: 0; - font-size: 2.2rem; - line-height: 1; } - -h3 { font-style: italic; - font-weight: 400; - font-size: 1.7rem; - margin-top: 2rem; - margin-bottom: 0; - line-height: 1; } - -hr { display: block; - height: 1px; - width: 55%; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; } - -p.subtitle { font-style: italic; - margin-top: 1rem; - margin-bottom: 1rem; - font-size: 1.8rem; - display: block; - line-height: 1; } - -.numeral { font-family: et-book-roman-old-style; } - -.danger { color: red; } - -article { position: relative; - padding: 5rem 0rem; } - -section { padding-top: 1rem; - padding-bottom: 1rem; } - -p, ol, ul { font-size: 1.4rem; } - -p { line-height: 2rem; - margin-top: 1.4rem; - margin-bottom: 1.4rem; - padding-right: 0; - vertical-align: baseline; } - -/* Chapter Epigraphs */ -div.epigraph { margin: 5em 0; } - -div.epigraph > blockquote { margin-top: 3em; - margin-bottom: 3em; } - -div.epigraph > blockquote, div.epigraph > blockquote > p { font-style: italic; } - -div.epigraph > blockquote > footer { font-style: normal; } - -div.epigraph > blockquote > footer > cite { font-style: italic; } -/* end chapter epigraphs styles */ - -blockquote { font-size: 1.4rem; } - -blockquote p { width: 55%; - margin-right: 40px; } - -blockquote footer { width: 55%; - font-size: 1.1rem; - text-align: right; } - -section>ol, section>ul { width: 45%; - -webkit-padding-start: 5%; - -webkit-padding-end: 5%; } - -li { padding: 0.5rem 0; } - -figure { padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; - max-width: 55%; - -webkit-margin-start: 0; - -webkit-margin-end: 0; - margin: 0 0 3em 0; } - -figcaption { float: right; - clear: right; - margin-top: 0; - margin-bottom: 0; - font-size: 1.1rem; - line-height: 1.6; - vertical-align: baseline; - position: relative; - max-width: 40%; } - -figure.fullwidth figcaption { margin-right: 24%; } - -/* Links: replicate underline that clears descenders */ -a:link, a:visited { color: inherit; } - -a:link { text-decoration: none; - background: -webkit-linear-gradient(#fffff8, #fffff8), -webkit-linear-gradient(#fffff8, #fffff8), -webkit-linear-gradient(#333, #333); - background: linear-gradient(#fffff8, #fffff8), linear-gradient(#fffff8, #fffff8), linear-gradient(#333, #333); - -webkit-background-size: 0.05em 1px, 0.05em 1px, 1px 1px; - -moz-background-size: 0.05em 1px, 0.05em 1px, 1px 1px; - background-size: 0.05em 1px, 0.05em 1px, 1px 1px; - background-repeat: no-repeat, no-repeat, repeat-x; - text-shadow: 0.03em 0 #fffff8, -0.03em 0 #fffff8, 0 0.03em #fffff8, 0 -0.03em #fffff8, 0.06em 0 #fffff8, -0.06em 0 #fffff8, 0.09em 0 #fffff8, -0.09em 0 #fffff8, 0.12em 0 #fffff8, -0.12em 0 #fffff8, 0.15em 0 #fffff8, -0.15em 0 #fffff8; - background-position: 0% 93%, 100% 93%, 0% 93%; } - -@media screen and (-webkit-min-device-pixel-ratio: 0) { a:link { background-position-y: 87%, 87%, 87%; } } - -a:link::selection { text-shadow: 0.03em 0 #b4d5fe, -0.03em 0 #b4d5fe, 0 0.03em #b4d5fe, 0 -0.03em #b4d5fe, 0.06em 0 #b4d5fe, -0.06em 0 #b4d5fe, 0.09em 0 #b4d5fe, -0.09em 0 #b4d5fe, 0.12em 0 #b4d5fe, -0.12em 0 #b4d5fe, 0.15em 0 #b4d5fe, -0.15em 0 #b4d5fe; - background: #b4d5fe; } - -a:link::-moz-selection { text-shadow: 0.03em 0 #b4d5fe, -0.03em 0 #b4d5fe, 0 0.03em #b4d5fe, 0 -0.03em #b4d5fe, 0.06em 0 #b4d5fe, -0.06em 0 #b4d5fe, 0.09em 0 #b4d5fe, -0.09em 0 #b4d5fe, 0.12em 0 #b4d5fe, -0.12em 0 #b4d5fe, 0.15em 0 #b4d5fe, -0.15em 0 #b4d5fe; - background: #b4d5fe; } - -/* Sidenotes, margin notes, figures, captions */ -img { max-width: 100%; } - -.sidenote, .marginnote { float: right; - clear: right; - margin-right: -60%; - width: 50%; - margin-top: 0; - margin-bottom: 0; - font-size: 1.1rem; - line-height: 1.3; - vertical-align: baseline; - position: relative; } - -.sidenote-number { counter-increment: sidenote-counter; } - -.sidenote-number:after, .sidenote:before { content: counter(sidenote-counter) " "; - font-family: et-book-roman-old-style; - position: relative; - vertical-align: baseline; } - -.sidenote-number:after { content: counter(sidenote-counter); - font-size: 1rem; - top: -0.5rem; - left: 0.1rem; } - -.sidenote:before { content: counter(sidenote-counter) " "; - top: -0.5rem; } - -blockquote .sidenote, blockquote .marginnote { margin-right: -82%; - min-width: 59%; - text-align: left; } - -p, footer, table { width: 55%; } - -div.fullwidth, table.fullwidth { width: 100%; } - -div.table-wrapper { overflow-x: auto; - font-family: "Trebuchet MS", "Gill Sans", "Gill Sans MT", sans-serif; } - -.sans { font-family: "Gill Sans", "Gill Sans MT", Calibri, sans-serif; - letter-spacing: .03em; } - -code { font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; - font-size: 1.0rem; - line-height: 1.42; } - -.sans > code { font-size: 1.2rem; } - -h1 > code, h2 > code, h3 > code { font-size: 0.80em; } - -.marginnote > code, .sidenote > code { font-size: 1rem; } - -pre.code { font-size: 0.9rem; - width: 52.5%; - margin-left: 2.5%; - overflow-x: auto; } - -pre.code.fullwidth { width: 90%; } - -.fullwidth { max-width: 90%; - clear:both; } - -span.newthought { font-variant: small-caps; - font-size: 1.2em; } - -input.margin-toggle { display: none; } - -label.sidenote-number { display: inline; } - -label.margin-toggle:not(.sidenote-number) { display: none; } - -@media (max-width: 760px) { body { width: 84%; - padding-left: 8%; - padding-right: 8%; } - p, footer { width: 100%; } - pre.code { width: 97%; } - ul { width: 85%; } - figure { max-width: 90%; } - figcaption, figure.fullwidth figcaption { margin-right: 0%; - max-width: none; } - blockquote { margin-left: 1.5em; - margin-right: 0em; } - blockquote p, blockquote footer { width: 100%; } - label.margin-toggle:not(.sidenote-number) { display: inline; } - .sidenote, .marginnote { display: none; } - .margin-toggle:checked + .sidenote, - .margin-toggle:checked + .marginnote { display: block; - float: left; - left: 1rem; - clear: both; - width: 95%; - margin: 1rem 2.5%; - vertical-align: baseline; - position: relative; } - label { cursor: pointer; } - div.table-wrapper, table { width: 85%; } - img { width: 100%; } } \ No newline at end of file diff --git a/fonts/crimson/CrimsonBold.ttf b/fonts/crimson/CrimsonBold.ttf new file mode 100644 index 0000000..cd76b2a Binary files /dev/null and b/fonts/crimson/CrimsonBold.ttf differ diff --git a/fonts/crimson/CrimsonBoldItalic.ttf b/fonts/crimson/CrimsonBoldItalic.ttf new file mode 100644 index 0000000..1f8cd1e Binary files /dev/null and b/fonts/crimson/CrimsonBoldItalic.ttf differ diff --git a/fonts/crimson/CrimsonItalic.ttf b/fonts/crimson/CrimsonItalic.ttf new file mode 100644 index 0000000..a9d1125 Binary files /dev/null and b/fonts/crimson/CrimsonItalic.ttf differ diff --git a/fonts/crimson/CrimsonRoman.ttf b/fonts/crimson/CrimsonRoman.ttf new file mode 100644 index 0000000..c500e4c Binary files /dev/null and b/fonts/crimson/CrimsonRoman.ttf differ diff --git a/fonts/crimson/CrimsonSemibold.ttf b/fonts/crimson/CrimsonSemibold.ttf new file mode 100644 index 0000000..b9b1a79 Binary files /dev/null and b/fonts/crimson/CrimsonSemibold.ttf differ diff --git a/fonts/crimson/CrimsonSemiboldItalic.ttf b/fonts/crimson/CrimsonSemiboldItalic.ttf new file mode 100644 index 0000000..c7ce045 Binary files /dev/null and b/fonts/crimson/CrimsonSemiboldItalic.ttf differ diff --git a/fonts/lato/LatoBlack.ttf b/fonts/lato/LatoBlack.ttf new file mode 100644 index 0000000..e2aeb6c Binary files /dev/null and b/fonts/lato/LatoBlack.ttf differ diff --git a/fonts/lato/LatoBlackItalic.ttf b/fonts/lato/LatoBlackItalic.ttf new file mode 100644 index 0000000..8167388 Binary files /dev/null and b/fonts/lato/LatoBlackItalic.ttf differ diff --git a/fonts/lato/LatoBold.ttf b/fonts/lato/LatoBold.ttf new file mode 100644 index 0000000..ef5ae3b Binary files /dev/null and b/fonts/lato/LatoBold.ttf differ diff --git a/fonts/lato/LatoBoldItalic.ttf b/fonts/lato/LatoBoldItalic.ttf new file mode 100644 index 0000000..664cd02 Binary files /dev/null and b/fonts/lato/LatoBoldItalic.ttf differ diff --git a/fonts/lato/LatoHairline.ttf b/fonts/lato/LatoHairline.ttf new file mode 100644 index 0000000..4c5a8fd Binary files /dev/null and b/fonts/lato/LatoHairline.ttf differ diff --git a/fonts/lato/LatoHairlineItalic.ttf b/fonts/lato/LatoHairlineItalic.ttf new file mode 100644 index 0000000..af5ac3d Binary files /dev/null and b/fonts/lato/LatoHairlineItalic.ttf differ diff --git a/fonts/lato/LatoHeavy.ttf b/fonts/lato/LatoHeavy.ttf new file mode 100644 index 0000000..fc70ab7 Binary files /dev/null and b/fonts/lato/LatoHeavy.ttf differ diff --git a/fonts/lato/LatoHeavyItalic.ttf b/fonts/lato/LatoHeavyItalic.ttf new file mode 100644 index 0000000..823188c Binary files /dev/null and b/fonts/lato/LatoHeavyItalic.ttf differ diff --git a/fonts/lato/LatoItalic.ttf b/fonts/lato/LatoItalic.ttf new file mode 100644 index 0000000..b23256f Binary files /dev/null and b/fonts/lato/LatoItalic.ttf differ diff --git a/fonts/lato/LatoLight.ttf b/fonts/lato/LatoLight.ttf new file mode 100644 index 0000000..0809b8e Binary files /dev/null and b/fonts/lato/LatoLight.ttf differ diff --git a/fonts/lato/LatoLightItalic.ttf b/fonts/lato/LatoLightItalic.ttf new file mode 100644 index 0000000..2d03739 Binary files /dev/null and b/fonts/lato/LatoLightItalic.ttf differ diff --git a/fonts/lato/LatoMedium.ttf b/fonts/lato/LatoMedium.ttf new file mode 100644 index 0000000..2c612da Binary files /dev/null and b/fonts/lato/LatoMedium.ttf differ diff --git a/fonts/lato/LatoMediumItalic.ttf b/fonts/lato/LatoMediumItalic.ttf new file mode 100644 index 0000000..63ecd02 Binary files /dev/null and b/fonts/lato/LatoMediumItalic.ttf differ diff --git a/fonts/lato/LatoRegular.ttf b/fonts/lato/LatoRegular.ttf new file mode 100644 index 0000000..adbfc46 Binary files /dev/null and b/fonts/lato/LatoRegular.ttf differ diff --git a/fonts/lato/LatoSemibold.ttf b/fonts/lato/LatoSemibold.ttf new file mode 100644 index 0000000..60ac82d Binary files /dev/null and b/fonts/lato/LatoSemibold.ttf differ diff --git a/fonts/lato/LatoSemiboldItalic.ttf b/fonts/lato/LatoSemiboldItalic.ttf new file mode 100644 index 0000000..cc23390 Binary files /dev/null and b/fonts/lato/LatoSemiboldItalic.ttf differ diff --git a/fonts/lato/LatoThin.ttf b/fonts/lato/LatoThin.ttf new file mode 100644 index 0000000..0f84dc1 Binary files /dev/null and b/fonts/lato/LatoThin.ttf differ diff --git a/fonts/lato/LatoThinItalic.ttf b/fonts/lato/LatoThinItalic.ttf new file mode 100644 index 0000000..7fbca2f Binary files /dev/null and b/fonts/lato/LatoThinItalic.ttf differ diff --git a/site.hs b/site.hs index 21b70ba..5a2ebf1 100644 --- a/site.hs +++ b/site.hs @@ -44,11 +44,11 @@ main = hakyllWith config $ do route idRoute compile compressCssCompiler - match "fonts/icomoon/*" $ do + match "fonts/crimson/*" $ do route $ idRoute compile copyFileCompiler - match "fonts/et-book/*/*" $ do + match "fonts/lato/*" $ do route $ idRoute compile copyFileCompiler diff --git a/templates/default.html b/templates/default.html index fd59d74..dd3b58e 100644 --- a/templates/default.html +++ b/templates/default.html @@ -5,8 +5,8 @@ $title$ - - + +