From b6ddb78120476141497008804ce531e2ab0ad35d Mon Sep 17 00:00:00 2001 From: Mark Peterson Date: Tue, 11 Sep 2018 16:02:59 -0700 Subject: [PATCH 1/3] Adding font support to correctly handle zwj gender emoji in Chrome --- src/themes/teams/siteVariables.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/teams/siteVariables.ts b/src/themes/teams/siteVariables.ts index 48e03c2257..91f937ed55 100644 --- a/src/themes/teams/siteVariables.ts +++ b/src/themes/teams/siteVariables.ts @@ -72,7 +72,7 @@ export const lineHeightExtraSmall = 1.2 // export const bodyPadding = 0 export const bodyMargin = 0 -export const bodyFontFamily = '"Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif' +export const bodyFontFamily = '"Segoe UI", "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", Helvetica, Arial, sans-serif' export const bodyFontSize = '1.4rem' export const bodyColor = black export const bodyLineHeight = lineHeightBase From 3f8dad29d44b90556c9b7fd69f0fdb609cca70e1 Mon Sep 17 00:00:00 2001 From: Mark Peterson Date: Tue, 11 Sep 2018 16:22:00 -0700 Subject: [PATCH 2/3] Fixing prettier error --- src/themes/teams/siteVariables.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/themes/teams/siteVariables.ts b/src/themes/teams/siteVariables.ts index 91f937ed55..0cd9598e7c 100644 --- a/src/themes/teams/siteVariables.ts +++ b/src/themes/teams/siteVariables.ts @@ -72,7 +72,8 @@ export const lineHeightExtraSmall = 1.2 // export const bodyPadding = 0 export const bodyMargin = 0 -export const bodyFontFamily = '"Segoe UI", "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", Helvetica, Arial, sans-serif' +export const bodyFontFamily = + '"Segoe UI", "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", Helvetica, Arial, sans-serif' export const bodyFontSize = '1.4rem' export const bodyColor = black export const bodyLineHeight = lineHeightBase From a457b6021b3295352e42f2bf32a110cbd983a9dd Mon Sep 17 00:00:00 2001 From: Mark Peterson Date: Tue, 11 Sep 2018 17:05:45 -0700 Subject: [PATCH 3/3] Updated ChangeLog with info on the fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa08513dda..f6783b0820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] ### Fixes +- Fixed fonts to support zwj gender emojis ([#215](https://github.com/stardust-ui/react/pull/215)) - Correct Teams theme site variables @sergiorv ([#110](https://github.com/stardust-ui/react/pull/110)) - Fixed missing colors in Teams' siteVariables @mnajdova ([#200](https://github.com/stardust-ui/react/pull/200)) - Fixed Teams' siteVariables font sizes @levithomason ([#204](https://github.com/stardust-ui/react/pull/204))