From ecae5e4b77906bdb527fd2b27cb953b5b395366c Mon Sep 17 00:00:00 2001 From: Adam Piontek Date: Fri, 9 Apr 2021 10:12:53 -0400 Subject: [PATCH] switched monospace font to jetbrains mono --- assets/css/_bs-custom.scss | 2 +- assets/css/_fonts.scss | 17 +++++++++-------- assets/css/app.scss | 4 ++++ assets/package-lock.json | 14 +++++++------- assets/package.json | 2 +- lib/home73k_web/templates/layout/root.html.leex | 2 +- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/assets/css/_bs-custom.scss b/assets/css/_bs-custom.scss index 0fb2442..54e72e3 100644 --- a/assets/css/_bs-custom.scss +++ b/assets/css/_bs-custom.scss @@ -14,7 +14,7 @@ $font-family-brand: Righteous, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; -$font-family-monospace: "Fira Code", SFMono-Regular, Menlo, Monaco, Consolas, +$font-family-monospace: "JetBrains Mono", "Fira Code", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; // Features diff --git a/assets/css/_fonts.scss b/assets/css/_fonts.scss index a96629e..8429604 100644 --- a/assets/css/_fonts.scss +++ b/assets/css/_fonts.scss @@ -1,13 +1,15 @@ /* brand : Fontsource Righteous */ @import "../node_modules/@fontsource/righteous/400.css"; /* normal | normal */ -/* monospace : Fontsource Fira Code */ -@import "../node_modules/@fontsource/fira-code/300.css"; /* light | normal */ -@import "../node_modules/@fontsource/fira-code/400.css"; /* normal | normal */ -@import "../node_modules/@fontsource/fira-code/500.css"; /* heavier normal? */ -@import "../node_modules/@fontsource/fira-code/600.css"; /* heavier normal? */ -@import "../node_modules/@fontsource/fira-code/700.css"; /* bold | normal */ - +/* monospace : Fontsource JetBrains Mono */ +@import "../node_modules/@fontsource/jetbrains-mono/100.css"; /* light | normal */ +@import "../node_modules/@fontsource/jetbrains-mono/200.css"; /* light | normal */ +@import "../node_modules/@fontsource/jetbrains-mono/300.css"; /* light | normal */ +@import "../node_modules/@fontsource/jetbrains-mono/400.css"; /* normal | normal */ +@import "../node_modules/@fontsource/jetbrains-mono/500.css"; /* heavier normal? */ +@import "../node_modules/@fontsource/jetbrains-mono/600.css"; /* heavier normal? */ +@import "../node_modules/@fontsource/jetbrains-mono/700.css"; /* bold | normal */ +@import "../node_modules/@fontsource/jetbrains-mono/800.css"; /* bolder | normal */ /* Fontsource Open Sans */ @import "../node_modules/@fontsource/open-sans/300.css"; /* light | normal */ @@ -20,4 +22,3 @@ @import "../node_modules/@fontsource/open-sans/700-italic.css"; /* bold | italic */ @import "../node_modules/@fontsource/open-sans/800.css"; /* bolder? | normal */ @import "../node_modules/@fontsource/open-sans/800-italic.css"; /* bolder? | italic */ - diff --git a/assets/css/app.scss b/assets/css/app.scss index 7cd806e..e2f8f35 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -24,6 +24,10 @@ default 'solarized-dark256' css saved in _chroma.css minor customizations here */ +pre, code, .font-monospace { + font-family: $font-family-monospace; + font-weight: 300; +} pre.chroma { padding: 0.75rem 1rem; border-radius: .5em; diff --git a/assets/package-lock.json b/assets/package-lock.json index c8e3332..9d4f2e3 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -6,7 +6,7 @@ "": { "license": "MIT", "dependencies": { - "@fontsource/fira-code": "^4.x", + "@fontsource/jetbrains-mono": "^4.2.2", "@fontsource/open-sans": "^4.2.2", "@fontsource/righteous": "^4.x", "@mdi/svg": "^5.x", @@ -1283,10 +1283,10 @@ "node": ">=10.0.0" } }, - "node_modules/@fontsource/fira-code": { + "node_modules/@fontsource/jetbrains-mono": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-4.2.2.tgz", - "integrity": "sha512-Bhg7rQ/CUbedA6B6K6gS2GDEa5JJjQwSqq1KMz4wVMaXXL+igsLrr4VKKmdfExwlB6o7Ie8kScXg4camZmt7TQ==" + "resolved": "https://registry.npmjs.org/@fontsource/jetbrains-mono/-/jetbrains-mono-4.2.2.tgz", + "integrity": "sha512-aCwLIqfZZrZjy+cIx/9hSzxyOcz8YzMbd3VQ8QRkS2MB3+XsXAnMLEkELXLCfKYUkEysRECaq5s7+Qhi1hgZAA==" }, "node_modules/@fontsource/open-sans": { "version": "4.2.2", @@ -10959,10 +10959,10 @@ "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", "dev": true }, - "@fontsource/fira-code": { + "@fontsource/jetbrains-mono": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-4.2.2.tgz", - "integrity": "sha512-Bhg7rQ/CUbedA6B6K6gS2GDEa5JJjQwSqq1KMz4wVMaXXL+igsLrr4VKKmdfExwlB6o7Ie8kScXg4camZmt7TQ==" + "resolved": "https://registry.npmjs.org/@fontsource/jetbrains-mono/-/jetbrains-mono-4.2.2.tgz", + "integrity": "sha512-aCwLIqfZZrZjy+cIx/9hSzxyOcz8YzMbd3VQ8QRkS2MB3+XsXAnMLEkELXLCfKYUkEysRECaq5s7+Qhi1hgZAA==" }, "@fontsource/open-sans": { "version": "4.2.2", diff --git a/assets/package.json b/assets/package.json index f63b9f5..2ede035 100644 --- a/assets/package.json +++ b/assets/package.json @@ -7,7 +7,7 @@ "watch": "webpack --mode development --watch" }, "dependencies": { - "@fontsource/fira-code": "^4.x", + "@fontsource/jetbrains-mono": "^4.2.2", "@fontsource/open-sans": "^4.2.2", "@fontsource/righteous": "^4.x", "@mdi/svg": "^5.x", diff --git a/lib/home73k_web/templates/layout/root.html.leex b/lib/home73k_web/templates/layout/root.html.leex index 15ae362..9b869d4 100644 --- a/lib/home73k_web/templates/layout/root.html.leex +++ b/lib/home73k_web/templates/layout/root.html.leex @@ -11,7 +11,7 @@ " as="font" type="font/woff2" crossorigin="anonymous"> " as="font" type="font/woff2" crossorigin="anonymous"> - " as="font" type="font/woff2" crossorigin="anonymous"> + " as="font" type="font/woff2" crossorigin="anonymous"> " as="font" type="font/woff2" crossorigin="anonymous">