From 53f9944ae3b28948c6aa6ff5a64288320fb72529 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Thu, 31 Jan 2019 18:43:52 -0800 Subject: [PATCH 1/2] fix kern issue in ACE --- src/global_styling/mixins/_typography.scss | 1 - src/global_styling/variables/_typography.scss | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/global_styling/mixins/_typography.scss b/src/global_styling/mixins/_typography.scss index 2ec9aed7bc8..e932ba23260 100644 --- a/src/global_styling/mixins/_typography.scss +++ b/src/global_styling/mixins/_typography.scss @@ -9,7 +9,6 @@ -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-kerning: normal; - font-feature-settings: $euiFontFeatureSettings; } @mixin euiCodeFont { diff --git a/src/global_styling/variables/_typography.scss b/src/global_styling/variables/_typography.scss index 63778c977ec..652a96b0b8f 100644 --- a/src/global_styling/variables/_typography.scss +++ b/src/global_styling/variables/_typography.scss @@ -27,8 +27,6 @@ // Families $euiFontFamily: 'Inter UI', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default; -$euiFontFeatureSettings: 'calt' 1, 'kern' 1, 'liga' 1 !default; - $euiCodeFontFamily: 'Roboto Mono', Consolas, Menlo, Courier, monospace !default; From 3335c9e558b3df0ef06a802c600f1cec816a5f1e Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Fri, 1 Feb 2019 09:11:22 -0800 Subject: [PATCH 2/2] cl and feedback --- CHANGELOG.md | 6 +++++- src/global_styling/variables/_typography.scss | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de50f0596d9..c9522d71f75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,11 @@ - Changed `flex-basis` value on `EuiPageBody` for better cross-browser support ([#1497](https://github.com/elastic/eui/pull/1497)) - Converted a number of components to support text localization ([#1485](https://github.com/elastic/eui/pull/1485)) - Added a seconds option to the refresh interval selection in `EuiSuperDatePicker` ([#1503](https://github.com/elastic/eui/pull/1503)) -- Changed to conditionally render `EuiModalBody` if `EuiConfirmModal` has no `children` ([#1500](https://github.com/elastic/eui/pull/1500)) +- Changed to conditionally render `EuiModalBody` if `EuiConfirmModal` has no `children` ([#1505](https://github.com/elastic/eui/pull/1505)) + +**Bug fixes** + +- Remove `font-features` setting on `@euiFont` mixin to prevent breaks in ACE editor ([#1497](https://github.com/elastic/eui/pull/1497)) ## [`6.7.4`](https://github.com/elastic/eui/tree/v6.7.4) diff --git a/src/global_styling/variables/_typography.scss b/src/global_styling/variables/_typography.scss index 652a96b0b8f..7f75be32920 100644 --- a/src/global_styling/variables/_typography.scss +++ b/src/global_styling/variables/_typography.scss @@ -29,6 +29,8 @@ $euiFontFamily: 'Inter UI', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default; $euiCodeFontFamily: 'Roboto Mono', Consolas, Menlo, Courier, monospace !default; +// Careful using ligatures. Code editors like ACE will often error because of width calculations +$euiFontFeatureSettings: 'calt' 1, 'kern' 1, 'liga' 1 !default; // Font sizes -- scale is loosely based on Major Third (1.250) $euiTextScale: 2.25, 1.75, 1.25, 1.125, 1, .875, .75 !default;