diff --git a/Gemfile.lock b/Gemfile.lock index 3ce9fbf..207312a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ GEM em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.13.0) + ethon (0.14.0) ffi (>= 1.15.0) eventmachine (1.2.7) ffi (1.15.0) @@ -23,7 +23,7 @@ GEM html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (3.19.0) + html-proofer (3.19.1) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) diff --git a/_sass/_eb-garamond.scss b/_sass/_eb-garamond.scss new file mode 100644 index 0000000..c44c432 --- /dev/null +++ b/_sass/_eb-garamond.scss @@ -0,0 +1,13 @@ +@font-face { + font-family: 'EB Garamond'; + font-weight: 100 900; + font-display: swap; + src: url("/fonts/eb-garamond.woff2") format("woff2"); +} +@font-face { + font-family: 'EB Garamond'; + font-weight: 100 900; + font-display: swap; + font-style: italic; + src: url("/fonts/eb-garamond-italic.woff2") format("woff2"); +} diff --git a/_sass/_inter.scss b/_sass/_inter.scss index 0c2e0b8..9e15a70 100644 --- a/_sass/_inter.scss +++ b/_sass/_inter.scss @@ -1,200 +1,7 @@ @font-face { font-family: 'Inter'; - font-style: normal; - font-weight: 100; - font-display: swap; - src: url("/fonts/inter/Inter-Thin.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Thin.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 100; - font-display: swap; - src: url("/fonts/inter/Inter-ThinItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-ThinItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 200; - font-display: swap; - src: url("/fonts/inter/Inter-ExtraLight.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-ExtraLight.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 200; - font-display: swap; - src: url("/fonts/inter/Inter-ExtraLightItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-ExtraLightItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url("/fonts/inter/Inter-Light.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Light.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url("/fonts/inter/Inter-LightItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-LightItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url("/fonts/inter/Inter-Regular.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Regular.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url("/fonts/inter/Inter-Italic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Italic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url("/fonts/inter/Inter-Medium.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Medium.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 500; - font-display: swap; - src: url("/fonts/inter/Inter-MediumItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-MediumItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 600; - font-display: swap; - src: url("/fonts/inter/Inter-SemiBold.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-SemiBold.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 600; - font-display: swap; - src: url("/fonts/inter/Inter-SemiBoldItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-SemiBoldItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url("/fonts/inter/Inter-Bold.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Bold.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url("/fonts/inter/Inter-BoldItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-BoldItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 800; - font-display: swap; - src: url("/fonts/inter/Inter-ExtraBold.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-ExtraBold.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 800; - font-display: swap; - src: url("/fonts/inter/Inter-ExtraBoldItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-ExtraBoldItalic.woff?v=3.18") format("woff"); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 900; - font-display: swap; - src: url("/fonts/inter/Inter-Black.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-Black.woff?v=3.18") format("woff"); -} -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 900; - font-display: swap; - src: url("/fonts/inter/Inter-BlackItalic.woff2?v=3.18") format("woff2"), - url("/fonts/inter/Inter-BlackItalic.woff?v=3.18") format("woff"); -} - -/* ------------------------------------------------------- -Variable font. -Usage: - - html { font-family: 'Inter', sans-serif; } - @supports (font-variation-settings: normal) { - html { font-family: 'Inter var', sans-serif; } - } -*/ -@font-face { - font-family: 'Inter var'; - font-weight: 100 900; - font-display: swap; - font-style: normal; - font-named-instance: 'Regular'; - src: url("/fonts/inter/Inter-roman.var.woff2?v=3.18") format("woff2"); -} -@font-face { - font-family: 'Inter var'; - font-weight: 100 900; - font-display: swap; - font-style: italic; - font-named-instance: 'Italic'; - src: url("/fonts/inter/Inter-italic.var.woff2?v=3.18") format("woff2"); -} - - -/* -------------------------------------------------------------------------- -[EXPERIMENTAL] Multi-axis, single variable font. - -Slant axis is not yet widely supported (as of February 2019) and thus this -multi-axis single variable font is opt-in rather than the default. - -When using this, you will probably need to set font-variation-settings -explicitly, e.g. - - * { font-variation-settings: "slnt" 0deg } - .italic { font-variation-settings: "slnt" 10deg } - -*/ -@font-face { - font-family: 'Inter var experimental'; font-weight: 100 900; font-display: swap; font-style: oblique 0deg 10deg; - src: url("/fonts/inter/Inter.var.woff2?v=3.18") format("woff2"); + src: url("/fonts/inter.woff2") format("woff2"); } diff --git a/_sass/_ubuntu-mono.scss b/_sass/_ubuntu-mono.scss index bbe7d77..773ece3 100644 --- a/_sass/_ubuntu-mono.scss +++ b/_sass/_ubuntu-mono.scss @@ -3,31 +3,5 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-Regular.woff2") format("woff2"), - url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-Regular.woff") format("woff"); -} -@font-face { - font-family: 'Ubuntu Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-Italic.woff2") format("woff2"), - url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-Italic.woff") format("woff"); -} - -@font-face { - font-family: 'Ubuntu Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-Bold.woff2") format("woff2"), - url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-Bold.woff") format("woff"); -} -@font-face { - font-family: 'Ubuntu Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-BoldItalic.woff2") format("woff2"), - url("https://tommi.space/fonts/ubuntu-mono/UbuntuMono-BoldItalic.woff") format("woff"); + src: url("/fonts/ubuntu-mono.woff2") format("woff2"); } diff --git a/fonts/eb-garamond-italic.woff2 b/fonts/eb-garamond-italic.woff2 new file mode 100644 index 0000000..c45f216 Binary files /dev/null and b/fonts/eb-garamond-italic.woff2 differ diff --git a/fonts/eb-garamond.woff2 b/fonts/eb-garamond.woff2 new file mode 100644 index 0000000..8f77241 Binary files /dev/null and b/fonts/eb-garamond.woff2 differ diff --git a/fonts/inter.woff2 b/fonts/inter.woff2 new file mode 100644 index 0000000..ccd55f4 Binary files /dev/null and b/fonts/inter.woff2 differ diff --git a/fonts/inter/Inter-Black.woff b/fonts/inter/Inter-Black.woff deleted file mode 100644 index 2f5cb41..0000000 Binary files a/fonts/inter/Inter-Black.woff and /dev/null differ diff --git a/fonts/inter/Inter-Black.woff2 b/fonts/inter/Inter-Black.woff2 deleted file mode 100644 index 53c0aa2..0000000 Binary files a/fonts/inter/Inter-Black.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-BlackItalic.woff b/fonts/inter/Inter-BlackItalic.woff deleted file mode 100644 index a168e58..0000000 Binary files a/fonts/inter/Inter-BlackItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-BlackItalic.woff2 b/fonts/inter/Inter-BlackItalic.woff2 deleted file mode 100644 index 63ec886..0000000 Binary files a/fonts/inter/Inter-BlackItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-Bold.woff b/fonts/inter/Inter-Bold.woff deleted file mode 100644 index 2ec7ac3..0000000 Binary files a/fonts/inter/Inter-Bold.woff and /dev/null differ diff --git a/fonts/inter/Inter-Bold.woff2 b/fonts/inter/Inter-Bold.woff2 deleted file mode 100644 index 6989c99..0000000 Binary files a/fonts/inter/Inter-Bold.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-BoldItalic.woff b/fonts/inter/Inter-BoldItalic.woff deleted file mode 100644 index aa35b79..0000000 Binary files a/fonts/inter/Inter-BoldItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-BoldItalic.woff2 b/fonts/inter/Inter-BoldItalic.woff2 deleted file mode 100644 index 18b4c1c..0000000 Binary files a/fonts/inter/Inter-BoldItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-ExtraBold.woff b/fonts/inter/Inter-ExtraBold.woff deleted file mode 100644 index d79d3d2..0000000 Binary files a/fonts/inter/Inter-ExtraBold.woff and /dev/null differ diff --git a/fonts/inter/Inter-ExtraBold.woff2 b/fonts/inter/Inter-ExtraBold.woff2 deleted file mode 100644 index 3e74973..0000000 Binary files a/fonts/inter/Inter-ExtraBold.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-ExtraBoldItalic.woff b/fonts/inter/Inter-ExtraBoldItalic.woff deleted file mode 100644 index 06aad19..0000000 Binary files a/fonts/inter/Inter-ExtraBoldItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-ExtraBoldItalic.woff2 b/fonts/inter/Inter-ExtraBoldItalic.woff2 deleted file mode 100644 index 77391ea..0000000 Binary files a/fonts/inter/Inter-ExtraBoldItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-ExtraLight.woff b/fonts/inter/Inter-ExtraLight.woff deleted file mode 100644 index fee5fca..0000000 Binary files a/fonts/inter/Inter-ExtraLight.woff and /dev/null differ diff --git a/fonts/inter/Inter-ExtraLight.woff2 b/fonts/inter/Inter-ExtraLight.woff2 deleted file mode 100644 index 607250b..0000000 Binary files a/fonts/inter/Inter-ExtraLight.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-ExtraLightItalic.woff b/fonts/inter/Inter-ExtraLightItalic.woff deleted file mode 100644 index 94e6582..0000000 Binary files a/fonts/inter/Inter-ExtraLightItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-ExtraLightItalic.woff2 b/fonts/inter/Inter-ExtraLightItalic.woff2 deleted file mode 100644 index 858d38a..0000000 Binary files a/fonts/inter/Inter-ExtraLightItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-Italic.woff b/fonts/inter/Inter-Italic.woff deleted file mode 100644 index 4b765bd..0000000 Binary files a/fonts/inter/Inter-Italic.woff and /dev/null differ diff --git a/fonts/inter/Inter-Italic.woff2 b/fonts/inter/Inter-Italic.woff2 deleted file mode 100644 index bd5f255..0000000 Binary files a/fonts/inter/Inter-Italic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-Light.woff b/fonts/inter/Inter-Light.woff deleted file mode 100644 index 7590ff8..0000000 Binary files a/fonts/inter/Inter-Light.woff and /dev/null differ diff --git a/fonts/inter/Inter-Light.woff2 b/fonts/inter/Inter-Light.woff2 deleted file mode 100644 index 551410a..0000000 Binary files a/fonts/inter/Inter-Light.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-LightItalic.woff b/fonts/inter/Inter-LightItalic.woff deleted file mode 100644 index 8f2a4ca..0000000 Binary files a/fonts/inter/Inter-LightItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-LightItalic.woff2 b/fonts/inter/Inter-LightItalic.woff2 deleted file mode 100644 index 976d525..0000000 Binary files a/fonts/inter/Inter-LightItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-Medium.woff b/fonts/inter/Inter-Medium.woff deleted file mode 100644 index 7d55f34..0000000 Binary files a/fonts/inter/Inter-Medium.woff and /dev/null differ diff --git a/fonts/inter/Inter-Medium.woff2 b/fonts/inter/Inter-Medium.woff2 deleted file mode 100644 index a916b47..0000000 Binary files a/fonts/inter/Inter-Medium.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-MediumItalic.woff b/fonts/inter/Inter-MediumItalic.woff deleted file mode 100644 index 422ab05..0000000 Binary files a/fonts/inter/Inter-MediumItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-MediumItalic.woff2 b/fonts/inter/Inter-MediumItalic.woff2 deleted file mode 100644 index f623924..0000000 Binary files a/fonts/inter/Inter-MediumItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-Regular.woff b/fonts/inter/Inter-Regular.woff deleted file mode 100644 index 7ff51b7..0000000 Binary files a/fonts/inter/Inter-Regular.woff and /dev/null differ diff --git a/fonts/inter/Inter-Regular.woff2 b/fonts/inter/Inter-Regular.woff2 deleted file mode 100644 index 554aed6..0000000 Binary files a/fonts/inter/Inter-Regular.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-SemiBold.woff b/fonts/inter/Inter-SemiBold.woff deleted file mode 100644 index 76e507a..0000000 Binary files a/fonts/inter/Inter-SemiBold.woff and /dev/null differ diff --git a/fonts/inter/Inter-SemiBold.woff2 b/fonts/inter/Inter-SemiBold.woff2 deleted file mode 100644 index 9307998..0000000 Binary files a/fonts/inter/Inter-SemiBold.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-SemiBoldItalic.woff b/fonts/inter/Inter-SemiBoldItalic.woff deleted file mode 100644 index 3821812..0000000 Binary files a/fonts/inter/Inter-SemiBoldItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-SemiBoldItalic.woff2 b/fonts/inter/Inter-SemiBoldItalic.woff2 deleted file mode 100644 index f19f550..0000000 Binary files a/fonts/inter/Inter-SemiBoldItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-Thin.woff b/fonts/inter/Inter-Thin.woff deleted file mode 100644 index 6074d22..0000000 Binary files a/fonts/inter/Inter-Thin.woff and /dev/null differ diff --git a/fonts/inter/Inter-Thin.woff2 b/fonts/inter/Inter-Thin.woff2 deleted file mode 100644 index 07d4fd6..0000000 Binary files a/fonts/inter/Inter-Thin.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-ThinItalic.woff b/fonts/inter/Inter-ThinItalic.woff deleted file mode 100644 index e612ae4..0000000 Binary files a/fonts/inter/Inter-ThinItalic.woff and /dev/null differ diff --git a/fonts/inter/Inter-ThinItalic.woff2 b/fonts/inter/Inter-ThinItalic.woff2 deleted file mode 100644 index a824b2c..0000000 Binary files a/fonts/inter/Inter-ThinItalic.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-italic.var.woff2 b/fonts/inter/Inter-italic.var.woff2 deleted file mode 100644 index 0387531..0000000 Binary files a/fonts/inter/Inter-italic.var.woff2 and /dev/null differ diff --git a/fonts/inter/Inter-roman.var.woff2 b/fonts/inter/Inter-roman.var.woff2 deleted file mode 100644 index a6efdc4..0000000 Binary files a/fonts/inter/Inter-roman.var.woff2 and /dev/null differ diff --git a/fonts/inter/Inter.var.woff2 b/fonts/inter/Inter.var.woff2 deleted file mode 100644 index b40083c..0000000 Binary files a/fonts/inter/Inter.var.woff2 and /dev/null differ diff --git a/fonts/ubuntu-mono.woff2 b/fonts/ubuntu-mono.woff2 new file mode 100644 index 0000000..4515784 Binary files /dev/null and b/fonts/ubuntu-mono.woff2 differ