From 66f814768fd8604e9faedd4c81c4d03bff2e49c2 Mon Sep 17 00:00:00 2001 From: Nick Kocharhook Date: Sat, 22 Jan 2022 12:44:25 +0000 Subject: [PATCH 1/3] [#604] Allow Firefox on macOS to see italic text. --- assets/scss/common/_fonts.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/scss/common/_fonts.scss b/assets/scss/common/_fonts.scss index 5f21b16..1994d0f 100644 --- a/assets/scss/common/_fonts.scss +++ b/assets/scss/common/_fonts.scss @@ -41,7 +41,7 @@ font-weight: 400; font-display: swap; src: - local("Jost"), + local("Jost-Italic"), url("fonts/vendor/jost/jost-v4-latin-italic.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -53,7 +53,7 @@ font-weight: 500; font-display: swap; src: - local("Jost"), + local("Jost-Italic"), url("fonts/vendor/jost/jost-v4-latin-500italic.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-500italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -65,7 +65,7 @@ font-weight: 700; font-display: swap; src: - local("Jost"), + local("Jost-Italic"), url("fonts/vendor/jost/jost-v4-latin-700italic.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-700italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } From f0b00f6c3b43372fc73508633a5a00e6f688b35a Mon Sep 17 00:00:00 2001 From: Nick Kocharhook Date: Mon, 24 Jan 2022 17:35:13 +0000 Subject: [PATCH 2/3] Account for Google Fonts and indestructible versions of the Jost font. --- assets/scss/common/_fonts.scss | 46 ++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/assets/scss/common/_fonts.scss b/assets/scss/common/_fonts.scss index 1994d0f..417623a 100644 --- a/assets/scss/common/_fonts.scss +++ b/assets/scss/common/_fonts.scss @@ -5,7 +5,13 @@ font-weight: 400; font-display: swap; src: - local("Jost"), + /* Google Fonts Jost */ + local("Jost Regular Regular"), /* Full Name */ + local("Jost-Regular"), /* PostScript name */ + + /* indestructible Jost* */ + local("Jost* Book"), + local("Jost-Book"), url("fonts/vendor/jost/jost-v4-latin-regular.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-regular.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -17,7 +23,13 @@ font-weight: 500; font-display: swap; src: - local("Jost"), + /* Google Fonts Jost */ + local("Jost Regular Medium"), + local("JostRoman-Medium"), + + /* indestructible Jost* */ + local("Jost* Medium"), + local("Jost-Medium"), url("fonts/vendor/jost/jost-v4-latin-500.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-500.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -29,7 +41,13 @@ font-weight: 700; font-display: swap; src: - local("Jost"), + /* Google Fonts Jost */ + local("Jost Regular Bold"), + local("JostRoman-Bold"), + + /* indestructible Jost* */ + local("Jost* Bold"), + local("Jost-Bold"), url("fonts/vendor/jost/jost-v4-latin-700.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-700.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -41,7 +59,13 @@ font-weight: 400; font-display: swap; src: + /* Google Fonts Jost */ + local("Jost Italic Italic"), local("Jost-Italic"), + + /* indestructible Jost* */ + local("Jost* BookItalic"), + local("Jost-BookItalic"), url("fonts/vendor/jost/jost-v4-latin-italic.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -53,7 +77,13 @@ font-weight: 500; font-display: swap; src: - local("Jost-Italic"), + /* Google Fonts Jost */ + local("Jost Italic Medium Italic"), + local("JostItalic-Medium"), + + /* indestructible Jost* */ + local("Jost* Medium Italic"), + local("Jost-MediumItalic"), url("fonts/vendor/jost/jost-v4-latin-500italic.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-500italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } @@ -65,7 +95,13 @@ font-weight: 700; font-display: swap; src: - local("Jost-Italic"), + /* Google Fonts Jost */ + local("Jost Italic Bold Italic"), + local("JostItalic-Bold"), + + /* indestructible Jost* */ + local("Jost* Bold Italic"), + local("Jost-BoldItalic"), url("fonts/vendor/jost/jost-v4-latin-700italic.woff2") format("woff2"), url("fonts/vendor/jost/jost-v4-latin-700italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } From aa8c798e7454c80538d75895a1f200531e4a5738 Mon Sep 17 00:00:00 2001 From: Nick Kocharhook Date: Mon, 24 Jan 2022 18:04:27 +0000 Subject: [PATCH 3/3] Fix newline error and switch to silent comments for font family hints. --- assets/scss/common/_fonts.scss | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/assets/scss/common/_fonts.scss b/assets/scss/common/_fonts.scss index 417623a..9bbc6ee 100644 --- a/assets/scss/common/_fonts.scss +++ b/assets/scss/common/_fonts.scss @@ -5,11 +5,10 @@ font-weight: 400; font-display: swap; src: - /* Google Fonts Jost */ - local("Jost Regular Regular"), /* Full Name */ - local("Jost-Regular"), /* PostScript name */ - - /* indestructible Jost* */ + // Google Fonts Jost + local("Jost Regular Regular"), // Full Name + local("Jost-Regular"), // PostScript name + // indestructible Jost* local("Jost* Book"), local("Jost-Book"), url("fonts/vendor/jost/jost-v4-latin-regular.woff2") format("woff2"), @@ -23,11 +22,10 @@ font-weight: 500; font-display: swap; src: - /* Google Fonts Jost */ + // Google Fonts Jost local("Jost Regular Medium"), local("JostRoman-Medium"), - - /* indestructible Jost* */ + // indestructible Jost* local("Jost* Medium"), local("Jost-Medium"), url("fonts/vendor/jost/jost-v4-latin-500.woff2") format("woff2"), @@ -41,11 +39,10 @@ font-weight: 700; font-display: swap; src: - /* Google Fonts Jost */ + // Google Fonts Jost local("Jost Regular Bold"), local("JostRoman-Bold"), - - /* indestructible Jost* */ + // indestructible Jost* local("Jost* Bold"), local("Jost-Bold"), url("fonts/vendor/jost/jost-v4-latin-700.woff2") format("woff2"), @@ -59,11 +56,10 @@ font-weight: 400; font-display: swap; src: - /* Google Fonts Jost */ + // Google Fonts Jost local("Jost Italic Italic"), local("Jost-Italic"), - - /* indestructible Jost* */ + // indestructible Jost* local("Jost* BookItalic"), local("Jost-BookItalic"), url("fonts/vendor/jost/jost-v4-latin-italic.woff2") format("woff2"), @@ -77,11 +73,10 @@ font-weight: 500; font-display: swap; src: - /* Google Fonts Jost */ + // Google Fonts Jost local("Jost Italic Medium Italic"), local("JostItalic-Medium"), - - /* indestructible Jost* */ + // indestructible Jost* local("Jost* Medium Italic"), local("Jost-MediumItalic"), url("fonts/vendor/jost/jost-v4-latin-500italic.woff2") format("woff2"), @@ -95,11 +90,10 @@ font-weight: 700; font-display: swap; src: - /* Google Fonts Jost */ + // Google Fonts Jost local("Jost Italic Bold Italic"), local("JostItalic-Bold"), - - /* indestructible Jost* */ + // indestructible Jost* local("Jost* Bold Italic"), local("Jost-BoldItalic"), url("fonts/vendor/jost/jost-v4-latin-700italic.woff2") format("woff2"),