diff --git a/src/router.rs b/src/router.rs index 46be06a..51182e7 100644 --- a/src/router.rs +++ b/src/router.rs @@ -41,8 +41,8 @@ pub fn new(graph: Graph) -> Router { get(|| handlers::fixed::file("./static/fonts/sans", "")), ) .route( - "/static/fonts/didone", - get(|| handlers::fixed::file("./static/fonts/didone", "")), + "/static/fonts/serifed", + get(|| handlers::fixed::file("./static/fonts/serifed", "")), ) .route( "/static/fonts/mono", diff --git a/static/fonts/cormorant/LICENSE b/static/fonts/cormorant/LICENSE new file mode 100644 index 0000000..77eb4d3 --- /dev/null +++ b/static/fonts/cormorant/LICENSE @@ -0,0 +1,93 @@ +Copyright 2015 The Cormorant Project Authors (github.com/CatharsisFonts/Cormorant) CormorantInfant-Italic[wght].ttf: Copyright 2015 The Cormorant Project Authors (github.com/CatharsisFonts/Cormorant) + +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/fonts/cormorant/cormorant-infant-latin-300-italic.woff2 b/static/fonts/cormorant/cormorant-infant-latin-300-italic.woff2 new file mode 100644 index 0000000..29f3b56 Binary files /dev/null and b/static/fonts/cormorant/cormorant-infant-latin-300-italic.woff2 differ diff --git a/static/fonts/cormorant/cormorant-infant-latin-300-normal.woff2 b/static/fonts/cormorant/cormorant-infant-latin-300-normal.woff2 new file mode 100644 index 0000000..50cde83 Binary files /dev/null and b/static/fonts/cormorant/cormorant-infant-latin-300-normal.woff2 differ diff --git a/static/fonts/didone b/static/fonts/didone deleted file mode 120000 index 144a4d4..0000000 --- a/static/fonts/didone +++ /dev/null @@ -1 +0,0 @@ -philosopher/Philosopher-Regular.ttf \ No newline at end of file diff --git a/static/fonts/maven/LICENSE b/static/fonts/maven/LICENSE new file mode 100644 index 0000000..35d22cc --- /dev/null +++ b/static/fonts/maven/LICENSE @@ -0,0 +1,93 @@ +Copyright 2011 The Maven Pro Project Authors (https://github.com/m4rc1e/mavenproFont), with Reserved Font Name "Maven Pro". + +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/fonts/maven/MavenPro-Black.ttf b/static/fonts/maven/MavenPro-Black.ttf deleted file mode 100644 index f808a1b..0000000 Binary files a/static/fonts/maven/MavenPro-Black.ttf and /dev/null differ diff --git a/static/fonts/maven/MavenPro-Bold.ttf b/static/fonts/maven/MavenPro-Bold.ttf deleted file mode 100644 index 40c3359..0000000 Binary files a/static/fonts/maven/MavenPro-Bold.ttf and /dev/null differ diff --git a/static/fonts/maven/MavenPro-Medium.ttf b/static/fonts/maven/MavenPro-Medium.ttf deleted file mode 100644 index 75a388e..0000000 Binary files a/static/fonts/maven/MavenPro-Medium.ttf and /dev/null differ diff --git a/static/fonts/maven/MavenPro-Regular.ttf b/static/fonts/maven/MavenPro-Regular.ttf deleted file mode 100644 index 6442c2b..0000000 Binary files a/static/fonts/maven/MavenPro-Regular.ttf and /dev/null differ diff --git a/static/fonts/maven/SIL Open Font License.txt b/static/fonts/maven/SIL Open Font License.txt deleted file mode 100644 index 14c043d..0000000 --- a/static/fonts/maven/SIL Open Font License.txt +++ /dev/null @@ -1,41 +0,0 @@ -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. \ No newline at end of file diff --git a/static/fonts/maven/maven-pro-latin-400-normal.woff2 b/static/fonts/maven/maven-pro-latin-400-normal.woff2 new file mode 100644 index 0000000..6e2dd7e Binary files /dev/null and b/static/fonts/maven/maven-pro-latin-400-normal.woff2 differ diff --git a/static/fonts/philosopher/Philosopher-Italic.ttf b/static/fonts/philosopher/Philosopher-Italic.ttf deleted file mode 100644 index 4c2ff18..0000000 Binary files a/static/fonts/philosopher/Philosopher-Italic.ttf and /dev/null differ diff --git a/static/fonts/philosopher/Philosopher-Regular.ttf b/static/fonts/philosopher/Philosopher-Regular.ttf deleted file mode 100644 index 69d0784..0000000 Binary files a/static/fonts/philosopher/Philosopher-Regular.ttf and /dev/null differ diff --git a/static/fonts/philosopher/SIL Open Font License.txt b/static/fonts/philosopher/SIL Open Font License.txt deleted file mode 100644 index a2a9253..0000000 --- a/static/fonts/philosopher/SIL Open Font License.txt +++ /dev/null @@ -1,43 +0,0 @@ -Copyright (c) 2008-2010 by Jovanny Lemonad (http://www.jovanny.ru) - -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. \ No newline at end of file diff --git a/static/fonts/prose b/static/fonts/prose index d664a3e..cd79e75 120000 --- a/static/fonts/prose +++ b/static/fonts/prose @@ -1 +1 @@ -reforma/Reforma1969/Reforma1969-Blanca.woff2 \ No newline at end of file +reforma/Reforma1969-Blanca.woff2 \ No newline at end of file diff --git a/static/fonts/prose-bold b/static/fonts/prose-bold index 0a0b115..233b22c 120000 --- a/static/fonts/prose-bold +++ b/static/fonts/prose-bold @@ -1 +1 @@ -reforma/Reforma1969/Reforma1969-Gris.woff2 \ No newline at end of file +reforma/Reforma1969-Gris.woff2 \ No newline at end of file diff --git a/static/fonts/prose-bold-italic b/static/fonts/prose-bold-italic index f4b423b..383f1a9 120000 --- a/static/fonts/prose-bold-italic +++ b/static/fonts/prose-bold-italic @@ -1 +1 @@ -reforma/Reforma1969/Reforma1969-GrisItalica.woff2 \ No newline at end of file +reforma/Reforma1969-GrisItalica.woff2 \ No newline at end of file diff --git a/static/fonts/prose-italic b/static/fonts/prose-italic index 49e0d88..59e30c7 120000 --- a/static/fonts/prose-italic +++ b/static/fonts/prose-italic @@ -1 +1 @@ -reforma/Reforma1969/Reforma1969-BlancaItalica.woff2 \ No newline at end of file +reforma/Reforma1969-BlancaItalica.woff2 \ No newline at end of file diff --git a/static/fonts/reforma/Reforma1918/Reforma1918-Blanca.woff2 b/static/fonts/reforma/Reforma1918/Reforma1918-Blanca.woff2 deleted file mode 100644 index 0bc3f33..0000000 Binary files a/static/fonts/reforma/Reforma1918/Reforma1918-Blanca.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma1918/Reforma1918-BlancaItalica.woff2 b/static/fonts/reforma/Reforma1918/Reforma1918-BlancaItalica.woff2 deleted file mode 100644 index 111ea43..0000000 Binary files a/static/fonts/reforma/Reforma1918/Reforma1918-BlancaItalica.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma1918/Reforma1918-Gris.woff2 b/static/fonts/reforma/Reforma1918/Reforma1918-Gris.woff2 deleted file mode 100644 index ff9bbda..0000000 Binary files a/static/fonts/reforma/Reforma1918/Reforma1918-Gris.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma1918/Reforma1918-GrisItalica.woff2 b/static/fonts/reforma/Reforma1918/Reforma1918-GrisItalica.woff2 deleted file mode 100644 index 96a0df9..0000000 Binary files a/static/fonts/reforma/Reforma1918/Reforma1918-GrisItalica.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma1969/Reforma1969-Blanca.woff2 b/static/fonts/reforma/Reforma1969-Blanca.woff2 similarity index 100% rename from static/fonts/reforma/Reforma1969/Reforma1969-Blanca.woff2 rename to static/fonts/reforma/Reforma1969-Blanca.woff2 diff --git a/static/fonts/reforma/Reforma1969/Reforma1969-BlancaItalica.woff2 b/static/fonts/reforma/Reforma1969-BlancaItalica.woff2 similarity index 100% rename from static/fonts/reforma/Reforma1969/Reforma1969-BlancaItalica.woff2 rename to static/fonts/reforma/Reforma1969-BlancaItalica.woff2 diff --git a/static/fonts/reforma/Reforma1969/Reforma1969-Gris.woff2 b/static/fonts/reforma/Reforma1969-Gris.woff2 similarity index 100% rename from static/fonts/reforma/Reforma1969/Reforma1969-Gris.woff2 rename to static/fonts/reforma/Reforma1969-Gris.woff2 diff --git a/static/fonts/reforma/Reforma1969/Reforma1969-GrisItalica.woff2 b/static/fonts/reforma/Reforma1969-GrisItalica.woff2 similarity index 100% rename from static/fonts/reforma/Reforma1969/Reforma1969-GrisItalica.woff2 rename to static/fonts/reforma/Reforma1969-GrisItalica.woff2 diff --git a/static/fonts/reforma/Reforma2018/Reforma2018-Blanca.woff2 b/static/fonts/reforma/Reforma2018/Reforma2018-Blanca.woff2 deleted file mode 100644 index 291da7f..0000000 Binary files a/static/fonts/reforma/Reforma2018/Reforma2018-Blanca.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma2018/Reforma2018-BlancaItalica.woff2 b/static/fonts/reforma/Reforma2018/Reforma2018-BlancaItalica.woff2 deleted file mode 100644 index c542f11..0000000 Binary files a/static/fonts/reforma/Reforma2018/Reforma2018-BlancaItalica.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma2018/Reforma2018-Gris.woff2 b/static/fonts/reforma/Reforma2018/Reforma2018-Gris.woff2 deleted file mode 100644 index 5d683bb..0000000 Binary files a/static/fonts/reforma/Reforma2018/Reforma2018-Gris.woff2 and /dev/null differ diff --git a/static/fonts/reforma/Reforma2018/Reforma2018-GrisItalica.woff2 b/static/fonts/reforma/Reforma2018/Reforma2018-GrisItalica.woff2 deleted file mode 100644 index 116b2db..0000000 Binary files a/static/fonts/reforma/Reforma2018/Reforma2018-GrisItalica.woff2 and /dev/null differ diff --git a/static/fonts/sans b/static/fonts/sans index 575f6df..a3df751 120000 --- a/static/fonts/sans +++ b/static/fonts/sans @@ -1 +1 @@ -maven/MavenPro-Regular.ttf \ No newline at end of file +maven/maven-pro-latin-400-normal.woff2 \ No newline at end of file diff --git a/static/fonts/sans-bold b/static/fonts/sans-bold deleted file mode 120000 index 1e7a806..0000000 --- a/static/fonts/sans-bold +++ /dev/null @@ -1 +0,0 @@ -maven/MavenPro-Bold.ttf \ No newline at end of file diff --git a/static/fonts/serifed b/static/fonts/serifed new file mode 120000 index 0000000..4f488ec --- /dev/null +++ b/static/fonts/serifed @@ -0,0 +1 @@ +cormorant/cormorant-infant-latin-300-normal.woff2 \ No newline at end of file diff --git a/static/fonts/serifed-italic b/static/fonts/serifed-italic new file mode 120000 index 0000000..719d1f3 --- /dev/null +++ b/static/fonts/serifed-italic @@ -0,0 +1 @@ +cormorant/cormorant-infant-latin-300-italic.woff2 \ No newline at end of file diff --git a/static/graph.toml b/static/graph.toml index 15acde9..631d6c4 100644 --- a/static/graph.toml +++ b/static/graph.toml @@ -589,6 +589,7 @@ text = """ - [ ] Branch deeper - Customization - [ ] Custom assets (favicon, CSS) + - [ ] Drop all hardcoded assets endpoints - [ ] Custom header include - [ ] Custom templates - [ ] Themes @@ -617,7 +618,7 @@ text = """ - [ ] Add separate TOML endpoints for pre/postprocessed - [ ] Render to filesystem - [ ] Single-page rendering - - [ ] Make error output more lean when DEBUG is unset + - [x] Make error output more clean when `DEBUG` is unset - [ ] Input - [ ] Frontmatter format - [ ] Multi-file graphs @@ -625,10 +626,12 @@ text = """ - [ ] Templating - [ ] Simplify template code with includes, macros and custom functions - [ ] Move compiled templates to a static ref - - See: + - See: |https://keats.github.io/tera/docs/#:~:text=only%20happen%20once| - [ ] Reduce whitespace - - See: + - See: |https://keats.github.io/tera/docs/#whitespace-control| - [ ] Full-text search +- [ ] Assess Option return types that should be Result + ## Done - [x] Redirects @@ -647,5 +650,5 @@ error_poem = true node_selector = true navbar_search = true footer_text = """ -made by jutty|https://jutty.dev • acknowledgments|Acknowledgments • |source code|https://codeberg.org/jutty/en +acknowledgments|Acknowledgments • |source code|https://codeberg.org/jutty/en """ diff --git a/static/style.css b/static/style.css index 365d131..e7060f4 100644 --- a/static/style.css +++ b/static/style.css @@ -10,17 +10,16 @@ } @font-face { - src: url("fonts/sans"); - font-family: "sans"; + src: url("fonts/serifed"); + font-family: "serifed"; display: swap; - size-adjust: 110%; - font-weight: bold; } @font-face { - src: url("fonts/didone"); - font-family: "didone"; + src: url("fonts/serifed-italic"); + font-family: "serifed"; display: swap; + font-style: italic; } @font-face { @@ -39,26 +38,28 @@ src: url("fonts/prose"); font-family: "prose"; display: swap; + size-adjust: 120%; } @font-face { src: url("fonts/prose-bold"); - font-family: "fonts/prose"; + font-family: "prose"; font-weight: bold; } @font-face { src: url("fonts/prose-italic"); - font-family: "fonts/prose"; + font-family: "prose"; font-style: italic; } @font-face { src: url("fonts/prose-bold-italic"); - font-family: "fonts/prose"; + font-family: "prose"; font-weight: bold; font-style: italic; } + html { height: 100%; } @@ -82,9 +83,12 @@ main { box-sizing: border-box; } -p { +p, section li { font-family: prose, sans-serif; - font-size: calc(var(--base-font-size) * 1.2); +} + +section p { + line-height: 2; } pre { @@ -94,13 +98,24 @@ pre { padding: 12px; margin: 40px 10px; box-shadow: 1px 1px 3px 1.5px #00000077; + transition: 1000ms; +} + +pre:hover { + box-shadow: 1px 1px 3px 2.5px #00777777; } code { padding: 3px 6px; - margin-right: 2px; + margin-right: 3px; white-space: nowrap; font-size: calc(var(--base-font-size) * 0.8); + box-shadow: 1px 1px 1px 1px #00000077; + transition: 1000ms; +} + +code:hover { + box-shadow: 1px 1px 1px 1px #00777799; } pre, code { @@ -196,22 +211,20 @@ span.hidden-label { border: solid 1px #d0d0d0; } -h1, h2 { +h1 { font-family: title, serif; } -h3, h4, h5, h6 { - font-family: didone, serif; - +h2, h3, h4, h5, h6 { + font-family: serifed, serif; } main h2 { - font-weight: lighter; margin-top: 10px; } h1, h2, h3, h4, h5, h6 { - font-weight: lighter; + font-weight: 1; margin: 10px 0; } @@ -220,6 +233,7 @@ h1.node-title { } h2.connections-title { + font-family: title; margin-bottom: 0px; } @@ -227,12 +241,12 @@ h3.connections-title { margin-top: 0px; } -h1 { font-size: calc(var(--base-font-size) * 3.0); } -h2 { font-size: calc(var(--base-font-size) * 2.8); } -h3 { font-size: calc(var(--base-font-size) * 2.6); } -h4 { font-size: calc(var(--base-font-size) * 2.4); } +h1 { font-size: calc(var(--base-font-size) * 3.6); } +h2 { font-size: calc(var(--base-font-size) * 3.4); } +h3 { font-size: calc(var(--base-font-size) * 3.0); } +h4 { font-size: calc(var(--base-font-size) * 2.6); } h5 { font-size: calc(var(--base-font-size) * 2.2); } -h6 { font-size: calc(var(--base-font-size) * 2.0); } +h6 { font-size: calc(var(--base-font-size) * 1.8); } footer div { margin: 20px 0;