From d6d759ec518398faed1c49b1ffe39c69867aff57 Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Sun, 27 Oct 2024 19:39:04 +0000 Subject: [PATCH 1/3] add noto color fallback --- common-docs/hugo.toml | 2 +- common-theme/assets/styles/02-variables/fonts.scss | 4 ++-- org-cyf-theme/hugo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common-docs/hugo.toml b/common-docs/hugo.toml index fc91cd24a..6891ae1e5 100644 --- a/common-docs/hugo.toml +++ b/common-docs/hugo.toml @@ -44,7 +44,7 @@ title = "The longed for documentation" url = "https://codeyourfuture.io/donate" [params] -googleFonts="https://fonts.googleapis.com/css2?family=Oswald:wght@400;700&display=swap" +googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&Oswald:wght@400;700&display=swap" description = "A free and open source technical curriculum platform." main_website = "https://curriculum.codeyourfuture.io/" main_org_name = "Code Your Future" diff --git a/common-theme/assets/styles/02-variables/fonts.scss b/common-theme/assets/styles/02-variables/fonts.scss index dc3bbdae9..60b05376a 100644 --- a/common-theme/assets/styles/02-variables/fonts.scss +++ b/common-theme/assets/styles/02-variables/fonts.scss @@ -4,6 +4,6 @@ "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; --theme-font--system: 100 100%/2 "Monaco", "Menlo", "Space Grotesk", monospace; - --theme-font--emoji: Apple Color Emoji, "Segoe UI Emoji", "Noto Color Emoji", - "EmojiOne Color", "Twemoji Mozilla"; + --theme-font--emoji: "Fluent UI Emoji", Apple Color Emoji, "Noto Color Emoji", + "Segoe UI Emoji", "EmojiOne Color", "Twemoji Mozilla"; } diff --git a/org-cyf-theme/hugo.toml b/org-cyf-theme/hugo.toml index 7dfc3556a..36b522010 100644 --- a/org-cyf-theme/hugo.toml +++ b/org-cyf-theme/hugo.toml @@ -48,7 +48,7 @@ org = "https://github.com/CodeYourFuture" repo = "https://github.com/CodeYourFuture/curriculum/" pdrepo = "CYF-PD" root = "curriculum" -googleFonts="https://fonts.googleapis.com/css2?family=Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap" +googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap" # We use a proxy which concatenates paginated responses, otherwise we miss results. # Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem. From 47a3fab03c5e2012905040012ebc11f71b21931d Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Mon, 28 Oct 2024 10:33:52 +0000 Subject: [PATCH 2/3] Update common-docs/hugo.toml --- common-docs/hugo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-docs/hugo.toml b/common-docs/hugo.toml index 6891ae1e5..0849ab71b 100644 --- a/common-docs/hugo.toml +++ b/common-docs/hugo.toml @@ -44,7 +44,7 @@ title = "The longed for documentation" url = "https://codeyourfuture.io/donate" [params] -googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&Oswald:wght@400;700&display=swap" +googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&family=Oswald:wght@400;700&display=swap" description = "A free and open source technical curriculum platform." main_website = "https://curriculum.codeyourfuture.io/" main_org_name = "Code Your Future" From 9e93f0d91c25d2e3aa8d1e062d84bd6c5fa266a2 Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Mon, 28 Oct 2024 10:33:58 +0000 Subject: [PATCH 3/3] Update org-cyf-theme/hugo.toml --- org-cyf-theme/hugo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org-cyf-theme/hugo.toml b/org-cyf-theme/hugo.toml index 36b522010..c359466ba 100644 --- a/org-cyf-theme/hugo.toml +++ b/org-cyf-theme/hugo.toml @@ -48,7 +48,7 @@ org = "https://github.com/CodeYourFuture" repo = "https://github.com/CodeYourFuture/curriculum/" pdrepo = "CYF-PD" root = "curriculum" -googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap" +googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&family=Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap" # We use a proxy which concatenates paginated responses, otherwise we miss results. # Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.