diff --git a/index.css b/index.css index 72edb8e..de326c8 100644 --- a/index.css +++ b/index.css @@ -1,14 +1,61 @@ +@font-face { + font-family: 'ui-font'; + font-weight: normal; + font-style: normal; + src: url('merriweather/MerriweatherSans-Light.ttf'); +} +@font-face { + font-family: 'ui-font'; + font-weight: bold; + font-style: normal; + src: url('merriweather/MerriweatherSans-Bold.ttf'); +} +@font-face { + font-family: 'ui-font'; + font-weight: normal; + font-style: italic; + src: url('merriweather/MerriweatherSans-Italic.ttf'); +} +@font-face { + font-family: 'ui-font'; + font-weight: bold; + font-style: italic; + src: url('merriweather/MerriweatherSans-BoldItalic.ttf'); +} + +@font-face { + font-family: 'ui-font-serif'; + font-weight: normal; + font-style: normal; + src: url('merriweather/Merriweather-Light.ttf'); +} +@font-face { + font-family: 'ui-font-serif'; + font-weight: bold; + font-style: normal; + src: url('merriweather/Merriweather-Bold.ttf'); +} +@font-face { + font-family: 'ui-font-serif'; + font-weight: normal; + font-style: italic; + src: url('merriweather/Merriweather-Italic.ttf'); +} +@font-face { + font-family: 'ui-font-serif'; + font-weight: bold; + font-style: italic; + src: url('merriweather/Merriweather-BoldItalic.ttf'); +} + * { box-sizing: border-box; } html { height: 100%; min-height: 100%; - font-family: -apple-system, BlinkMacSystemFont, - 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', - 'Droid Sans', 'Helvetica Neue', sans-serif; - font-weight: 300; + font-family: 'ui-font', sans-serif; + font-weight: normal; font-size: 14px; line-height: 20px; background: #F5F0E6; @@ -22,7 +69,7 @@ body { h1 { margin: 0; padding: .25em 0 0 0; - font-weight: 700; + font-weight: bold; font-size: 14px; } p { @@ -111,6 +158,9 @@ section.select-list:focus { section.select-list > * { overflow: hidden; } +section.select-list [data-style='serif'] .name { + font-family: 'ui-font-serif', serif; +} section.select-list .entry { display: flex; position: relative; @@ -194,7 +244,6 @@ section.select-list .details { display: block; width: 60%; font-size: 10px; - font-style: italic; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -224,7 +273,6 @@ footer p a:visited { label { margin-right: .5ex; - font-style: italic; color: #777; } button { diff --git a/merriweather/Merriweather-Bold.ttf b/merriweather/Merriweather-Bold.ttf new file mode 100644 index 0000000..c6374c0 Binary files /dev/null and b/merriweather/Merriweather-Bold.ttf differ diff --git a/merriweather/Merriweather-BoldItalic.ttf b/merriweather/Merriweather-BoldItalic.ttf new file mode 100644 index 0000000..b2e7663 Binary files /dev/null and b/merriweather/Merriweather-BoldItalic.ttf differ diff --git a/merriweather/Merriweather-Italic.ttf b/merriweather/Merriweather-Italic.ttf new file mode 100644 index 0000000..179acf3 Binary files /dev/null and b/merriweather/Merriweather-Italic.ttf differ diff --git a/merriweather/Merriweather-Light.ttf b/merriweather/Merriweather-Light.ttf new file mode 100644 index 0000000..843b8a8 Binary files /dev/null and b/merriweather/Merriweather-Light.ttf differ diff --git a/merriweather/Merriweather-Regular.ttf b/merriweather/Merriweather-Regular.ttf new file mode 100644 index 0000000..18da9e5 Binary files /dev/null and b/merriweather/Merriweather-Regular.ttf differ diff --git a/merriweather/MerriweatherSans-Bold.ttf b/merriweather/MerriweatherSans-Bold.ttf new file mode 100644 index 0000000..318a359 Binary files /dev/null and b/merriweather/MerriweatherSans-Bold.ttf differ diff --git a/merriweather/MerriweatherSans-BoldItalic.ttf b/merriweather/MerriweatherSans-BoldItalic.ttf new file mode 100644 index 0000000..bb895bb Binary files /dev/null and b/merriweather/MerriweatherSans-BoldItalic.ttf differ diff --git a/merriweather/MerriweatherSans-Italic.ttf b/merriweather/MerriweatherSans-Italic.ttf new file mode 100644 index 0000000..57d61af Binary files /dev/null and b/merriweather/MerriweatherSans-Italic.ttf differ diff --git a/merriweather/MerriweatherSans-Light.ttf b/merriweather/MerriweatherSans-Light.ttf new file mode 100644 index 0000000..d8daafc Binary files /dev/null and b/merriweather/MerriweatherSans-Light.ttf differ diff --git a/merriweather/MerriweatherSans-Regular.ttf b/merriweather/MerriweatherSans-Regular.ttf new file mode 100644 index 0000000..d2f8bb7 Binary files /dev/null and b/merriweather/MerriweatherSans-Regular.ttf differ diff --git a/merriweather/OFL.txt b/merriweather/OFL.txt new file mode 100644 index 0000000..f8c7a13 --- /dev/null +++ b/merriweather/OFL.txt @@ -0,0 +1,96 @@ +Copyright 2019 The Merriweather Project Authors (https://github.com/SorkinType/Merriweather-Sans) +with Reserved Font Name 'Merriweather' + +Merriweather is a trademark of Sorkin Type Co. + +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.