diff --git a/assets/css/bobastyle.css b/assets/css/bobastyle.css index 5f81886..431673d 100644 --- a/assets/css/bobastyle.css +++ b/assets/css/bobastyle.css @@ -119,18 +119,38 @@ /* Fonts */ @font-face { - /*font-family: Jost;*/ - font-family: sans-serif; + font-family: Jost; font-display: swap; font-style: normal; src: url("/font/jost/Jost-VariableFont_wght.woff2") format("woff2"); } @font-face { - /*font-family: JetBrainsMono;*/ - font-family: monospace; + font-family: "Open Sans"; + font-display: swap; + font-style: normal; + src: url("/font/opensans/OpenSans-VariableFont_wdth,wght.woff2") format("woff2"); +} +@font-face { + font-family: JetBrainsMono; font-display: swap; src: url("/font/jetbrainsmono/JetBrainsMono_wght.woff2") format("woff2"); } +:root { + --font-sans: Jost, "Open Sans", "Noto Sans", sans-serif; + --font-mono: JetBrainsMono, monospace; +} + +html { + font-family: var(--font-sans); +} +pre, code, kbd, samp { + font-family: var(--font-mono); + font-size: 0.75em; +} +pre > code { + /* otherwise it ends up being 0.75^2 em */ + font-size: unset; +} @@ -587,9 +607,6 @@ html { body { background-color: var(--background-0); color: var(--text-0); - /*font-family: "Jost", "Open Sans", "Noto Sans", sans-serif;*/ - font-family: sans-serif; - font-size: 16px; margin: 20px; max-width: 720px; overflow-wrap: break-word; @@ -762,11 +779,6 @@ table.markdown { } .code-block > .code-header > .code-type, -pre, -code { - /*font-family: JetBrainsMono;*/ - font-size: 12px; -} code { border-radius: 5px; } diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html index ce6b0fa..ffeff15 100644 --- a/layouts/_default/_markup/render-codeblock.html +++ b/layouts/_default/_markup/render-codeblock.html @@ -4,7 +4,7 @@ {{ end }}
- {{ $type }} + 
{{ $type }}
{{ i18n "copy_to_clipboard" }} diff --git a/static/font/opensans/OFL.txt b/static/font/opensans/OFL.txt new file mode 100644 index 0000000..9b448d4 --- /dev/null +++ b/static/font/opensans/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) + +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/static/font/opensans/OpenSans-Italic-VariableFont_wdth,wght.woff2 b/static/font/opensans/OpenSans-Italic-VariableFont_wdth,wght.woff2 new file mode 100644 index 0000000..7c997a9 Binary files /dev/null and b/static/font/opensans/OpenSans-Italic-VariableFont_wdth,wght.woff2 differ diff --git a/static/font/opensans/OpenSans-VariableFont_wdth,wght.woff2 b/static/font/opensans/OpenSans-VariableFont_wdth,wght.woff2 new file mode 100644 index 0000000..173d315 Binary files /dev/null and b/static/font/opensans/OpenSans-VariableFont_wdth,wght.woff2 differ diff --git a/static/font/opensans/README.txt b/static/font/opensans/README.txt new file mode 100644 index 0000000..d0ad790 --- /dev/null +++ b/static/font/opensans/README.txt @@ -0,0 +1,100 @@ +Open Sans Variable Font +======================= + +This download contains Open Sans as both variable fonts and static fonts. + +Open Sans is a variable font with these axes: + wdth + wght + +This means all the styles are contained in these files: + OpenSans-VariableFont_wdth,wght.ttf + OpenSans-Italic-VariableFont_wdth,wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Open Sans: + static/OpenSans_Condensed/OpenSans_Condensed-Light.ttf + static/OpenSans_Condensed/OpenSans_Condensed-Regular.ttf + static/OpenSans_Condensed/OpenSans_Condensed-Medium.ttf + static/OpenSans_Condensed/OpenSans_Condensed-SemiBold.ttf + static/OpenSans_Condensed/OpenSans_Condensed-Bold.ttf + static/OpenSans_Condensed/OpenSans_Condensed-ExtraBold.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Light.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Regular.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Medium.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-SemiBold.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Bold.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-ExtraBold.ttf + static/OpenSans/OpenSans-Light.ttf + static/OpenSans/OpenSans-Regular.ttf + static/OpenSans/OpenSans-Medium.ttf + static/OpenSans/OpenSans-SemiBold.ttf + static/OpenSans/OpenSans-Bold.ttf + static/OpenSans/OpenSans-ExtraBold.ttf + static/OpenSans_Condensed/OpenSans_Condensed-LightItalic.ttf + static/OpenSans_Condensed/OpenSans_Condensed-Italic.ttf + static/OpenSans_Condensed/OpenSans_Condensed-MediumItalic.ttf + static/OpenSans_Condensed/OpenSans_Condensed-SemiBoldItalic.ttf + static/OpenSans_Condensed/OpenSans_Condensed-BoldItalic.ttf + static/OpenSans_Condensed/OpenSans_Condensed-ExtraBoldItalic.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-LightItalic.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Italic.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-MediumItalic.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-SemiBoldItalic.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-BoldItalic.ttf + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-ExtraBoldItalic.ttf + static/OpenSans/OpenSans-LightItalic.ttf + static/OpenSans/OpenSans-Italic.ttf + static/OpenSans/OpenSans-MediumItalic.ttf + static/OpenSans/OpenSans-SemiBoldItalic.ttf + static/OpenSans/OpenSans-BoldItalic.ttf + static/OpenSans/OpenSans-ExtraBoldItalic.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details.