diff --git a/README.md b/README.md index df3a6890..89307872 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,6 @@ All original code in this repository (like my [Hugo theme](layouts/)) is publish External assets include: - [**Twemoji**](https://twemoji.twitter.com/): Copyright (c) 2020 Twitter, Inc. and other contributors. [Licensed under CC-BY-4.0.](https://github.com/twitter/twemoji/blob/v13.0.1/LICENSE-GRAPHICS) -- [**Inter**](https://rsms.me/inter/): Copyright (c) 2016-2020 The Inter Project Authors. [Licensed under the SIL Open Font License, Version 1.1.](https://github.com/rsms/inter/blob/v3.13/LICENSE.txt) +- [**Inter**](https://rsms.me/inter/): Copyright (c) 2016-2020 The Inter Project Authors. [Licensed under the SIL Open Font License, Version 1.1.](https://github.com/rsms/inter/blob/v3.14/LICENSE.txt) - [**Hack**](https://sourcefoundry.org/hack/): Copyright (c) 2018 Source Foundry Authors. [Licensed under the MIT License.](https://github.com/source-foundry/Hack/blob/v3.003/LICENSE.md) - [**Comic Neue**](http://comicneue.com/): Copyright (c) 2014 The Comic Neue Project Authors. [Licensed under the SIL Open Font License, Version 1.1.](https://github.com/crozynski/comicneue/blob/v2.5/OFL.txt) diff --git a/assets/sass/abstracts/_settings.scss b/assets/sass/abstracts/_settings.scss index a866ba9c..9378e8e0 100644 --- a/assets/sass/abstracts/_settings.scss +++ b/assets/sass/abstracts/_settings.scss @@ -1,17 +1,20 @@ @charset "UTF-8"; // Web fonts -$webfont-sans: "Inter", sans-serif; -$webfont-sans-variable: "Inter var", sans-serif; -$webfont-mono: "Hack", monospace; +$webfont-sans: "Inter"; +$webfont-sans-variable: "Inter var"; +$webfont-mono: "Hack"; // System fonts // https://markdotto.com/2018/02/07/github-system-fonts/ -$system-fonts: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", - "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; -$system-fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; +$system-fonts-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", + "Segoe UI Emoji", "Segoe UI Symbol"; $system-fonts-monospace: "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", "Courier", monospace; +$font-stack-static: $webfont-sans, $system-fonts-sans; +$font-stack-var: $webfont-sans-variable, $system-fonts-sans; +$font-stack-mono: $webfont-mono, $system-fonts-monospace; + // Width at which to switch to mobile styles $responsive-width: 830px; diff --git a/assets/sass/components/_global.scss b/assets/sass/components/_global.scss index d11cd4ab..0bfd8d33 100644 --- a/assets/sass/components/_global.scss +++ b/assets/sass/components/_global.scss @@ -6,7 +6,7 @@ body { height: 100%; margin: 0 auto; - font-family: $webfont-sans; + font-family: $font-stack-static; font-kerning: normal; font-variant-ligatures: normal; font-feature-settings: "kern", "liga", "calt", "clig", "ss01"; @@ -18,7 +18,7 @@ body { // stylelint-disable-next-line plugin/no-unsupported-browser-features @supports (font-variation-settings: normal) { body { - font-family: $webfont-sans-variable; + font-family: $font-stack-var; font-optical-sizing: auto; } } @@ -92,6 +92,14 @@ strong { letter-spacing: 0.008em; // not sure why the discrepancy between weights } +code, +pre, +.monospace { + font-family: $font-stack-mono; + font-size: 0.95em; + letter-spacing: normal; +} + blockquote { margin-left: 0; padding-left: 1.5em; diff --git a/assets/sass/components/_syntax.scss b/assets/sass/components/_syntax.scss index 6b0c3cbe..8aa56ddc 100644 --- a/assets/sass/components/_syntax.scss +++ b/assets/sass/components/_syntax.scss @@ -1,12 +1,5 @@ @charset "UTF-8"; -code, -pre { - font-family: $webfont-mono; - font-size: 0.95em; - letter-spacing: normal; -} - // all code code { letter-spacing: 0; diff --git a/assets/sass/components/_typography.scss b/assets/sass/components/_typography.scss index 8f90d6a3..b59e9502 100644 --- a/assets/sass/components/_typography.scss +++ b/assets/sass/components/_typography.scss @@ -6,11 +6,11 @@ $unicode-subset: U+0000-00FF, U+2000-206F, U+20A0-20CF, U+2190-21FF, U+2200-22FF, U+2122; /*! - * Inter typeface v3.13 - https://rsms.me/inter/ + * Inter typeface v3.14 - https://rsms.me/inter/ * * Copyright (c) 2016-2020 The Inter Project Authors. * Licensed under the SIL Open Font License, Version 1.1: - * https://github.com/rsms/inter/blob/v3.13/LICENSE.txt + * https://github.com/rsms/inter/blob/v3.14/LICENSE.txt */ // Variable diff --git a/assets/sass/pages/_home.scss b/assets/sass/pages/_home.scss index 38b22455..8060cd37 100644 --- a/assets/sass/pages/_home.scss +++ b/assets/sass/pages/_home.scss @@ -34,7 +34,6 @@ div.layout-home { position: relative; &#key { - font-family: $webfont-mono; font-size: 0.65em; word-spacing: -0.3em; margin-right: 0.1em; diff --git a/content/_index.md b/content/_index.md index 37d67e7b..bd448dd7 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,6 +1,6 @@ --- title: "Jake Jarvis – Front-End Web Developer in Boston, MA 👨‍💻" -date: 2020-08-10 10:17:58-0400 +date: 2020-08-18 09:22:25-0400 type: home sitemap: priority: 1.0 @@ -33,4 +33,4 @@ Over the years, some of these side projects media outlets. -You can find my work on GitHub and LinkedIn, my thoughts on Twitter, and my vintage PDF résumé here. I'm always open to connect over email 🔐 2B0C 9CF2 51E6 9A39, DM, or SMS too! +You can find my work on GitHub and LinkedIn, my thoughts on Twitter, and my vintage PDF résumé here. I'm always open to connect over email 🔐 2B0C 9CF2 51E6 9A39, DM, or SMS too! diff --git a/content/privacy.md b/content/privacy.md index 97439d24..9d9d0883 100644 --- a/content/privacy.md +++ b/content/privacy.md @@ -11,7 +11,7 @@ Okay, this is an easy one. 😉 ## Analytics -This website uses [**Simple Analytics**](https://simpleanalytics.com/?ref=jarv.is) to track pageviews **without collecting any personally identifiable information,** including IP addresses, cookies, and browser fingerprints. Only the following [information](https://docs.simpleanalytics.com/what-we-collect?ref=jarv.is) is collected and recorded by them: +This website uses [**Simple Analytics**](https://simpleanalytics.com/?ref=jarv.is) to count pageviews **without collecting any personally identifiable information,** such as IP addresses, cookies, and browser fingerprints. Only the [following information](https://docs.simpleanalytics.com/what-we-collect?ref=jarv.is) is collected and recorded by them: - URL visited - Timestamp of visit diff --git a/content/stats.md b/content/stats.md index 996270dd..5409f138 100644 --- a/content/stats.md +++ b/content/stats.md @@ -15,12 +15,14 @@ css: | } --- -This website uses [**Simple Analytics**](https://simpleanalytics.com/?ref=jarv.is) to track pageviews **without collecting any personally identifiable information,** including IP addresses, cookies, and browser fingerprints. +This website uses [**Simple Analytics**](https://simpleanalytics.com/?ref=jarv.is) to tally pageviews without tracking you. + +Cookies and fingerprinting are never used and your IP address is hidden behind [a serverless function](https://github.com/jakejarvis/jarv.is/blob/main/functions/send_view.js) when your ping is anonymously proxied to Simple Analytics' API on your behalf. Refer to the [**Privacy Policy**](/privacy/) for a complete list of information sent. In that case, why not share them? 😊 Pageviews for the past month are graphed below and more information (top pages, referrers, etc.) can be found [on a publicly-accessible dashboard.](https://simpleanalytics.com/jarv.is?utm_source=jarv.is&utm_content=badge) -

Powered by Simple Analytics

+

Powered by Simple Analytics

diff --git a/layouts/index.headers b/layouts/index.headers index 7b2513f8..7ee3c6df 100644 --- a/layouts/index.headers +++ b/layouts/index.headers @@ -1,3 +1,7 @@ +# Cache static assets (webfonts, emojis, etc.) for a long time (1 month) +/vendor/* + Cache-Control: max-age=2628000 + # Recommended MIME type for PWA manifests: # https://github.com/w3c/manifest/issues/689 /site.webmanifest diff --git a/layouts/partials/page/blm-banner.html b/layouts/partials/page/blm-banner.html index 0e12d2f4..7c9b64ea 100644 --- a/layouts/partials/page/blm-banner.html +++ b/layouts/partials/page/blm-banner.html @@ -31,4 +31,4 @@ } -#BlackLivesMatter ✊🏾 +#BlackLivesMatter ✊🏾 diff --git a/netlify.toml b/netlify.toml index 0a8880bc..e6ad8e7a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -101,6 +101,10 @@ from = "/keybase.txt" to = "/.well-known/keybase.txt" status = 301 +[[redirects]] + from = "/stats/badge.svg" + to = "https://simpleanalyticsbadge.com/jarv.is?counter=true" + status = 200 # Moved these random sites/projects elsewhere (mostly GitHub Pages) to keep # this repo and domain squeaky clean: diff --git a/static/vendor/fonts/inter-bold-italic-subset.woff b/static/vendor/fonts/inter-bold-italic-subset.woff index 6b08b5c1..01dec324 100644 Binary files a/static/vendor/fonts/inter-bold-italic-subset.woff and b/static/vendor/fonts/inter-bold-italic-subset.woff differ diff --git a/static/vendor/fonts/inter-bold-italic-subset.woff2 b/static/vendor/fonts/inter-bold-italic-subset.woff2 index 517a8ee2..8c642b95 100644 Binary files a/static/vendor/fonts/inter-bold-italic-subset.woff2 and b/static/vendor/fonts/inter-bold-italic-subset.woff2 differ diff --git a/static/vendor/fonts/inter-bold-subset.woff b/static/vendor/fonts/inter-bold-subset.woff index a452cc46..ee0151ad 100644 Binary files a/static/vendor/fonts/inter-bold-subset.woff and b/static/vendor/fonts/inter-bold-subset.woff differ diff --git a/static/vendor/fonts/inter-bold-subset.woff2 b/static/vendor/fonts/inter-bold-subset.woff2 index 086e85bc..bae2ea6d 100644 Binary files a/static/vendor/fonts/inter-bold-subset.woff2 and b/static/vendor/fonts/inter-bold-subset.woff2 differ diff --git a/static/vendor/fonts/inter-italic-subset.var.woff2 b/static/vendor/fonts/inter-italic-subset.var.woff2 index 5cad80ba..640aeecc 100644 Binary files a/static/vendor/fonts/inter-italic-subset.var.woff2 and b/static/vendor/fonts/inter-italic-subset.var.woff2 differ diff --git a/static/vendor/fonts/inter-medium-italic-subset.woff b/static/vendor/fonts/inter-medium-italic-subset.woff index 52f0f116..5253cd0d 100644 Binary files a/static/vendor/fonts/inter-medium-italic-subset.woff and b/static/vendor/fonts/inter-medium-italic-subset.woff differ diff --git a/static/vendor/fonts/inter-medium-italic-subset.woff2 b/static/vendor/fonts/inter-medium-italic-subset.woff2 index 73136a67..d40b2278 100644 Binary files a/static/vendor/fonts/inter-medium-italic-subset.woff2 and b/static/vendor/fonts/inter-medium-italic-subset.woff2 differ diff --git a/static/vendor/fonts/inter-medium-subset.woff b/static/vendor/fonts/inter-medium-subset.woff index dd099c4a..2a04d10c 100644 Binary files a/static/vendor/fonts/inter-medium-subset.woff and b/static/vendor/fonts/inter-medium-subset.woff differ diff --git a/static/vendor/fonts/inter-medium-subset.woff2 b/static/vendor/fonts/inter-medium-subset.woff2 index ac61de17..a8512a9d 100644 Binary files a/static/vendor/fonts/inter-medium-subset.woff2 and b/static/vendor/fonts/inter-medium-subset.woff2 differ diff --git a/static/vendor/fonts/inter-regular-italic-subset.woff b/static/vendor/fonts/inter-regular-italic-subset.woff index 0cea6f4a..e136ea80 100644 Binary files a/static/vendor/fonts/inter-regular-italic-subset.woff and b/static/vendor/fonts/inter-regular-italic-subset.woff differ diff --git a/static/vendor/fonts/inter-regular-italic-subset.woff2 b/static/vendor/fonts/inter-regular-italic-subset.woff2 index 9a85dceb..5853b910 100644 Binary files a/static/vendor/fonts/inter-regular-italic-subset.woff2 and b/static/vendor/fonts/inter-regular-italic-subset.woff2 differ diff --git a/static/vendor/fonts/inter-regular-subset.woff b/static/vendor/fonts/inter-regular-subset.woff index 2624acd5..ca3407d4 100644 Binary files a/static/vendor/fonts/inter-regular-subset.woff and b/static/vendor/fonts/inter-regular-subset.woff differ diff --git a/static/vendor/fonts/inter-regular-subset.woff2 b/static/vendor/fonts/inter-regular-subset.woff2 index d70b1482..89ac9f59 100644 Binary files a/static/vendor/fonts/inter-regular-subset.woff2 and b/static/vendor/fonts/inter-regular-subset.woff2 differ diff --git a/static/vendor/fonts/inter-subset.var.woff2 b/static/vendor/fonts/inter-subset.var.woff2 index 06c1b869..4f199921 100644 Binary files a/static/vendor/fonts/inter-subset.var.woff2 and b/static/vendor/fonts/inter-subset.var.woff2 differ diff --git a/yarn.lock b/yarn.lock index ff9f8722..e8cb9427 100644 --- a/yarn.lock +++ b/yarn.lock @@ -907,9 +907,9 @@ integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= "@types/node@*": - version "14.0.27" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1" - integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g== + version "14.6.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499" + integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -1136,9 +1136,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2: - version "6.12.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" - integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== + version "6.12.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" + integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -1507,9 +1507,9 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== bn.js@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0" - integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== + version "5.1.3" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" + integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== body-parser@1.19.0, body-parser@^1.19.0: version "1.19.0" @@ -1808,14 +1808,14 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-db@^1.0.30001090: - version "1.0.30001113" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001113.tgz#a4ad3a3cc93d95d3218d0b833868b0fa436cbca0" - integrity sha512-JOGTJXdeXlTokXq79+cAuQp8OmaYXtuK82bJpar9JvEyAag5qRHcMwDbCOvSSwGjEOJcRli9Bs+58Kflitul8g== + version "1.0.30001115" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001115.tgz#fe52adf78535b8956b3df8b36870593b12cba7a1" + integrity sha512-g1ZFLCOzTIk6QKTqqxRYV3GlW9SfeSAh2J1HYmeuj6YVnOBe7uCHybWJyWVlhCwjtQtq9B84WN1hIQMa3D5ghg== caniuse-lite@^1.0.30000887, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111: - version "1.0.30001113" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz#22016ab55b5a8b04fa00ca342d9ee1b98df48065" - integrity sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA== + version "1.0.30001115" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001115.tgz#c04cd828883ba47f6f776312e0817bcc9040cfa4" + integrity sha512-NZrG0439ePYna44lJX8evHX2L7Z3/z3qjVLnHgbBb/duNEnGo348u+BQS5o4HTWcrb++100dHFrU36IesIrC1Q== caw@^2.0.0, caw@^2.0.1: version "2.0.1" @@ -2753,9 +2753,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.523: - version "1.3.531" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.531.tgz#fe432e23c306f7b3579506de9ca63703ef086b9d" - integrity sha512-cRdM9noPSUvZ2TCJByhFL78amPMjNZlGJG27EPuJZK0CwWzBfj3ei7hJh0hNsjvgC0BayRW8Bc06DTCELcMC9Q== + version "1.3.534" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.534.tgz#fc7af8518dd00a5b22a24aed3f116b5d097e2330" + integrity sha512-7x2S3yUrspNHQOoPk+Eo+iHViSiJiEGPI6BpmLy1eT2KRNGCkBt/NUYqjfXLd1DpDCQp7n3+LfA1RkbG+LqTZQ== elliptic@^6.5.3: version "6.5.3" @@ -4821,9 +4821,9 @@ lint-staged@^10.2.11: stringify-object "^3.3.0" listr2@^2.1.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.5.1.tgz#f265dddf916c8a9b475437b34ae85a7d8f495c7a" - integrity sha512-qkNRW70SwfwWLD/eiaTf2tfgWT/ZvjmMsnEFJOCzac0cjcc8rYHDBr1eQhRxopj6lZO7Oa5sS/pZzS6q+BsX+w== + version "2.6.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.6.0.tgz#788a3d202978a1b8582062952cbc49272c8e206a" + integrity sha512-nwmqTJYQQ+AsKb4fCXH/6/UmLCEDL1jkRAdSn9M6cEUzoRGrs33YD/3N86gAZQnGZ6hxV18XSdlBcJ1GTmetJA== dependencies: chalk "^4.1.0" cli-truncate "^2.1.0" @@ -4931,9 +4931,9 @@ lodash.pairs@^3.0.1: lodash.keys "^3.0.0" lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== log-symbols@^2.2.0: version "2.2.0"