From 7cfc63e1384d91548fc25810a544b07daacca9d0 Mon Sep 17 00:00:00 2001 From: Henrique Vianna Date: Mon, 1 Jun 2020 14:35:15 -0300 Subject: [PATCH 1/2] Fix native font stack precedence issue on Windows systems. --- _sass/custom/custom.scss | 2 +- _sass/support/_variables.scss | 2 +- docs/ui-components/typography.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss index 9ac503b..b608d93 100644 --- a/_sass/custom/custom.scss +++ b/_sass/custom/custom.scss @@ -2,7 +2,7 @@ //// Typography //// -//$body-font-family: -apple-system, BlinkMacSystemFont, "helvetica neue", helvetica, roboto, noto, "segoe ui", arial, sans-serif; +//$body-font-family: -apple-system, BlinkMacSystemFont, "helvetica neue", "segoe ui", helvetica, roboto, noto, arial, sans-serif; //$mono-font-family: "SFMono-Regular", Menlo, Consolas, Monospace; //$root-font-size: 16px; // Base font-size for rems //$body-line-height: 1.4; diff --git a/_sass/support/_variables.scss b/_sass/support/_variables.scss index 76d8b5d..8ee5399 100644 --- a/_sass/support/_variables.scss +++ b/_sass/support/_variables.scss @@ -3,7 +3,7 @@ // $body-font-family: -apple-system, BlinkMacSystemFont, "helvetica neue", - helvetica, roboto, noto, "segoe ui", arial, sans-serif !default; + "segoe ui", helvetica, roboto, noto, arial, sans-serif !default; $mono-font-family: "SFMono-Regular", Menlo, Consolas, Monospace !default; $root-font-size: 16px !default; // Base font-size for rems $body-line-height: 1.4 !default; diff --git a/docs/ui-components/typography.md b/docs/ui-components/typography.md index 2838a79..3db988c 100644 --- a/docs/ui-components/typography.md +++ b/docs/ui-components/typography.md @@ -21,7 +21,7 @@ nav_order: 1 By default, Just the Docs uses a native system font stack for sans-serif fonts: ```scss --apple-system, BlinkMacSystemFont, "helvetica neue", helvetica, roboto, noto, "segoe ui", arial, sans-serif +-apple-system, BlinkMacSystemFont, "helvetica neue", "segoe ui", helvetica, roboto, noto, arial, sans-serif ``` ABCDEFGHIJKLMNOPQRSTUVWXYZ From 72b6de8862a4c734fdb25b96763bd6bffaaffb74 Mon Sep 17 00:00:00 2001 From: Henrique Vianna Date: Sat, 27 Jun 2020 17:37:39 -0300 Subject: [PATCH 2/2] Updated native font stack, as suggested in https://github.com/pmarsceill/just-the-docs/issues/330#issuecomment-650415240 --- _sass/support/_variables.scss | 4 ++-- docs/ui-components/typography.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_sass/support/_variables.scss b/_sass/support/_variables.scss index bca9a71..d169eba 100644 --- a/_sass/support/_variables.scss +++ b/_sass/support/_variables.scss @@ -2,8 +2,8 @@ // Typography // -$body-font-family: -apple-system, BlinkMacSystemFont, "helvetica neue", - "segoe ui", helvetica, roboto, noto, arial, sans-serif !default; +$body-font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", + Roboto, "Helvetica Neue", Arial, sans-serif !default; $mono-font-family: "SFMono-Regular", Menlo, Consolas, Monospace !default; $root-font-size: 16px !default; // Base font-size for rems $body-line-height: 1.4 !default; diff --git a/docs/ui-components/typography.md b/docs/ui-components/typography.md index 3db988c..b879c95 100644 --- a/docs/ui-components/typography.md +++ b/docs/ui-components/typography.md @@ -21,7 +21,7 @@ nav_order: 1 By default, Just the Docs uses a native system font stack for sans-serif fonts: ```scss --apple-system, BlinkMacSystemFont, "helvetica neue", "segoe ui", helvetica, roboto, noto, arial, sans-serif +system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif ``` ABCDEFGHIJKLMNOPQRSTUVWXYZ