diff --git a/.gitignore b/.gitignore index a471dc0..a8a44cc 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ pnpm-debug.log* .obsidian/ src/content/BMO/ +data/ diff --git a/package.json b/package.json index ade1d69..799b102 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "@astrojs/tailwind": "^5.1.5", "@fontsource-variable/instrument-sans": "^5.2.5", "@fontsource-variable/space-grotesk": "^5.2.6", - "@fontsource/instrument-serif": "^5.2.5", "astro": "^4.16.18", "astro-critters": "^2.2.1", "astro-pagefind": "^1.8.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af33ed7..a096b88 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,9 +29,6 @@ importers: '@fontsource-variable/space-grotesk': specifier: ^5.2.6 version: 5.2.6 - '@fontsource/instrument-serif': - specifier: ^5.2.5 - version: 5.2.5 astro: specifier: ^4.16.18 version: 4.16.18(@types/node@22.10.5)(rollup@4.40.0)(typescript@5.8.3) @@ -399,9 +396,6 @@ packages: '@fontsource-variable/space-grotesk@5.2.6': resolution: {integrity: sha512-caoLd9SfhtOGYNIis8ek+sOGxO0NNJ5xGcTtlhCG3UA9N4xPa1AkeCDNOABocH0djVKHYl23CYtsmuDFqh3tiQ==} - '@fontsource/instrument-serif@5.2.5': - resolution: {integrity: sha512-ojamX86Kqj+LPHCXdoiY/OWbiJ76L3Ie5WczdtlTZ/xRG+MBE7/+nLQaRSuIivF5YWf1XXQ0MWxZzcp6GlEFYA==} - '@img/sharp-darwin-arm64@0.33.5': resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} @@ -2934,8 +2928,6 @@ snapshots: '@fontsource-variable/space-grotesk@5.2.6': {} - '@fontsource/instrument-serif@5.2.5': {} - '@img/sharp-darwin-arm64@0.33.5': optionalDependencies: '@img/sharp-libvips-darwin-arm64': 1.0.4 diff --git a/public/fonts/Serif/InstrumentSerif-Regular.woff2 b/public/fonts/Serif/InstrumentSerif-Regular.woff2 new file mode 100644 index 0000000..55e6ec1 Binary files /dev/null and b/public/fonts/Serif/InstrumentSerif-Regular.woff2 differ diff --git a/public/fonts/Serif/OFL.txt b/public/fonts/Serif/OFL.txt new file mode 100644 index 0000000..0531e87 --- /dev/null +++ b/public/fonts/Serif/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Instrument Serif Project Authors (https://github.com/Instrument/instrument-serif) + +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: +https://openfontlicense.org + + +----------------------------------------------------------- +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/public/images/authors/rasuladasov.jpg b/public/images/authors/rasuladasov.jpg new file mode 100644 index 0000000..61c5315 Binary files /dev/null and b/public/images/authors/rasuladasov.jpg differ diff --git a/public/images/authors/withrasul.jpeg b/public/images/authors/withrasul.jpeg deleted file mode 100644 index a6b5b4c..0000000 Binary files a/public/images/authors/withrasul.jpeg and /dev/null differ diff --git a/src/components/Head.astro b/src/components/Head.astro index 48e987e..010ee63 100644 --- a/src/components/Head.astro +++ b/src/components/Head.astro @@ -1,7 +1,6 @@ --- import "@styles/global.css"; import "@fontsource-variable/space-grotesk"; -import "@fontsource/instrument-serif"; import "@fontsource-variable/instrument-sans"; import type { Language } from "@i18n/ui"; @@ -56,6 +55,15 @@ const { + + + {title} diff --git a/src/components/News/AuthorInfo.astro b/src/components/News/AuthorInfo.astro index 6635507..0230d05 100644 --- a/src/components/News/AuthorInfo.astro +++ b/src/components/News/AuthorInfo.astro @@ -9,7 +9,7 @@ const { author, username } = Astro.props; class="inline-flex gap-2 py-4" >