diff --git a/Makefile b/Makefile index 065c540..994b7a2 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ bundle-css: $(info copying fonts) cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 $(DATA)/web/css/ $(info bundling css) - $(ESBUILD) --bundle css/base.css --outfile=$(DATA)/web/css/bundle.css --external:remixicon.css --minify + $(ESBUILD) --bundle css/base.css --outfile=$(DATA)/web/css/bundle.css --external:remixicon.css --external:../fonts/hanken* --minify npx tailwindcss -i $(DATA)/web/css/bundle.css -o $(DATA)/web/css/bundle.css $(TAILWIND) # npx postcss -o $(DATA)/web/css/bundle.css $(DATA)/web/css/bundle.css diff --git a/css/base.css b/css/base.css index 3376742..2c60e94 100644 --- a/css/base.css +++ b/css/base.css @@ -3,6 +3,7 @@ @import "./dark.css"; @import "./tooltip.css"; @import "./loader.css"; +@import "./fonts.css"; @tailwind base; @tailwind components; @@ -13,8 +14,7 @@ --border-width-2: 3px; --border-width-4: 5px; --border-width-8: 8px; - - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: 'Hanken Grotesk', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } .light { diff --git a/css/fonts.css b/css/fonts.css new file mode 100644 index 0000000..a035890 --- /dev/null +++ b/css/fonts.css @@ -0,0 +1,44 @@ +/* hanken-grotesk-regular - cyrillic-ext_latin_vietnamese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Hanken Grotesk'; + font-style: normal; + font-weight: 400; + src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* hanken-grotesk-500 - cyrillic-ext_latin_vietnamese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Hanken Grotesk'; + font-style: normal; + font-weight: 500; + src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* hanken-grotesk-500italic - cyrillic-ext_latin_vietnamese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Hanken Grotesk'; + font-style: italic; + font-weight: 500; + src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ * +} + +/* hanken-grotesk-700 - cyrillic-ext_latin_vietnamese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Hanken Grotesk'; + font-style: normal; + font-weight: 700; + src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* hanken-grotesk-700italic - cyrillic-ext_latin_vietnamese */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Hanken Grotesk'; + font-style: italic; + font-weight: 700; + src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} diff --git a/html/admin.html b/html/admin.html index b062065..0859367 100644 --- a/html/admin.html +++ b/html/admin.html @@ -60,7 +60,7 @@ discord -

Available under the MIT License.

+

Available under the MIT License. Font "Hanken Grotesk" available under SIL OFL 1.1 License.

{{ .license }}
diff --git a/static/fonts/OFL.txt b/static/fonts/OFL.txt new file mode 100644 index 0000000..b9f7841 --- /dev/null +++ b/static/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2021 The Hanken Grotesk Project Authors (https://github.com/marcologous/hanken-grotesk) + +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/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500.woff2 b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500.woff2 new file mode 100644 index 0000000..c3c01a6 Binary files /dev/null and b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500.woff2 differ diff --git a/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500italic.woff2 b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500italic.woff2 new file mode 100644 index 0000000..e7c8d3d Binary files /dev/null and b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500italic.woff2 differ diff --git a/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700.woff2 b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700.woff2 new file mode 100644 index 0000000..b0c5a28 Binary files /dev/null and b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700.woff2 differ diff --git a/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700italic.woff2 b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700italic.woff2 new file mode 100644 index 0000000..7e93151 Binary files /dev/null and b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700italic.woff2 differ diff --git a/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-regular.woff2 b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-regular.woff2 new file mode 100644 index 0000000..988bcb3 Binary files /dev/null and b/static/fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-regular.woff2 differ diff --git a/views.go b/views.go index c7a0a33..a83b91e 100644 --- a/views.go +++ b/views.go @@ -7,6 +7,7 @@ import ( "io/fs" "net/http" "net/url" + "path/filepath" "strings" "time" @@ -134,6 +135,14 @@ func (app *appContext) AdminPage(gc *gin.Context) { license = "" } license = string(l) + fontLicense, err := fs.ReadFile(localFS, filepath.Join("web", "fonts", "OFL.txt")) + if err != nil { + app.debug.Printf("Failed to load OFL.txt: %s", err) + } + + license += "---Hanken Grotesk---\n\n" + license += string(fontLicense) + gcHTML(gc, http.StatusOK, "admin.html", gin.H{ "urlBase": app.getURLBase(gc), "cssClass": app.cssClass,