diff --git a/content/blog/idiomatic-rust-resources/styles.css b/content/blog/idiomatic-rust-resources/styles.css index b7e209879..17d5d79e7 100644 --- a/content/blog/idiomatic-rust-resources/styles.css +++ b/content/blog/idiomatic-rust-resources/styles.css @@ -29,7 +29,7 @@ code { padding: 5px 10px; margin: 3px; font-size: 0.85rem; - font-family: JetBrainsMono; + font-family: "JetBrainsMono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", monospace; color: #111; background: transparent; border: 2px solid rgba(17, 17, 17, 0.2); diff --git a/sass/_article.scss b/sass/_article.scss index 0e8cb674c..991407676 100644 --- a/sass/_article.scss +++ b/sass/_article.scss @@ -86,7 +86,7 @@ article { gap: 8px; color: rgba(0, 0, 0, 0.7); font-size: 0.8em; - font-family: JetBrainsMono; + font-family: $fontMono; } .article-meta .author-link { diff --git a/sass/_base.scss b/sass/_base.scss index d8cdd706c..2fe32d01b 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -1,3 +1,11 @@ +@font-face { + font-family: "Josefin Sans"; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url("/fonts/JosefinSans-Bold.woff2") format("woff2"); +} + @font-face { font-family: "Inter"; font-style: normal; @@ -8,6 +16,7 @@ @font-face { font-family: "JetBrainsMono"; font-style: normal; + font-display: swap; src: url("/fonts/JetBrainsMono-Regular.woff2") format("woff2"); } @@ -192,47 +201,10 @@ img { } code { - font-family: "JetBrainsMono", monospace; + font-family: $fontMono; font-size: 1em; } -div.hero { - width: 100%; - max-width: 1000px; - margin: 20px auto 0px auto; - padding: 0 20px; - display: flex; - align-items: center; -} - -.hero-font { - width: 400px; - height: auto; -} - -img.hero-img { - max-width: 65%; - width: 800px; - height: auto; -} - -@media only screen and (max-width: 900px) { - div.hero { - flex-direction: column; - padding: 0; - margin: 20px auto; - } - - img.hero-img { - display: none; - } - - img.hero-font { - padding: 0 10px; - max-width: 500px; - } -} - a { color: $brightPrim; text-decoration: underline; diff --git a/sass/_footer.scss b/sass/_footer.scss index 3a51a79c3..2f79c78bc 100644 --- a/sass/_footer.scss +++ b/sass/_footer.scss @@ -86,7 +86,7 @@ .metadata { margin-top: 2rem; - font-family: JetBrainsMono; + font-family: $fontMono; } .metadata > * { diff --git a/sass/_homepage.scss b/sass/_homepage.scss index 33e249abe..91e17cf76 100644 --- a/sass/_homepage.scss +++ b/sass/_homepage.scss @@ -38,6 +38,64 @@ gap: 3rem; } +.home-hero { + display: grid; + grid-template-columns: max-content minmax(0, 40rem); + justify-content: center; + align-items: center; + gap: 2rem; + width: 100%; + max-width: 1200px; + margin: 1.25rem auto 0; + padding-inline: 1.25rem; + text-align: left; +} + +.home-hero-title { + margin: 0; + font-family: $fontHero; + font-size: 4rem; + font-weight: 700; + line-height: 1.2; + + .highlight { + display: table; + margin: 0 0 0.12em; + padding: 0.12em 0.25em; + background-color: $brightBgrdScnd; + } + + .highlight:nth-child(even) { + transform: rotate(0.6deg); + } +} + +.home-hero-art { + display: block; + width: 100%; + height: auto; +} + +@media (max-width: 900px) { + .home-hero { + grid-template-columns: minmax(0, 1fr); + } + + .home-hero-title { + font-size: min(6rem, calc((100vw - 2.5rem) / 6.5)); + } + + .home-hero-art { + display: none; + } +} + +@media (prefers-color-scheme: dark) { + .home-hero-title .highlight { + background-color: $brightBgrd; + } +} + .call-to-action { padding: 10px 0px 80px; background-color: $heroDark; diff --git a/sass/_learn.scss b/sass/_learn.scss index 5e557b7a4..99267b7b8 100644 --- a/sass/_learn.scss +++ b/sass/_learn.scss @@ -73,7 +73,7 @@ } .resource-tag { - font-family: JetBrainsMono; + font-family: $fontMono; font-size: 0.7rem; font-weight: 500; line-height: 1; @@ -120,7 +120,7 @@ .resource-meta { margin-top: 0.55rem; - font-family: JetBrainsMono; + font-family: $fontMono; font-size: 0.76rem; color: rgba($brightPrim, 0.55); } diff --git a/sass/_list.scss b/sass/_list.scss index 3b932cf4a..647b6908d 100644 --- a/sass/_list.scss +++ b/sass/_list.scss @@ -60,7 +60,7 @@ } .list-row-date { - font-family: JetBrainsMono; + font-family: $fontMono; font-size: 0.85rem; color: rgba($brightPrim, 0.6); font-weight: 500; @@ -68,7 +68,7 @@ } .list-row-label { - font-family: JetBrainsMono; + font-family: $fontMono; font-size: 0.85rem; color: rgba($brightPrim, 0.6); font-weight: 500; diff --git a/sass/_mentorship.scss b/sass/_mentorship.scss index db758d4fe..247d1d81a 100644 --- a/sass/_mentorship.scss +++ b/sass/_mentorship.scss @@ -127,13 +127,12 @@ } .pro-hero-title { - font-family: "Bebas Neue", sans-serif; + font-family: $fontHero; font-size: clamp(2.5rem, 6vw, 4.5rem); font-weight: 700; - line-height: 1.1; + line-height: 1.2; margin-bottom: 1.5rem; color: white; - letter-spacing: -0.02em; } .pro-hero-subtitle { @@ -650,11 +649,7 @@ } .pro-hero-title { - font-size: clamp(2rem, 10vw, 3rem); - - .highlight:last-of-type { - font-size: 0.8em; - } + font-size: min(3rem, calc((100vw - 2.5rem) / 11.5)); } .pro-hero-subtitle { diff --git a/sass/_podcast.scss b/sass/_podcast.scss index 4a1955a78..af4a1ee51 100644 --- a/sass/_podcast.scss +++ b/sass/_podcast.scss @@ -23,8 +23,10 @@ } .podcast-hero h1 { - font-size: clamp(3.25rem, 7.5vw, 6rem); - line-height: 1.1; + font-family: $fontHero; + font-size: clamp(2.5rem, 5.5vw, 4rem); + font-weight: 700; + line-height: 1.2; margin: 0 0 1.5rem; .highlight { @@ -232,7 +234,7 @@ } .podcast-item-meta { - font-family: JetBrainsMono; + font-family: $fontMono; font-size: 0.8rem; gap: 0.75rem; flex-wrap: wrap; @@ -304,7 +306,7 @@ } .article-meta-left { - font-family: JetBrainsMono; + font-family: $fontMono; display: flex; align-items: center; gap: 20px; @@ -356,7 +358,7 @@ // Size the stacked title so its longest line fits between the page gutters. .podcast-hero h1 { - font-size: calc((100vw - 2.5rem) / 4.1); + font-size: calc((100vw - 2.5rem) / 6.2); } .podcast-listening ul { diff --git a/sass/_variables.scss b/sass/_variables.scss index 5e2b952f4..fb14708ce 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -9,3 +9,6 @@ $brightScnd: #ee3856; $brightScndLight: rgba(238, 56, 86, 0.1); $darkPrim: #cdcaca; $heroDark: #2d3140; + +$fontHero: "Josefin Sans", Arial, sans-serif; +$fontMono: "JetBrainsMono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", monospace; diff --git a/static/fonts/JosefinSans-Bold.woff2 b/static/fonts/JosefinSans-Bold.woff2 new file mode 100644 index 000000000..b1365d87b Binary files /dev/null and b/static/fonts/JosefinSans-Bold.woff2 differ diff --git a/static/fonts/JosefinSans-OFL.txt b/static/fonts/JosefinSans-OFL.txt new file mode 100644 index 000000000..b87b0194e --- /dev/null +++ b/static/fonts/JosefinSans-OFL.txt @@ -0,0 +1,93 @@ +Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name "Josefin Sans". + +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/hero/hero-font.svg b/static/hero/hero-font.svg deleted file mode 100644 index 4e55e1b28..000000000 --- a/static/hero/hero-font.svg +++ /dev/null @@ -1 +0,0 @@ -High-quality consulting services for the Rust programming language. \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 5a2f77bcc..c06653f9c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block meta %} + {% set structured_data = load_data(path="static/corrode-consulting-structured-data.jsonld") %}