Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

867 Use only quotidian emojis in emoji field #1141

Merged
merged 5 commits into from
Oct 28, 2024
Merged

867 Use only quotidian emojis in emoji field #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6d759e
add noto color fallback
SallyMcGrath Oct 27, 2024
f890ab5
Merge branch 'main' into bug/867-quotidian-emojis
SallyMcGrath Oct 28, 2024
47a3fab
Update common-docs/hugo.toml
SallyMcGrath Oct 28, 2024
9e93f0d
Update org-cyf-theme/hugo.toml
SallyMcGrath Oct 28, 2024
a42aa07
Merge branch 'main' into bug/867-quotidian-emojis
SallyMcGrath Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-docs/hugo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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&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"
Expand Down
4 changes: 2 additions & 2 deletions common-theme/assets/styles/02-variables/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
2 changes: 1 addition & 1 deletion org-cyf-theme/hugo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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&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.
Expand Down
Loading