diff --git a/README.md b/README.md index 49cac2c..6794f20 100644 --- a/README.md +++ b/README.md @@ -54,3 +54,6 @@ once you are able to navigate to the forum, you can log in as the administrator # icons the icons in the `icons/` folder are by [Gabriele Malaspina](https://www.figma.com/community/file/1136337054881623512/iconcino-v2-0-0-free-icons-cc0-1-0-license) + +# credits & acknowledgements +see [THIRDPARTY.md](./THIRDPARTY.md) diff --git a/THIRDPARTY.md b/THIRDPARTY.md new file mode 100644 index 0000000..e518a42 --- /dev/null +++ b/THIRDPARTY.md @@ -0,0 +1,33 @@ +# Acknowledgements + +## Lapis + +URL: https://leafo.net/lapis/ +Copyright: `(c) 2023 Leaf Corcoran` +License: MIT +Repo: https://github.com/leafo/lapis + +## ChicagoFLF + +Affected files: [`fonts/ChicagoFLF.woff2`](./fonts/ChicagoFLF.woff2) +No canonical URL that I could find. +Obtained from: https://usemodify.com/fonts/chicago/ +License: Public Domain +Designers: Susan Kare, Robin Casady + +## Cadman + +Affected files: [`fonts/Cadman_Bold.woff2`](./fonts/Cadman_Bold.woff2) [`fonts/Cadman_BoldItalic.woff2`](./fonts/Cadman_BoldItalic.woff2) [`fonts/Cadman_Italic.woff2`](./fonts/Cadman_Italic.woff2) [`fonts/Cadman_Roman.woff2`](./fonts/Cadman_Roman.woff2) +URL: https://localfonts.eu/shop/cyrillic-script/serbian/serbian-cyrillic-sans-serif/cadman/ +Copyright: `© 2017-2020 by Paul James Miller. All rights reserved.` +License: SIL Open Font License 1.1 +Designers: Paul James Miller + +## ICONCINO + +Affected files: [`svg-icons/error.etlua`](./svg-icons/error.etlua) [`svg-icons/info.etlua`](./svg-icons/info.etlua) [`svg-icons/lock.etlua`](./svg-icons/lock.etlua) [`svg-icons/sticky.etlua`](./svg-icons/sticky.etlua) [`svg-icons/warn.etlua`](./svg-icons/warn.etlua) +URL: https://www.figma.com/community/file/1136337054881623512/iconcino-v2-0-0-free-icons-cc0-1-0-license +Copyright: Gabriele Malaspina +Designers: Gabriele Malaspina +License: CC0 1.0/CC BY 4.0 +CC BY 4.0 compliance: Modified to indicate the URL. Modified size. diff --git a/data/static/style.css b/data/static/style.css index 47bb5e5..39286de 100644 --- a/data/static/style.css +++ b/data/static/style.css @@ -1,8 +1,41 @@ /* src: */ +@font-face { + font-family: "body-text"; + src: url("/static/fonts/DINish[slnt,wdth,wght].woff2") format("woff2"); +} +@font-face { + font-family: "site-title"; + src: url("/static/fonts/ChicagoFLF.woff2"); +} +@font-face { + font-family: "Cadman"; + src: url("/static/fonts/Cadman_Roman.woff2"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "Cadman"; + src: url("/static/fonts/Cadman_Bold.woff2"); + font-weight: bold; + font-style: normal; +} +@font-face { + font-family: "Cadman"; + src: url("/static/fonts/Cadman_Italic.woff2"); + font-weight: normal; + font-style: italic; +} +@font-face { + font-family: "Cadman"; + src: url("/static/fonts/Cadman_BoldItalic.woff2"); + font-weight: bold; + font-style: italic; +} .currentpage, .pagebutton, input[type=file]::file-selector-button, button.warn, input[type=submit].warn, .linkbutton.warn, button.critical, input[type=submit].critical, .linkbutton.critical, button, input[type=submit], .linkbutton { cursor: default; color: black; - font-size: 0.9rem; + font-size: 0.9em; + font-family: "Cadman"; text-decoration: none; border: 1px solid black; border-radius: 3px; @@ -11,7 +44,7 @@ } body { - font-family: sans-serif; + font-family: "Cadman"; margin: 20px 100px; background-color: rgb(173.5214173228, 183.6737007874, 161.0262992126); } @@ -26,7 +59,7 @@ body { justify-content: end; background-color: #c1ceb1; justify-content: space-between; - align-items: center; + align-items: baseline; } #bottomnav { @@ -49,9 +82,9 @@ body { } .site-title { - padding-right: 30px; - font-size: 1.5rem; - font-weight: bold; + font-family: "site-title"; + font-size: 3rem; + margin: 0 20px; text-decoration: none; color: black; } @@ -86,7 +119,7 @@ body { .post-content-container { display: grid; grid-template-columns: 1fr; - grid-template-rows: 0.2fr 2.5fr; + grid-template-rows: 70px 2.5fr; gap: 0px 0px; grid-auto-flow: row; grid-template-areas: "post-info" "post-content"; @@ -156,7 +189,7 @@ pre code { display: flex; justify-content: space-between; align-items: last baseline; - font-family: sans-serif; + font-family: "Cadman"; border-top-right-radius: 8px; border-top-left-radius: 8px; background-color: #c1ceb1; diff --git a/fonts/Cadman_Bold.woff2 b/fonts/Cadman_Bold.woff2 new file mode 100644 index 0000000..6795a60 Binary files /dev/null and b/fonts/Cadman_Bold.woff2 differ diff --git a/fonts/Cadman_BoldItalic.woff2 b/fonts/Cadman_BoldItalic.woff2 new file mode 100644 index 0000000..fd58c33 Binary files /dev/null and b/fonts/Cadman_BoldItalic.woff2 differ diff --git a/fonts/Cadman_Italic.woff2 b/fonts/Cadman_Italic.woff2 new file mode 100644 index 0000000..28fae73 Binary files /dev/null and b/fonts/Cadman_Italic.woff2 differ diff --git a/fonts/Cadman_Roman.woff2 b/fonts/Cadman_Roman.woff2 new file mode 100644 index 0000000..6eda943 Binary files /dev/null and b/fonts/Cadman_Roman.woff2 differ diff --git a/fonts/ChicagoFLF.woff2 b/fonts/ChicagoFLF.woff2 new file mode 100644 index 0000000..13a7fcf Binary files /dev/null and b/fonts/ChicagoFLF.woff2 differ diff --git a/nginx.conf b/nginx.conf index ac09de8..890ef79 100644 --- a/nginx.conf +++ b/nginx.conf @@ -41,5 +41,9 @@ http { location /static/js/ { alias js/; } + + location /static/fonts/ { + alias fonts/; + } } } diff --git a/sass/style.scss b/sass/style.scss index b88ec26..7a4ee19 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -2,6 +2,45 @@ @use "sass:color"; +@font-face { + font-family: "body-text"; + src: url("/static/fonts/DINish[slnt,wdth,wght].woff2") format("woff2"); +} + +@font-face { + font-family: "site-title"; + src: url("/static/fonts/ChicagoFLF.woff2"); +} + +@mixin cadman($var) { + font-family: "Cadman"; + src: url("/static/fonts/Cadman_#{$var}.woff2"); +} + +@font-face { + @include cadman("Roman"); + font-weight: normal; + font-style: normal; +} + +@font-face { + @include cadman("Bold"); + font-weight: bold; + font-style: normal; +} + +@font-face { + @include cadman("Italic"); + font-weight: normal; + font-style: italic; +} + +@font-face { + @include cadman("BoldItalic"); + font-weight: bold; + font-style: italic; +} + $accent_color: #c1ceb1; $dark_bg: color.scale($accent_color, $lightness: -25%, $saturation: -97%); @@ -17,7 +56,8 @@ $button_color: color.adjust($accent_color, $hue: 90); %button-base { cursor: default; color: black; - font-size: 0.9rem; + font-size: 0.9em; + font-family: "Cadman"; text-decoration: none; border: 1px solid black; border-radius: 3px; @@ -50,7 +90,8 @@ $button_color: color.adjust($accent_color, $hue: 90); } body { - font-family: sans-serif; + font-family: "Cadman"; + // font-size: 18px; margin: 20px 100px; background-color: $main_bg; } @@ -62,7 +103,7 @@ body { #topnav { @include navbar($accent_color); justify-content: space-between; - align-items: center; + align-items: baseline; } #bottomnav { @@ -82,9 +123,9 @@ body { } .site-title { - padding-right: 30px; - font-size: 1.5rem; - font-weight: bold; + font-family: "site-title"; + font-size: 3rem; + margin: 0 20px; text-decoration: none; color: black; } @@ -120,7 +161,7 @@ body { .post-content-container { display: grid; grid-template-columns: 1fr; - grid-template-rows: 0.2fr 2.5fr; + grid-template-rows: 70px 2.5fr; gap: 0px 0px; grid-auto-flow: row; grid-template-areas: @@ -193,7 +234,7 @@ pre code { display: flex; justify-content: space-between; align-items: last baseline; - font-family: sans-serif; + font-family: "Cadman"; border-top-right-radius: 8px; border-top-left-radius: 8px; background-color: $accent_color;