From 1861df472ed6c987783bef20a11dfe738767433b Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Tue, 26 Sep 2023 22:34:54 -0500 Subject: [PATCH 1/3] Add: Fallback font for symbols Fixes #256. --- assets/theme-css/vars.css | 2 +- config.yaml | 1 + layouts/partials/css.html | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/assets/theme-css/vars.css b/assets/theme-css/vars.css index c23c4c32..e9e46832 100644 --- a/assets/theme-css/vars.css +++ b/assets/theme-css/vars.css @@ -1,6 +1,6 @@ /* prettier-ignore */ :root { - --fontFamily: {{ .Site.Params.font.name }}; + --fontFamily: "{{ .Site.Params.font.name }}", "{{ .Site.Params.font.fallbackName }}"; --colorPrimaryDark: rgb(1, 50, 67); --colorPrimary: rgb(77, 119, 207); diff --git a/config.yaml b/config.yaml index e40e8c51..094561e2 100644 --- a/config.yaml +++ b/config.yaml @@ -5,6 +5,7 @@ params: navColor: blue font: name: "Lato" + fallbackName: "Noto Sans Symbols 2" sizes: [400, 900] plausible: dataDomain: null diff --git a/layouts/partials/css.html b/layouts/partials/css.html index 5bc6bf62..55f67adf 100644 --- a/layouts/partials/css.html +++ b/layouts/partials/css.html @@ -13,6 +13,14 @@ + + +{{- $fallbackFontName := .Site.Params.font.fallbackName | default "Noto Sans Symbols 2" -}} +{{- $fallbackFontFace := replace $fallbackFontName " " "+" -}} +{{- $fallbackFontSizes := delimit (.Site.Params.font.sizes | default (slice 300 400 600 700)) "," -}} +{{- $fallbackFontUrl := printf "https://fonts.googleapis.com/css?family=%s:%s" $fallbackFontFace $fallbackFontSizes -}} + + From 3305bd4802053b78bd869f131f6f9b80b9ff356e Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Wed, 27 Sep 2023 12:32:19 -0500 Subject: [PATCH 2/3] Change: Make fallback font static See . --- assets/theme-css/vars.css | 2 +- config.yaml | 1 - layouts/partials/css.html | 6 +----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/assets/theme-css/vars.css b/assets/theme-css/vars.css index e9e46832..c23c4c32 100644 --- a/assets/theme-css/vars.css +++ b/assets/theme-css/vars.css @@ -1,6 +1,6 @@ /* prettier-ignore */ :root { - --fontFamily: "{{ .Site.Params.font.name }}", "{{ .Site.Params.font.fallbackName }}"; + --fontFamily: {{ .Site.Params.font.name }}; --colorPrimaryDark: rgb(1, 50, 67); --colorPrimary: rgb(77, 119, 207); diff --git a/config.yaml b/config.yaml index 094561e2..e40e8c51 100644 --- a/config.yaml +++ b/config.yaml @@ -5,7 +5,6 @@ params: navColor: blue font: name: "Lato" - fallbackName: "Noto Sans Symbols 2" sizes: [400, 900] plausible: dataDomain: null diff --git a/layouts/partials/css.html b/layouts/partials/css.html index 55f67adf..86d67c9b 100644 --- a/layouts/partials/css.html +++ b/layouts/partials/css.html @@ -15,11 +15,7 @@ -{{- $fallbackFontName := .Site.Params.font.fallbackName | default "Noto Sans Symbols 2" -}} -{{- $fallbackFontFace := replace $fallbackFontName " " "+" -}} -{{- $fallbackFontSizes := delimit (.Site.Params.font.sizes | default (slice 300 400 600 700)) "," -}} -{{- $fallbackFontUrl := printf "https://fonts.googleapis.com/css?family=%s:%s" $fallbackFontFace $fallbackFontSizes -}} - + From df7ceafa99177d94e5bc61047febd6ee98c31719 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Wed, 27 Sep 2023 12:47:06 -0500 Subject: [PATCH 3/3] Fix Oops. --- assets/theme-css/vars.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/theme-css/vars.css b/assets/theme-css/vars.css index c23c4c32..2d1807db 100644 --- a/assets/theme-css/vars.css +++ b/assets/theme-css/vars.css @@ -1,6 +1,6 @@ /* prettier-ignore */ :root { - --fontFamily: {{ .Site.Params.font.name }}; + --fontFamily: {{ .Site.Params.font.name }}, "Noto Sans Symbols 2"; --colorPrimaryDark: rgb(1, 50, 67); --colorPrimary: rgb(77, 119, 207);