diff --git a/_includes/common_header b/_includes/common_header index dda621a..517d760 100644 --- a/_includes/common_header +++ b/_includes/common_header @@ -1,5 +1,5 @@
- {% include common_nav %}

{{ site.title }} {{ site.subtitle }}

+ {% include common_nav %}
diff --git a/fonts/Inconsolata-Regular.ttf b/fonts/Inconsolata-Regular.ttf new file mode 100644 index 0000000..457d262 Binary files /dev/null and b/fonts/Inconsolata-Regular.ttf differ diff --git a/fonts/OFL.txt b/fonts/OFL.txt deleted file mode 100644 index 379e735..0000000 --- a/fonts/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright © 2017 IBM Corp. with Reserved Font Name "Plex" - -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/style.css b/style.css index 7fc3baa..6336c5c 100644 --- a/style.css +++ b/style.css @@ -1,7 +1,7 @@ --- layout: -body-margin: "1rem" +body-margin: "2rem" --- @font-face { @@ -19,6 +19,11 @@ body-margin: "1rem" src: url("/fonts/MajorMonoDisplay-Regular.ttf"); } +@font-face { + font-family: "Inconsolata Regular"; + src: url("/fonts/Inconsolata-Regular.ttf"); +} + @font-face { font-family: "IBM Plex Sans"; font-weight: 300; font-style: normal; src: url("/fonts/IBMPlexSans-Light.ttf"); } @font-face { font-family: "IBM Plex Sans"; font-weight: 300; font-style: italic; src: url("/fonts/IBMPlexSans-LightItalic.ttf"); } @@ -52,8 +57,8 @@ pre { } h1, h2, h3, h4, h5, h6 { - font-family: "Libre Barcode 39 Text"; font-weight: normal; + clear: both; } h1 a { @@ -61,8 +66,8 @@ h1 a { color: inherit; } -h1 { font-size: 3.75rem; } -h2 { font-size: 3rem; } +h1 { font-size: 1.56rem; } +h2 { font-size: 1.25rem; } h3, h4, h5, h6 { text-transform: uppercase; font-family: "IBM Plex Mono"; @@ -74,9 +79,15 @@ h3, h4, h5, h6 { h3 { text-decoration: underline; font-weight: 600; } main h1, main h2 { - border-left: solid magenta 2.5rem; - padding-left: 0rem; - margin-left: -2.5rem; + font-family: "Inconsolata Regular"; + text-transform: uppercase; + letter-spacing: 0.5rem; +} +main h1 { + border-bottom: solid magenta 0.4rem; +} +main h2 { + border-bottom: solid magenta 0.32rem; } pre, code { @@ -88,22 +99,25 @@ h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { } header { - background: black; - color: white; margin: 0 -{{ page.body-margin }}; } header h1 { + background: black; + color: white; + font-family: "Libre Barcode 39 Text"; + font-size: 3.75rem; color: yellow; margin: 0; - padding: 0.8rem 0 1rem 0; + padding: 0; + line-height: 1; + border-bottom: solid magenta 0.125rem; } nav { - font-family: "Libre Barcode 39 Text"; - font-size: 1.92rem; - color: cyan; - padding-top: 1rem; + font-family: "Inconsolata Regular"; + text-transform: uppercase; + letter-spacing: 0.5rem; } nav > ul { @@ -114,12 +128,16 @@ nav > ul { justify-content: flex-end; padding: 0; margin: 0; + background: black; + color: white; } nav > ul > li { display: block; width: auto; - padding: 0 0.5rem; + padding-left: 0.5rem; + margin: 0 0 0 1rem; + border-bottom: solid cyan 0.25rem; } nav a {