diff --git a/_sass/_article.scss b/_sass/_article.scss index eaacc67..0c60d18 100644 --- a/_sass/_article.scss +++ b/_sass/_article.scss @@ -2,7 +2,7 @@ article > * { margin-left: auto; margin-right: auto; max-width: 36rem; - padding: 0 $spacing-unit; + padding: 0 1em; } article > h1 { @@ -40,7 +40,7 @@ article p > img { .back-link { display: inline-block; font-size: .75em; - padding: $spacing-unit; + padding: 1em; text-decoration: none; text-transform: uppercase; } \ No newline at end of file diff --git a/_sass/_base.scss b/_sass/_base.scss index ac12517..e259835 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -1,6 +1,6 @@ body { color: $text-color; - font-family: Garamond, "Times New Roman", serif; + font-family: "EB Garamond", Garamond, "Times New Roman", serif; font-size: 1.3125em; line-height: 1.325; } @@ -62,20 +62,19 @@ p > cite { hr { border: 0; height: 0; - margin: 4em 0 4.5em; - &:after { - @include divider; - } + @include divider; + margin: 4em 0; } -.divided:after { +.divided::after { + content: ""; @include divider; } .home { max-width: 24em; margin: auto; - padding: ($spacing-unit * 4) $spacing-unit; + padding: 4em 1em; } .home h1 { diff --git a/_sass/_font.scss b/_sass/_font.scss new file mode 100644 index 0000000..063480c --- /dev/null +++ b/_sass/_font.scss @@ -0,0 +1,13 @@ +/* eb-garamond-regular - latin */ +@font-face { + font-family: 'EB Garamond'; + font-style: normal; + font-weight: 400; + src: url('#{$asset_url}/fonts/eb-garamond-v9-latin-regular.eot'); /* IE9 Compat Modes */ + src: local('EB Garamond Regular'), local('EBGaramond-Regular'), + url('#{$asset_url}/fonts/eb-garamond-v9-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('#{$asset_url}/fonts/eb-garamond-v9-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('#{$asset_url}/fonts/eb-garamond-v9-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('#{$asset_url}/fonts/eb-garamond-v9-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('#{$asset_url}/fonts/eb-garamond-v9-latin-regular.svg#EBGaramond') format('svg'); /* Legacy iOS */ +} \ No newline at end of file diff --git a/_sass/_masthead.scss b/_sass/_masthead.scss index 0063d60..b90c413 100644 --- a/_sass/_masthead.scss +++ b/_sass/_masthead.scss @@ -2,7 +2,7 @@ background: $brand-color; box-sizing: border-box; min-height: 100vh; - padding: $spacing-unit * 2; + padding: 2em; position: relative; display: flex; diff --git a/_sass/_mixins.scss b/_sass/_mixins.scss index e6ca5b8..bc7ae7e 100644 --- a/_sass/_mixins.scss +++ b/_sass/_mixins.scss @@ -1,8 +1,8 @@ @mixin divider { - content: ""; + border: 0; display: block; width: 152px; height: 12px; margin: .5em auto 0; - background-image: url(#{$asset_url}/images/divider.svg); + background: url(#{$asset_url}/images/divider.svg) no-repeat top center; } \ No newline at end of file diff --git a/_sass/_variables.scss b/_sass/_variables.scss index ec07a2f..1285172 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -2,8 +2,6 @@ $brand-color: #f2e300; $text-color: #0b0404; $muted-text-color: #79785b; -$spacing-unit: 1rem; - $on-bigphone: 375px; $on-tablet: 768px; $on-laptop: 928px; diff --git a/about.md b/about.md index d01c432..a66c172 100644 --- a/about.md +++ b/about.md @@ -3,12 +3,10 @@ layout: post title: About --- -Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. +Undoubtably one of the greatest minds of our time, Christopher Hitchens challenged his readers to think deeply on topics of politics, religion, war, and science. This Jekyll theme is designed in his memory. ![Christopher Hitchens](https://upload.wikimedia.org/wikipedia/commons/6/63/Christopher_Hitchens_2008-04-24_001.jpg) -Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Nullam quis risus eget urna mollis ornare vel eu leo. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam quis risus eget urna mollis ornare vel eu leo. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. +From [Wikipedia](https://en.wikipedia.org/wiki/Christopher_Hitchens): -Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Cras mattis consectetur purus sit amet fermentum. Nullam quis risus eget urna mollis ornare vel eu leo. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas sed diam eget risus varius blandit sit amet non magna. - -Maecenas faucibus mollis interdum. Cras mattis consectetur purus sit amet fermentum. Maecenas sed diam eget risus varius blandit sit amet non magna. Sed posuere consectetur est at lobortis. Donec ullamcorper nulla non metus auctor fringilla. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas sed diam eget risus varius blandit sit amet non magna. \ No newline at end of file +>Christopher Eric Hitchens (13 April 1949 – 15 December 2011) was an Anglo-American author, columnist, essayist, orator, religious and literary critic, social critic, and journalist. Hitchens was the author, co-author, editor or co-editor of over 30 books, including five collections of essays on culture, politics and literature. A staple of public discourse, his confrontational style of debate made him both a lauded intellectual and a controversial public figure. He contributed to New Statesman, The Nation, The Weekly Standard, The Atlantic, London Review of Books, The Times Literary Supplement, Slate, Free Inquiry and Vanity Fair. \ No newline at end of file diff --git a/assets/css/main.scss b/assets/css/main.scss index 9ad7299..52dd5d4 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -9,6 +9,7 @@ $asset_url: '{{ '/assets' | absolute_url }}'; "reset", "variables", "mixins", + "font", "base", "masthead", "article" diff --git a/assets/fonts/OFL.txt b/assets/fonts/OFL.txt new file mode 100755 index 0000000..1fb3e84 --- /dev/null +++ b/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2017 The EB Garamond Project Authors (https://github.com/octaviopardo/EBGaramond12) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/eb-garamond-v9-latin-regular.eot b/assets/fonts/eb-garamond-v9-latin-regular.eot new file mode 100644 index 0000000..d5a9d9d Binary files /dev/null and b/assets/fonts/eb-garamond-v9-latin-regular.eot differ diff --git a/assets/fonts/eb-garamond-v9-latin-regular.svg b/assets/fonts/eb-garamond-v9-latin-regular.svg new file mode 100644 index 0000000..5b85d70 --- /dev/null +++ b/assets/fonts/eb-garamond-v9-latin-regular.svg @@ -0,0 +1,612 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/fonts/eb-garamond-v9-latin-regular.ttf b/assets/fonts/eb-garamond-v9-latin-regular.ttf new file mode 100644 index 0000000..c3230dd Binary files /dev/null and b/assets/fonts/eb-garamond-v9-latin-regular.ttf differ diff --git a/assets/fonts/eb-garamond-v9-latin-regular.woff b/assets/fonts/eb-garamond-v9-latin-regular.woff new file mode 100644 index 0000000..fcf7566 Binary files /dev/null and b/assets/fonts/eb-garamond-v9-latin-regular.woff differ diff --git a/assets/fonts/eb-garamond-v9-latin-regular.woff2 b/assets/fonts/eb-garamond-v9-latin-regular.woff2 new file mode 100644 index 0000000..c36dcec Binary files /dev/null and b/assets/fonts/eb-garamond-v9-latin-regular.woff2 differ