diff --git a/README.md b/README.md index 68ad0a8..54e0a1a 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,6 @@ If you want to improve Duckquill in any way, feel free to open an issue, or bett - [Jakub Steiner](https://jimmac.eu) for the [OS Component Website](https://jimmac.github.io/os-component-website), on top of which this whole thing is built - [Cassidy James](https://cassidyjames.com) for the [Mastodon-powered Comments](https://cassidyjames.com/blog/fediverse-blog-comments-mastodon) -- [Adobe Fonts](https://github.com/adobe-fonts) for the [Source Code Pro](https://adobe-fonts.github.io/source-code-pro/) font - [Rasmus](https://rsms.me) for the [Inter](https://rsms.me/inter/) font +- [JetBrains](https://www.jetbrains.com) for the [JetBrains Mono](https://www.jetbrains.com/lp/mono/) font - Everyone who supported me and said good stuff <3 diff --git a/content/_index.md b/content/_index.md index 7b35ffe..38608b8 100644 --- a/content/_index.md +++ b/content/_index.md @@ -161,6 +161,6 @@ If you want to improve Duckquill in any way, feel free to open an issue, or bett - [Jakub Steiner](https://jimmac.eu) for the [OS Component Website](https://jimmac.github.io/os-component-website), on top of which this whole thing is built - [Cassidy James](https://cassidyjames.com) for the [Mastodon-powered Comments](https://cassidyjames.com/blog/fediverse-blog-comments-mastodon) -- [Adobe Fonts](https://github.com/adobe-fonts) for the [Source Code Pro](https://adobe-fonts.github.io/source-code-pro/) font - [Rasmus](https://rsms.me) for the [Inter](https://rsms.me/inter/) font +- [JetBrains](https://www.jetbrains.com) for the [JetBrains Mono](https://www.jetbrains.com/lp/mono/) font - Everyone who supported me and said good stuff <3 diff --git a/content/demo/index.md b/content/demo/index.md index 250734b..c7ec91b 100644 --- a/content/demo/index.md +++ b/content/demo/index.md @@ -102,7 +102,7 @@ end - level 2 item - level 1 item -## Here is a checkboxes: +## Here are checkboxes: - [ ] Milk - [x] Eggs diff --git a/sass/_fonts.scss b/sass/_fonts.scss index 38b74fe..cf7e8a2 100644 --- a/sass/_fonts.scss +++ b/sass/_fonts.scss @@ -1,34 +1,30 @@ @font-face { - font-family: "Inter Variable"; + font-family: InterVariable; font-style: normal; font-weight: 100 900; font-display: swap; - src: url("./fonts/inter-variable.woff2?v=4.0") format("woff2"), - url("./fonts/inter-variable.ttf?v=4.0") format("truetype"); + src: url("./fonts/InterVariable.woff2?v=4.0") format("woff2"); } @font-face { - font-family: "Inter Variable"; + font-family: InterVariable; font-style: italic; font-weight: 100 900; font-display: swap; - src: url("./fonts/inter-variable-italic.woff2?v=4.0") format("woff2"), - url("./fonts/inter-variable-italic.ttf?v=4.0") format("truetype"); + src: url("./fonts/InterVariable-Italic.woff2?v=4.0") format("woff2"); } @font-face { - font-family: "Source Code VF"; + font-family: JetBrainsMono; font-style: normal; - font-weight: 200 900; - font-stretch: normal; - src: url("./fonts/source-code-vf-upright.woff2?v=1.026R") format("woff2"), - url("./fonts/source-code-vf-upright.ttf?v=1.026R") format("truetype"); + font-weight: 100 800; + font-display: swap; + src: url("./fonts/JetBrainsMono.woff2?v=2.304") format("woff2"); } @font-face { - font-family: "Source Code VF"; + font-family: JetBrainsMono; font-style: italic; - font-weight: 200 900; - font-stretch: normal; - src: url("./fonts/source-code-vf-italic.woff2?v=1.026R") format("woff2"), - url("./fonts/source-code-vf-italic.ttf?v=1.026R") format("truetype"); + font-weight: 100 800; + font-display: swap; + src: url("./fonts/JetBrainsMono-Italic.woff2?v=2.304") format("woff2"); } diff --git a/sass/_main.scss b/sass/_main.scss index 02fbfa8..241a00a 100644 --- a/sass/_main.scss +++ b/sass/_main.scss @@ -26,7 +26,7 @@ body { } body { - font-family: "Inter Variable", sans-serif; + font-family: InterVariable, sans-serif; line-height: 1.6; color: var(--fg-color); background-color: var(--bg-color); @@ -52,6 +52,7 @@ body { @keyframes highlight-in-out { 50% { color: var(--primary-color); + font-weight: 800; } } } @@ -76,9 +77,12 @@ h3, h4, h5, h6 { - margin: 3rem 0 1rem; - font-weight: 600; + font-family: JetBrainsMono, monospace; + font-feature-settings: "ss02"; + font-style: italic; + font-weight: 200; line-height: 1.25; + margin: 3rem 0 1rem; .zola-anchor { display: none; @@ -93,30 +97,29 @@ h6 { } h1 { - letter-spacing: -0.08rem; - font-weight: 900; font-size: 3rem; - - a { - font-weight: 900; - } + font-weight: 400; + letter-spacing: -0.14rem; } h2 { font-size: 2.4rem; - letter-spacing: -0.04rem; + letter-spacing: -0.14rem; } h3 { font-size: 1.5rem; + letter-spacing: -0.08rem; } h4 { font-size: 1.25rem; + letter-spacing: -0.06rem; } h5 { font-size: 1rem; + letter-spacing: -0.04rem; } h6 { @@ -177,8 +180,9 @@ abbr { // CODE pre, -code { - font-family: "Source Code VF", monospace; +code, +kbd { + font-family: JetBrainsMono, monospace; } code:not(pre code) { @@ -275,6 +279,8 @@ details { // TABLES table { border-collapse: collapse; + border-radius: var(--rounded-corner); + overflow: hidden; table-layout: fixed; width: 100%; @@ -559,7 +565,7 @@ img { } .big { - font-size: 150%; + font-size: 1.5rem; } &.archive { diff --git a/static/fonts/inter-variable-italic.woff2 b/static/fonts/InterVariable-Italic.woff2 similarity index 100% rename from static/fonts/inter-variable-italic.woff2 rename to static/fonts/InterVariable-Italic.woff2 diff --git a/static/fonts/inter-variable.woff2 b/static/fonts/InterVariable.woff2 similarity index 100% rename from static/fonts/inter-variable.woff2 rename to static/fonts/InterVariable.woff2 diff --git a/static/fonts/JetBrainsMono-Italic.woff2 b/static/fonts/JetBrainsMono-Italic.woff2 new file mode 100644 index 0000000..2c61a89 Binary files /dev/null and b/static/fonts/JetBrainsMono-Italic.woff2 differ diff --git a/static/fonts/JetBrainsMono.woff2 b/static/fonts/JetBrainsMono.woff2 new file mode 100644 index 0000000..b03785d Binary files /dev/null and b/static/fonts/JetBrainsMono.woff2 differ diff --git a/static/fonts/inter-variable-italic.ttf b/static/fonts/inter-variable-italic.ttf deleted file mode 100644 index ed674e7..0000000 Binary files a/static/fonts/inter-variable-italic.ttf and /dev/null differ diff --git a/static/fonts/inter-variable.ttf b/static/fonts/inter-variable.ttf deleted file mode 100644 index 2d4b470..0000000 Binary files a/static/fonts/inter-variable.ttf and /dev/null differ diff --git a/static/fonts/source-code-vf-italic.ttf b/static/fonts/source-code-vf-italic.ttf deleted file mode 100644 index f6ae4ba..0000000 Binary files a/static/fonts/source-code-vf-italic.ttf and /dev/null differ diff --git a/static/fonts/source-code-vf-italic.woff2 b/static/fonts/source-code-vf-italic.woff2 deleted file mode 100644 index 54566fe..0000000 Binary files a/static/fonts/source-code-vf-italic.woff2 and /dev/null differ diff --git a/static/fonts/source-code-vf-upright.ttf b/static/fonts/source-code-vf-upright.ttf deleted file mode 100644 index fa23355..0000000 Binary files a/static/fonts/source-code-vf-upright.ttf and /dev/null differ diff --git a/static/fonts/source-code-vf-upright.woff2 b/static/fonts/source-code-vf-upright.woff2 deleted file mode 100644 index fa87db3..0000000 Binary files a/static/fonts/source-code-vf-upright.woff2 and /dev/null differ